summaryrefslogtreecommitdiffstats
path: root/common/Kconfig
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2013-02-04 15:49:00 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2013-02-04 15:49:00 +0100
commitda5fe0ba470283b384760c4976815fc20c1d45bd (patch)
tree11f2a08de885570d5d8c453f0c8b384427c666c0 /common/Kconfig
parentaacd51bfd2d20138b6f9c549fb4f1aa66e88243b (diff)
parent195310fd7b48e2c1198f216f9b4122d8f63e620e (diff)
downloadbarebox-da5fe0ba470283b384760c4976815fc20c1d45bd.tar.gz
barebox-da5fe0ba470283b384760c4976815fc20c1d45bd.tar.xz
Merge branch 'for-next/misc'
Diffstat (limited to 'common/Kconfig')
-rw-r--r--common/Kconfig22
1 files changed, 15 insertions, 7 deletions
diff --git a/common/Kconfig b/common/Kconfig
index 42a54f7988..609b6d95a4 100644
--- a/common/Kconfig
+++ b/common/Kconfig
@@ -460,10 +460,13 @@ config TIMESTAMP
commands like bootm or iminfo. This option is
automatically enabled when you select CFG_CMD_DATE .
+choice
+ prompt "console support"
+ default CONSOLE_FULL
+
config CONSOLE_FULL
bool
- default y
- prompt "Enable full console support"
+ prompt "full"
help
This option enables full console support capable of
handling multiple consoles. Also the full console support
@@ -472,6 +475,16 @@ config CONSOLE_FULL
once the first console is registered. Recommended for most
usecases.
+config CONSOLE_SIMPLE
+ bool
+ prompt "simple"
+
+config CONSOLE_NONE
+ bool
+ prompt "none"
+
+endchoice
+
choice
prompt "Console activation strategy"
depends on CONSOLE_FULL
@@ -504,11 +517,6 @@ config CONSOLE_ACTIVATE_NONE
endchoice
-config CONSOLE_SIMPLE
- bool
- default y
- depends on !CONSOLE_FULL
-
config PARTITION
bool
prompt "Enable Partitions"