Kconfig: clean up options in top level and device menu

Move generic options to the "General Setup" menu.
Move device specific options to the "Devices" menu.

Change-Id: I514a021305d43f026b24fd3016477300700ed401
Signed-off-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
Reviewed-on: http://review.coreboot.org/7089
Tested-by: build bot (Jenkins)
Reviewed-by: Patrick Georgi <pgeorgi@google.com>

2 files changed, 93 insertions, 100 deletions

diff --git a/src/Kconfig b/src/Kconfig
index c08fd27e0f..ab471d29d4 100644
--- a/src/Kconfig
+++ b/src/Kconfig
@@ -199,30 +199,32 @@ config COVERAGE
 	  coverage information in CBMEM for extraction from user space.
 	  If unsure, say N.
 
-endmenu
-
-source src/mainboard/Kconfig
-
-# This option is used to set the architecture of a mainboard to X86.
-# It is usually set in mainboard/*/Kconfig.
-config ARCH_X86
-	bool
+config RELOCATABLE_MODULES
+	bool "Relocatable Modules"
 	default n
-	select PCI
+	help
+	 If RELOCATABLE_MODULES is selected then support is enabled for
+	 building relocatable modules in the RAM stage. Those modules can be
+	 loaded anywhere and all the relocations are handled automatically.
 
-config ARCH_ARM
-	bool
+config RELOCATABLE_RAMSTAGE
+	depends on (RELOCATABLE_MODULES && DYNAMIC_CBMEM)
+	bool "Build the ramstage to be relocatable in 32-bit address space."
 	default n
+	help
+	 The reloctable ramstage support allows for the ramstage to be built
+	 as a relocatable module. The stage loader can identify a place
+	 out of the OS way so that copying memory is unnecessary during an S3
+	 wake. When selecting this option the romstage is responsible for
+	 determing a stack location to use for loading the ramstage.
 
-config ARCH_ARM64
-	bool
+config CACHE_RELOCATED_RAMSTAGE_OUTSIDE_CBMEM
+	depends on RELOCATABLE_RAMSTAGE
+	bool "Cache the relocated ramstage outside of cbmem."
 	default n
-
-source src/arch/x86/Kconfig
-source src/arch/arm/Kconfig
-source src/arch/arm64/Kconfig
-
-source src/vendorcode/Kconfig
+	help
+	 The relocated ramstage is saved in an area specified by the
+	 by the board and/or chipset.
 
 choice
 	prompt "Bootblock behaviour"
@@ -236,10 +238,6 @@ config BOOTBLOCK_NORMAL
 
 endchoice
 
-config SYSTEM_TYPE_LAPTOP
-       default n
-       bool
-
 config BOOTBLOCK_SOURCE
 	string
 	default "bootblock_simple.c" if BOOTBLOCK_SIMPLE
@@ -254,6 +252,35 @@ config UPDATE_IMAGE
 	  is a suitable file for further processing.
 	  The bootblock will not be modified.
 
+endmenu
+
+source src/mainboard/Kconfig
+
+# This option is used to set the architecture of a mainboard to X86.
+# It is usually set in mainboard/*/Kconfig.
+config ARCH_X86
+	bool
+	default n
+	select PCI
+
+config ARCH_ARM
+	bool
+	default n
+
+config ARCH_ARM64
+	bool
+	default n
+
+source src/arch/x86/Kconfig
+source src/arch/arm/Kconfig
+source src/arch/arm64/Kconfig
+
+source src/vendorcode/Kconfig
+
+config SYSTEM_TYPE_LAPTOP
+       default n
+       bool
+
 menu "Chipset"
 
 comment "CPU"
@@ -410,33 +437,6 @@ config GFXUMA
 	help
 	  Enable Unified Memory Architecture for graphics.
 
-config RELOCATABLE_MODULES
-	bool "Relocatable Modules"
-	default n
-	help
-	 If RELOCATABLE_MODULES is selected then support is enabled for
-	 building relocatable modules in the RAM stage. Those modules can be
-	 loaded anywhere and all the relocations are handled automatically.
-
-config RELOCATABLE_RAMSTAGE
-	depends on (RELOCATABLE_MODULES && DYNAMIC_CBMEM)
-	bool "Build the ramstage to be relocatable in 32-bit address space."
-	default n
-	help
-	 The reloctable ramstage support allows for the ramstage to be built
-	 as a relocatable module. The stage loader can identify a place
-	 out of the OS way so that copying memory is unnecessary during an S3
-	 wake. When selecting this option the romstage is responsible for
-	 determing a stack location to use for loading the ramstage.
-
-config CACHE_RELOCATED_RAMSTAGE_OUTSIDE_CBMEM
-	depends on RELOCATABLE_RAMSTAGE
-	bool "Cache the relocated ramstage outside of cbmem."
-	default n
-	help
-	 The relocated ramstage is saved in an area specified by the
-	 by the board and/or chipset.
-
 config HAVE_ACPI_TABLES
 	bool
 	help
diff --git a/src/device/Kconfig b/src/device/Kconfig
index 58dcc1b8d6..bd2f34b618 100644
--- a/src/device/Kconfig
+++ b/src/device/Kconfig
@@ -282,9 +282,21 @@ config EARLY_PCI_MMIO_BASE
 
 endif # EARLY_PCI_BRIDGE
 
-endmenu
+config SUBSYSTEM_VENDOR_ID
+	hex "Override PCI Subsystem Vendor ID"
+	depends on PCI
+	default "0x0000"
+	help
+	  This config option will override the devicetree settings for
+	  PCI Subsystem Vendor ID.
 
-menu "VGA BIOS"
+config SUBSYSTEM_DEVICE_ID
+	hex "Override PCI Subsystem Device ID"
+	depends on PCI
+	default "0x0000"
+	help
+	  This config option will override the devicetree settings for
+	  PCI Subsystem Device ID.
 
 config VGA_BIOS
 	bool "Add a VGA BIOS image"
@@ -335,6 +347,35 @@ config MBI_FILE
 	help
 	  The path and filename of the file to use as VGA BIOS.
 
+config PXE_ROM
+	bool "Add a PXE ROM image"
+	help
+	  Select this option if you have a PXE ROM image that you would
+	  like to add to your ROM.
+
+config PXE_ROM_FILE
+	string "PXE ROM filename"
+	depends on PXE_ROM
+	default "pxe.rom"
+	help
+	  The path and filename of the file to use as PXE ROM.
+
+config PXE_ROM_ID
+	string "network card PCI IDs"
+	depends on PXE_ROM
+	default "10ec,8168"
+	help
+	  The comma-separated PCI vendor and device ID that would associate
+	  your PXE ROM to your network card.
+
+	  Example: 10ec,8168
+
+	  In the above example 10ec is the PCI vendor ID (in hex, but without
+	  the "0x" prefix) and 8168 specifies the PCI device ID of the
+	  network card (also in hex, without "0x" prefix).
+
+	  Under GNU/Linux you can run `lspci -nn` to list the IDs of your PCI devices.
+
 endmenu
 
 menu "Display"
@@ -510,51 +551,3 @@ config BOOTSPLASH_FILE
 	  screen. The file format has to be jpg.
 
 endmenu
-
-menu "PXE ROM"
-config PXE_ROM
-	bool "Add a PXE ROM image"
-	help
-	  Select this option if you have a PXE ROM image that you would
-	  like to add to your ROM.
-
-config PXE_ROM_FILE
-	string "PXE ROM filename"
-	depends on PXE_ROM
-	default "pxe.rom"
-	help
-	  The path and filename of the file to use as PXE ROM.
-
-config PXE_ROM_ID
-	string "network card PCI IDs"
-	depends on PXE_ROM
-	default "10ec,8168"
-	help
-	  The comma-separated PCI vendor and device ID that would associate
-	  your PXE ROM to your network card.
-
-	  Example: 10ec,8168
-
-	  In the above example 10ec is the PCI vendor ID (in hex, but without
-	  the "0x" prefix) and 8168 specifies the PCI device ID of the
-	  network card (also in hex, without "0x" prefix).
-
-	  Under GNU/Linux you can run `lspci -nn` to list the IDs of your PCI devices.
-
-endmenu
-
-config SUBSYSTEM_VENDOR_ID
-	hex "Override PCI Subsystem Vendor ID"
-	depends on PCI
-	default "0x0000"
-	help
-	  This config option will override the devicetree settings for
-	  PCI Subsystem Vendor ID.
-
-config SUBSYSTEM_DEVICE_ID
-	hex "Override PCI Subsystem Device ID"
-	depends on PCI
-	default "0x0000"
-	help
-	  This config option will override the devicetree settings for
-	  PCI Subsystem Device ID.