summaryrefslogtreecommitdiff
path: root/target/config
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2011-01-10 11:03:58 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2011-01-10 11:03:58 +0100
commit94c763109f74b446e4d5d31e55ef337c8c8d86cb (patch)
tree22d1cd06809f5a5c11241e998d9ead4010ac3c91 /target/config
parenta217fc80b29080dae963bb15051df023de36ce39 (diff)
parent16d94117a716fc361d3db9a2a17cf4c45eab837d (diff)
resolve conflicts
Diffstat (limited to 'target/config')
-rw-r--r--target/config/Config.in11
1 files changed, 11 insertions, 0 deletions
diff --git a/target/config/Config.in b/target/config/Config.in
index 47fde82ce..5e9f42073 100644
--- a/target/config/Config.in
+++ b/target/config/Config.in
@@ -89,6 +89,17 @@ config ADK_HARDWARE_QEMU
config ADK_NATIVE
boolean
+# the inverse of ADK_TARGET_KERNEL_CUSTOMISING,
+# allows for selecting it off (i.e., to disable it)
+config ADK_TARGET_FIXED_KERNEL
+ bool
+ default n
+
+config ADK_TARGET_KERNEL_CUSTOMISING
+ bool
+ default y
+ depends on !ADK_TARGET_FIXED_KERNEL
+
# cpu features
config ADK_TARGET_CPU_WITH_VT
boolean