Furquan Shaikh (furquan@google.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/5673
-gerrit
commit 241e099f931c14237193128b0286e4baf8fa7f7d Author: Furquan Shaikh furquan@google.com Date: Tue May 6 18:00:19 2014 -0700
Arch-level Kconfig menu cleanup
Remove arch-level Kconfig menu option as it shows all available architectures in make menuconfig. Instead pull the bootblock options for choice and update image to top-level Kconfig since it is already present for both x86 and arm.
Change-Id: Iab9c4539f05cd54a7f751565fefcaf7b6f0edc86 Signed-off-by: Furquan Shaikh furquan@google.com --- src/Kconfig | 26 ++++++++++++++++++++++++++ src/arch/armv7/Kconfig | 30 ------------------------------ src/arch/x86/Kconfig | 33 --------------------------------- 3 files changed, 26 insertions(+), 63 deletions(-)
diff --git a/src/Kconfig b/src/Kconfig index 849e55d..dcfce06 100644 --- a/src/Kconfig +++ b/src/Kconfig @@ -242,6 +242,32 @@ source src/arch/armv7/Kconfig
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 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" diff --git a/src/arch/armv7/Kconfig b/src/arch/armv7/Kconfig index e541074..ec24e17 100644 --- a/src/arch/armv7/Kconfig +++ b/src/arch/armv7/Kconfig @@ -1,5 +1,3 @@ -menu "Architecture (armv7)" - config ARCH_BOOTBLOCK_ARMV7 bool default n @@ -12,31 +10,3 @@ config ARCH_ROMSTAGE_ARMV7 config ARCH_RAMSTAGE_ARMV7 bool default n - -choice - prompt "Bootblock behaviour" - default ARM_BOOTBLOCK_SIMPLE - -config ARM_BOOTBLOCK_SIMPLE - bool "Always load fallback" - -config ARM_BOOTBLOCK_NORMAL - bool "Switch to normal if non-volatile memory says so" - -endchoice - -config BOOTBLOCK_SOURCE - string - default "bootblock_simple.c" if ARM_BOOTBLOCK_SIMPLE - default "bootblock_normal.c" if ARM_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 diff --git a/src/arch/x86/Kconfig b/src/arch/x86/Kconfig index 1ce11df..c2e0624 100644 --- a/src/arch/x86/Kconfig +++ b/src/arch/x86/Kconfig @@ -1,5 +1,3 @@ -menu "Architecture (x86)" - config ARCH_BOOTBLOCK_X86_32 bool default n @@ -49,35 +47,6 @@ config NUM_IPI_STARTS int default 2
-# We had to rename the choice options under arch/ because otherwise -# the options would conflict between different architectures despite -# the if ARCH_xxx guarding the arch/xxx/Kconfig sourcing. -choice - prompt "Bootblock behaviour" - default X86_BOOTBLOCK_SIMPLE - -config X86_BOOTBLOCK_SIMPLE - bool "Always load fallback" - -config X86_BOOTBLOCK_NORMAL - bool "Switch to normal if CMOS says so" - -endchoice - -config BOOTBLOCK_SOURCE - string - default "bootblock_simple.c" if X86_BOOTBLOCK_SIMPLE - default "bootblock_normal.c" if X86_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. - config ROMCC bool default n @@ -118,5 +87,3 @@ config HPET_ADDRESS config ID_SECTION_OFFSET hex default 0x80 - -endmenu
-
Furquan Shaikh