From 7bcadb06072bccdda7eebb8f9217e63745cf30b1 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 30 Apr 2014 01:28:54 +0200 Subject: combine cubox-i kernel configs, make SMP, PREEMPT and HIGHMEM configurable --- target/linux/Config.in | 1 + target/linux/config/Config.in.kernel | 33 ++++++++++++++++++++++++++------- 2 files changed, 27 insertions(+), 7 deletions(-) (limited to 'target/linux') 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 -- cgit v1.2.3