From 949d8663f2f12c986ef2983b7b307f5ecddf060e Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 19 Dec 2014 01:42:49 -0600 Subject: use the new concept of appliances - Sync with Kernel upstream Kconfig - use new feature visible - add a patch for select on choices https://lkml.org/lkml/2011/2/17/379 - rename ADK_LINUX -> ADK_TARGET_ARCH - remove package collection feature - add appliance feature to define a appliance more complete --- target/linux/config/Config.in.debug | 2 +- target/linux/config/Config.in.kernel | 8 ++++---- target/linux/config/Config.in.kvm | 2 +- target/linux/config/Config.in.leds | 1 - 4 files changed, 6 insertions(+), 7 deletions(-) (limited to 'target/linux/config') diff --git a/target/linux/config/Config.in.debug b/target/linux/config/Config.in.debug index e3965123c..a2287f5f5 100644 --- a/target/linux/config/Config.in.debug +++ b/target/linux/config/Config.in.debug @@ -122,7 +122,7 @@ config ADK_KERNEL_OPROFILE prompt "Oprofile support" tristate select ADK_KERNEL_PROFILING - depends on !ADK_LINUX_M68K + depends on !ADK_TARGET_ARCH_M68K default m if ADK_PACKAGE_OPROFILE default n help diff --git a/target/linux/config/Config.in.kernel b/target/linux/config/Config.in.kernel index b1a6d30f6..dcc7b5ed1 100644 --- a/target/linux/config/Config.in.kernel +++ b/target/linux/config/Config.in.kernel @@ -110,7 +110,7 @@ config ADK_KERNEL_CPU_MIPS64_R2 # ARM specific config ADK_KERNEL_AEABI boolean - default y if ADK_LINUX_ARM + default y if ADK_TARGET_ARCH_ARM config ADK_KERNEL_THUMB2_KERNEL boolean @@ -142,7 +142,7 @@ config ADK_KERNEL_COMP_LZ4 select ADK_KERNEL_RD_LZ4 select ADK_KERNEL_KERNEL_LZ4 select ADK_KERNEL_INITRAMFS_COMPRESSION_LZ4 - depends on ADK_LINUX_X86 || ADK_LINUX_ARM + depends on ADK_TARGET_ARCH_X86 || ADK_TARGET_ARCH_ARM depends on !ADK_TARGET_SYSTEM_RASPBERRY_PI config ADK_KERNEL_COMP_LZMA @@ -205,12 +205,12 @@ config ADK_KERNEL_CC_OPTIMIZE_FOR_SIZE prompt "Optimize for size" boolean # does not boot in qemu - depends on !ADK_LINUX_MICROBLAZE + depends on !ADK_TARGET_ARCH_MICROBLAZE default y choice prompt "Page size" -depends on ADK_LINUX_MIPS64 +depends on ADK_TARGET_ARCH_MIPS64 default ADK_KERNEL_PAGE_SIZE_16KB if ADK_TARGET_SYSTEM_LEMOTE_YEELONG default ADK_KERNEL_PAGE_SIZE_4KB diff --git a/target/linux/config/Config.in.kvm b/target/linux/config/Config.in.kvm index 5bba30871..4dfd93b12 100644 --- a/target/linux/config/Config.in.kvm +++ b/target/linux/config/Config.in.kvm @@ -1,5 +1,5 @@ menu "Virtualization" -depends on (ADK_LINUX_X86_64 || ADK_LINUX_X86) && ADK_TARGET_CPU_WITH_VT +depends on (ADK_TARGET_ARCH_X86_64 || ADK_TARGET_ARCH_X86) && ADK_TARGET_CPU_WITH_VT config ADK_KERNEL_VIRTUALIZATION bool diff --git a/target/linux/config/Config.in.leds b/target/linux/config/Config.in.leds index f0001fc41..db855dccf 100644 --- a/target/linux/config/Config.in.leds +++ b/target/linux/config/Config.in.leds @@ -11,7 +11,6 @@ config ADK_KERNEL_LEDS_TRIGGERS config ADK_KERNEL_LEDS_CLASS boolean - depends on !ADK_KERNEL_LEDS_CLASS menu "LEDS driver support" depends on ADK_TARGET_WITH_LEDS -- cgit v1.2.3