From 58470e39b3958292e112e13251c5c811409a7a02 Mon Sep 17 00:00:00 2001 From: Stefan Reinauer Date: Fri, 17 Oct 2014 13:08:36 +0200 Subject: 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 Reviewed-on: http://review.coreboot.org/7089 Tested-by: build bot (Jenkins) Reviewed-by: Patrick Georgi --- src/Kconfig | 100 ++++++++++++++++++++++++++++++------------------------------ 1 file changed, 50 insertions(+), 50 deletions(-) (limited to 'src/Kconfig') 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 -- cgit v1.2.3