move single options out of main menu and remove stray "options"

Signed-off-by: Stefan Reinauer <stepan@coreboot.org>
Acked-by: Stefan Reinauer <stepan@coreboot.org>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@6244 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

diff --git a/src/Kconfig.deprecated_options b/src/Kconfig.deprecated_options
index f6f6a4bedff719240bf9b0cf0a50200a70f44e28..aa32d0d864f630ef9189c18b50c1be83621330be 100644 (file)
--- a/src/Kconfig.deprecated_options
+++ b/src/Kconfig.deprecated_options
@@ -2,6 +2,8 @@
 # if possible, and if you find the time, or touch the general area
 # for other purposes, please consider removing their uses.
 
+menu "Deprecated"
+
 # It might be possible to consolidate hard_reset() to southbridges,
 # given that it (usually) uses its registers.
 # The long term goal would be to eliminate hard_reset() from boards.
@@ -49,3 +51,4 @@ config DRIVERS_PS2_KEYBOARD
          this option, then you can say N here to speed up boot time.
          Otherwise say Y.
 
+endmenu

diff --git a/src/arch/x86/Kconfig b/src/arch/x86/Kconfig
index 6591159095982ff462753442a66f4fc1cdfdcf29..28a65b61a21c2f266eb112330a21b50aa3405572 100644 (file)
--- a/src/arch/x86/Kconfig
+++ b/src/arch/x86/Kconfig
@@ -1,3 +1,5 @@
+menu "Architecture (x86)"
+
 # This is an SMP option. It relates to starting up APs.
 # It is usually set in mainboard/*/Kconfig.
 # TODO: Improve description.
@@ -91,3 +93,5 @@ config BOOTBLOCK_NORTHBRIDGE_INIT
 
 config BOOTBLOCK_SOUTHBRIDGE_INIT
        string
+
+endmenu

diff --git a/src/console/Kconfig b/src/console/Kconfig
index 90bfe9caa7292f7d4c1dd0d474fd1a760c59cec8..296b66819266290007ead45fa7f978608f12ecd2 100644 (file)
--- a/src/console/Kconfig
+++ b/src/console/Kconfig
@@ -1,4 +1,4 @@
-menu "Console options"
+menu "Console"
 # TODO: Rename to SERIAL_CONSOLE once Kconfig transition is complete.
 config CONSOLE_SERIAL8250
        bool "Serial port console output"