summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Petazzoni <thomas.petazzoni@free-electrons.com>2010-12-05 21:52:44 +0100
committerPeter Korsgaard <jacmet@sunsite.dk>2010-12-16 12:19:25 +0100
commitbeb43c7d26eff220acb6de98300f4e0865352154 (patch)
tree85aaedb65547426c369eb35d0a9f8aafecb24c6d
parent9e1107ba14b0af2f39232aedf7e997aaed098899 (diff)
Re-add target/generic/Config.in options to menuconfig
The options to customize the hostname, the banner and the serial port configuration are now inside a menu named 'System configuration'. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
-rw-r--r--Config.in2
-rw-r--r--target/generic/Config.in4
2 files changed, 4 insertions, 2 deletions
diff --git a/Config.in b/Config.in
index 874c20abd..ff7744952 100644
--- a/Config.in
+++ b/Config.in
@@ -334,6 +334,8 @@ endmenu
source "toolchain/Config.in"
+source "target/generic/Config.in"
+
source "package/Config.in"
source "fs/Config.in"
diff --git a/target/generic/Config.in b/target/generic/Config.in
index 54ff1d6ba..81ac01197 100644
--- a/target/generic/Config.in
+++ b/target/generic/Config.in
@@ -1,4 +1,4 @@
-if !(BR2_TARGET_ATMEL||BR2_TARGET_KWIKBYTE||BR2_TARGET_VALKA)
+menu "System configuration"
config BR2_TARGET_GENERIC_HOSTNAME
string "System hostname"
@@ -166,4 +166,4 @@ config BR2_TARGET_GENERIC_GETTY_BAUDRATE
endif # BR2_TARGET_GENERIC_GETTY
-endif
+endmenu