Furquan Shaikh (furquan@google.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/5579
-gerrit
commit a106da06974dbe9e728a41c614e7208586ba37b3 Author: Furquan Shaikh furquan@google.com Date: Fri Apr 25 14:35:45 2014 -0700
Clean arch-level Kconfig files
General cleanup of arch-level (x86 and arm) Kconfig files: 1) Move MAX_REBOOT_CNT to top level Kconfig 2) Remove ARCH_MEM* options 3) Make PC80_system option depend on ARCH_BINARY_X86 to be default y 4) Include all arch-level Kconfigs by default (Necessary for arch-aware stages) 5) Move stage-specific arch options to arch-level Kconfigs
Change-Id: I09eca097c128f38632249d6a1de816f055cdcfd0 Signed-off-by: Furquan Shaikh furquan@google.com --- src/Kconfig | 53 ++++++-------------------------------------------- src/arch/armv7/Kconfig | 25 ++++++++++++------------ src/arch/x86/Kconfig | 26 ++++++++++++------------- src/lib/Makefile.inc | 38 ------------------------------------ 4 files changed, 31 insertions(+), 111 deletions(-)
diff --git a/src/Kconfig b/src/Kconfig index 298157f..25586e1 100644 --- a/src/Kconfig +++ b/src/Kconfig @@ -237,57 +237,10 @@ config ARCH_ARMV7 bool default n
-# This option is used to set the architecture of bootblock stage -config ARCH_BOOTBLOCK_ARMV7 - bool - default n - select ARCH_ARMV7 - -config ARCH_BOOTBLOCK_X86_32 - bool - default n - select ARCH_X86 - -# This option is used to set the architecture of romstage stage -config ARCH_ROMSTAGE_ARMV7 - bool - default n - -config ARCH_ROMSTAGE_X86_32 - bool - default n - -# This option is used to set the architecture of ramstage stage -config ARCH_RAMSTAGE_ARMV7 - bool - default n - -config ARCH_RAMSTAGE_X86_32 - bool - default n - - # Warning: The file is included whether or not the if is here. # but the if controls how the evaluation occurs. -if ARCH_X86 source src/arch/x86/Kconfig -endif - -if ARCH_ARMV7 source src/arch/armv7/Kconfig -endif - -config HAVE_ARCH_MEMSET - bool - default n - -config HAVE_ARCH_MEMCPY - bool - default n - -config HAVE_ARCH_MEMMOVE - bool - default n
source src/vendorcode/Kconfig
@@ -1150,3 +1103,9 @@ config REG_SCRIPT help Internal option that controls whether we compile in register scripts.
+# Maximum reboot count +# TODO: Improve description. +config MAX_REBOOT_CNT + int + default 3 + diff --git a/src/arch/armv7/Kconfig b/src/arch/armv7/Kconfig index 4f9fc34..60e49d5 100644 --- a/src/arch/armv7/Kconfig +++ b/src/arch/armv7/Kconfig @@ -1,18 +1,17 @@ menu "Architecture (armv7)"
- -config ARM_ARCH_OPTIONS - bool - default y - select HAVE_ARCH_MEMSET - select HAVE_ARCH_MEMCPY - select HAVE_ARCH_MEMMOVE - -# Maximum reboot count -# TODO: Improve description. -config MAX_REBOOT_CNT - int - default 3 +config ARCH_BOOTBLOCK_ARMV7 + bool + default n + select ARCH_ARMV7 + +config ARCH_ROMSTAGE_ARMV7 + bool + default n + +config ARCH_RAMSTAGE_ARMV7 + bool + default n
choice prompt "Bootblock behaviour" diff --git a/src/arch/x86/Kconfig b/src/arch/x86/Kconfig index 8854e6b..52af233 100644 --- a/src/arch/x86/Kconfig +++ b/src/arch/x86/Kconfig @@ -1,11 +1,17 @@ menu "Architecture (x86)"
-config X86_ARCH_OPTIONS - bool - default y - select HAVE_ARCH_MEMSET - select HAVE_ARCH_MEMCPY - select HAVE_ARCH_MEMMOVE +config ARCH_BOOTBLOCK_X86_32 + bool + default n + select ARCH_X86 + +config ARCH_ROMSTAGE_X86_32 + bool + default n + +config ARCH_RAMSTAGE_X86_32 + bool + default n
# This is an SMP option. It relates to starting up APs. # It is usually set in mainboard/*/Kconfig. @@ -34,12 +40,6 @@ config STACK_SIZE hex default 0x1000
-# Maximum reboot count -# TODO: Improve description. -config MAX_REBOOT_CNT - int - default 3 - # This is something you almost certainly don't want to mess with. # How many SIPIs do we send when starting up APs and cores? # The answer in 2000 or so was '2'. Nowadays, on many systems, @@ -84,7 +84,7 @@ config ROMCC
config PC80_SYSTEM bool - default y + default y if ARCH_X86
config BOOTBLOCK_MAINBOARD_INIT string diff --git a/src/lib/Makefile.inc b/src/lib/Makefile.inc index 014f8a6..1eb7354 100644 --- a/src/lib/Makefile.inc +++ b/src/lib/Makefile.inc @@ -19,27 +19,10 @@ subdirs-y += loaders
bootblock-y += cbfs.c -ifneq ($(CONFIG_HAVE_ARCH_MEMSET),y) -bootblock-y += memset.c -endif bootblock-y += memchr.c -ifneq ($(CONFIG_HAVE_ARCH_MEMCPY),y) -bootblock-y += memcpy.c -endif bootblock-y += memcmp.c -ifneq ($(CONFIG_HAVE_ARCH_MEMMOVE),y) -bootblock-y += memmove.c -endif
-ifneq ($(CONFIG_HAVE_ARCH_MEMSET),y) -romstage-y += memset.c -rmodules-y += memset.c -endif romstage-y += memchr.c -ifneq ($(CONFIG_HAVE_ARCH_MEMCPY),y) -romstage-y += memcpy.c -rmodules-y += memcpy.c -endif romstage-y += memcmp.c rmodules-y += memcmp.c romstage-y += cbfs.c @@ -53,26 +36,14 @@ romstage-$(CONFIG_CONSOLE_CBMEM) += cbmem_console.c endif
romstage-y += compute_ip_checksum.c -ifneq ($(CONFIG_HAVE_ARCH_MEMMOVE),y) -romstage-y += memmove.c -endif romstage-$(CONFIG_ARCH_ROMSTAGE_X86_32) += gcc.c
ramstage-y += hardwaremain.c ramstage-y += selfboot.c ramstage-y += coreboot_table.c ramstage-y += bootmem.c -ifneq ($(CONFIG_HAVE_ARCH_MEMSET),y) -ramstage-y += memset.c -endif ramstage-y += memchr.c -ifneq ($(CONFIG_HAVE_ARCH_MEMCPY),y) -ramstage-y += memcpy.c -endif ramstage-y += memcmp.c -ifneq ($(CONFIG_HAVE_ARCH_MEMMOVE),y) -ramstage-y += memmove.c -endif ramstage-y += malloc.c smm-$(CONFIG_SMM_TSEG) += malloc.c ramstage-y += delay.c @@ -114,15 +85,6 @@ ramstage-$(CONFIG_REG_SCRIPT) += reg_script.c
romstage-$(CONFIG_CACHE_RELOCATED_RAMSTAGE_OUTSIDE_CBMEM) += ramstage_cache.c
-ifneq ($(CONFIG_HAVE_ARCH_MEMSET),y) -smm-y += memset.c -endif -ifneq ($(CONFIG_HAVE_ARCH_MEMCPY),y) -smm-y += memcpy.c -endif -ifneq ($(CONFIG_HAVE_ARCH_MEMMOVE),y) -smm-y += memmove.c -endif smm-y += cbfs.c memcmp.c smm-y += gcc.c