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>
diff --git a/src/Kconfig b/src/Kconfig
index c08fd27..ab471d2 100644
--- a/src/Kconfig
+++ b/src/Kconfig
@@ -199,6 +199,59 @@
coverage information in CBMEM for extraction from user space.
If unsure, say N.
+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.
+
+choice
+ prompt "Bootblock behaviour"
+ default BOOTBLOCK_SIMPLE
+
+config BOOTBLOCK_SIMPLE
+ bool "Always load fallback"
+
+config BOOTBLOCK_NORMAL
+ bool "Switch to normal if CMOS says so"
+
+endchoice
+
+config BOOTBLOCK_SOURCE
+ string
+ default "bootblock_simple.c" if BOOTBLOCK_SIMPLE
+ default "bootblock_normal.c" if BOOTBLOCK_NORMAL
+
+config UPDATE_IMAGE
+ bool "Update existing coreboot.rom image"
+ default n
+ help
+ If this option is enabled, no new coreboot.rom file
+ is created. Instead it is expected that there already
+ is a suitable file for further processing.
+ The bootblock will not be modified.
+
endmenu
source src/mainboard/Kconfig
@@ -224,36 +277,10 @@
source src/vendorcode/Kconfig
-choice
- prompt "Bootblock behaviour"
- default BOOTBLOCK_SIMPLE
-
-config BOOTBLOCK_SIMPLE
- bool "Always load fallback"
-
-config BOOTBLOCK_NORMAL
- bool "Switch to normal if CMOS says so"
-
-endchoice
-
config SYSTEM_TYPE_LAPTOP
default n
bool
-config BOOTBLOCK_SOURCE
- string
- default "bootblock_simple.c" if BOOTBLOCK_SIMPLE
- default "bootblock_normal.c" if BOOTBLOCK_NORMAL
-
-config UPDATE_IMAGE
- bool "Update existing coreboot.rom image"
- default n
- help
- If this option is enabled, no new coreboot.rom file
- is created. Instead it is expected that there already
- is a suitable file for further processing.
- The bootblock will not be modified.
-
menu "Chipset"
comment "CPU"
@@ -410,33 +437,6 @@
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