combine cubox-i kernel configs, make SMP, PREEMPT and HIGHMEM configurable

7 files changed, 29 insertions, 76 deletions

diff --git a/target/arm/kernel/cubox-i2ultra b/target/arm/kernel/cubox-i
index 47bc235c5..0b56db7d7 100644
--- a/target/arm/kernel/cubox-i2ultra
+++ b/target/arm/kernel/cubox-i
@@ -1,6 +1,5 @@
 CONFIG_ARM=y
 CONFIG_ARM_PATCH_PHYS_VIRT=y
-CONFIG_SMP=y
 CONFIG_ARCH_MULTI_V7=y
 CONFIG_ARCH_MXC=y
 CONFIG_ARCH_MX6=y
diff --git a/target/arm/kernel/cubox-i1 b/target/arm/kernel/cubox-i1
deleted file mode 100644
index 82934afc0..000000000
--- a/target/arm/kernel/cubox-i1
+++ /dev/null
@@ -1,16 +0,0 @@
-CONFIG_ARM=y
-CONFIG_ARM_PATCH_PHYS_VIRT=y
-CONFIG_ARCH_MULTI_V7=y
-CONFIG_ARCH_MXC=y
-CONFIG_ARCH_MX6=y
-CONFIG_SOC_IMX6SL=y
-CONFIG_KUSER_HELPERS=y
-CONFIG_AEABI=y
-CONFIG_VFP=y
-CONFIG_VFPv3=y
-CONFIG_NEON=y
-CONFIG_DTC=y
-CONFIG_OF=y
-CONFIG_PCI_IMX6=y
-CONFIG_SERIAL_IMX=y
-CONFIG_SERIAL_IMX_CONSOLE=y
diff --git a/target/arm/kernel/cubox-i2 b/target/arm/kernel/cubox-i2
deleted file mode 100644
index 3a6fecdf5..000000000
--- a/target/arm/kernel/cubox-i2
+++ /dev/null
@@ -1,17 +0,0 @@
-CONFIG_ARM=y
-CONFIG_ARM_PATCH_PHYS_VIRT=y
-CONFIG_SMP=y
-CONFIG_ARCH_MULTI_V7=y
-CONFIG_ARCH_MXC=y
-CONFIG_ARCH_MX6=y
-CONFIG_SOC_IMX6SL=y
-CONFIG_KUSER_HELPERS=y
-CONFIG_AEABI=y
-CONFIG_VFP=y
-CONFIG_VFPv3=y
-CONFIG_NEON=y
-CONFIG_DTC=y
-CONFIG_OF=y
-CONFIG_PCI_IMX6=y
-CONFIG_SERIAL_IMX=y
-CONFIG_SERIAL_IMX_CONSOLE=y
diff --git a/target/arm/kernel/cubox-i4pro b/target/arm/kernel/cubox-i4pro
deleted file mode 100644
index 9d99b12a3..000000000
--- a/target/arm/kernel/cubox-i4pro
+++ /dev/null
@@ -1,27 +0,0 @@
-CONFIG_ARM=y
-CONFIG_ARM_PATCH_PHYS_VIRT=y
-CONFIG_SMP=y
-CONFIG_HIGHMEM=y
-CONFIG_ARCH_MULTI_V7=y
-CONFIG_ARCH_MXC=y
-CONFIG_ARCH_MX6=y
-CONFIG_SOC_IMX6Q=y
-CONFIG_SOC_IMX6SL=y
-CONFIG_LOCAL_TIMERS=y
-CONFIG_MXC_DEBUG_BOARD=y
-CONFIG_KUSER_HELPERS=y
-CONFIG_AEABI=y
-CONFIG_VFP=y
-CONFIG_VFPv3=y
-CONFIG_NEON=y
-CONFIG_DTC=y
-CONFIG_OF=y
-CONFIG_PCI_IMX6=y
-CONFIG_SERIAL_IMX=y
-CONFIG_SERIAL_IMX_CONSOLE=y
-CONFIG_NET_VENDOR_FREESCALE=y
-CONFIG_FEC=y
-CONFIG_PHYLIB=y
-CONFIG_AT803X_PHY=y
-CONFIG_ATAGS=y
-CONFIG_CMDLINE_FORCE=y
diff --git a/target/config/Config.in b/target/config/Config.in
index b1725b876..b5cd6121c 100644
--- a/target/config/Config.in
+++ b/target/config/Config.in
@@ -214,10 +214,7 @@ config ADK_TARGET_KERNEL_MINICONFIG
 	default "qemu-x86_64" if ADK_TARGET_SYSTEM_QEMU_X86_64 || ADK_TARGET_SYSTEM_QEMU_X86_64_32 || ADK_TARGET_SYSTEM_QEMU_X86_64_X32
 	default "aranym-m68k" if ADK_TARGET_SYSTEM_ARANYM_M68K
 	default "ibm-x40" if ADK_TARGET_SYSTEM_IBM_X40
-	default "cubox-i4pro" if ADK_TARGET_CUBOX_I4PRO
-	default "cubox-i2ultra" if ADK_TARGET_CUBOX_I2ULTRA
-	default "cubox-i2" if ADK_TARGET_CUBOX_I2
-	default "cubox-i1" if ADK_TARGET_CUBOX_I1
+	default "cubox-i" if ADK_TARGET_SYSTEM_CUBOX_I
 	default "raspberry-pi" if ADK_TARGET_SYSTEM_RASPBERRY_PI
 	default "sharp-zaurus" if ADK_TARGET_SYSTEM_SHARP_ZAURUS
 	default "lemote-yeelong" if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
@@ -483,8 +480,6 @@ config ADK_TARGET_LIBC
 	default "glibc"  if ADK_glibc
 	default "musl"  if ADK_musl
 
-source "target/linux/config/Config.in.kernel"
-
 choice 
 prompt "Target C library"
 depends on !ADK_CHOOSE_TARGET_SYSTEM && !ADK_CHOOSE_TARGET_ARCH
@@ -606,8 +601,7 @@ config ADK_TARGET_ROOTFS_INITRAMFS_PIGGYBACK
 		ADK_LINUX_PPC || \
 		ADK_LINUX_SPARC || \
 		ADK_LINUX_X86 || \
-		ADK_LINUX_X86_64 || \
-		ADK_LINUX_NATIVE
+		ADK_LINUX_X86_64
 	depends on !ADK_HARDWARE_VBOX
 	select ADK_KERNEL_EXT2_FS
 	help
diff --git a/target/linux/Config.in b/target/linux/Config.in
index 778f4aa7c..03c4f079e 100644
--- a/target/linux/Config.in
+++ b/target/linux/Config.in
@@ -1,3 +1,4 @@
+source target/linux/config/Config.in.kernel
 source target/linux/config/Config.in.cpu
 source target/linux/config/Config.in.block
 source target/linux/config/Config.in.flash
diff --git a/target/linux/config/Config.in.kernel b/target/linux/config/Config.in.kernel
index aed028f79..e6dc6d6e9 100644
--- a/target/linux/config/Config.in.kernel
+++ b/target/linux/config/Config.in.kernel
@@ -106,12 +106,6 @@ config ADK_KERNEL_CPU_MIPS64_R1
 config ADK_KERNEL_CPU_MIPS64_R2
 	boolean
 
-config ADK_KERNEL_PREEMPT
-	boolean
-
-config ADK_KERNEL_THUMB2_KERNEL
-	boolean
-
 # page size
 config ADK_KERNEL_PAGE_SIZE_4KB
 	boolean
@@ -119,10 +113,13 @@ config ADK_KERNEL_PAGE_SIZE_4KB
 config ADK_KERNEL_PAGE_SIZE_16KB
 	boolean
 
-# ABI
+# ARM specific
 config ADK_KERNEL_AEABI
 	boolean
 
+config ADK_KERNEL_THUMB2_KERNEL
+	boolean
+
 # endianess
 config ADK_KERNEL_CPU_BIG_ENDIAN
 	default y if ADK_big
@@ -131,3 +128,25 @@ config ADK_KERNEL_CPU_BIG_ENDIAN
 config ADK_KERNEL_CPU_LITTLE_ENDIAN
 	default y if ADK_little
 	boolean
+
+menu "Kernel options"
+
+config ADK_KERNEL_SMP
+	prompt "Enable symmetric multi processing"
+	boolean
+	default y if ADK_TARGET_CUBOX_I4PRO
+	default y if ADK_TARGET_CUBOX_I2ULTRA
+	default n
+
+config ADK_KERNEL_HIGHMEM
+	prompt "Enable high memory"
+	boolean
+	default y if ADK_TARGET_CUBOX_I4PRO
+	default n
+
+config ADK_KERNEL_PREEMPT
+	prompt "Enable preemptive kernel"
+	boolean
+	default n
+
+endmenu