Patch set updated for coreboot: b5e7e2e Clean arch-level Kconfig files

[Furquan Shaikh]

Furquan Shaikh ([e-mail]) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/5579

-gerrit

commit b5e7e2e786ed55b3b6fff97a0858b9413db430f2
Author: Furquan Shaikh <[e-mail]>
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 common stuff to top-level Makefile.
    2) Remove unwanted config options.
    3) Make options default to n instead of y
    4) Include all arch-level Kconfigs by default (Necessary for arch-aware stages)
    
    Change-Id: I09eca097c128f38632249d6a1de816f055cdcfd0
    Signed-off-by: Furquan Shaikh <[e-mail]>
---
 src/Kconfig            | 24 +++++++-----------------
 src/arch/armv7/Kconfig |  9 ---------
 src/arch/x86/Kconfig   | 11 +----------
 src/lib/Makefile.inc   | 38 --------------------------------------
 4 files changed, 8 insertions(+), 74 deletions(-)

diff --git a/src/Kconfig b/src/Kconfig
index e85ab62..bad55f8 100644
--- a/src/Kconfig
+++ b/src/Kconfig
@@ -232,6 +232,7 @@ config ARCH_BINARY_X86
 	bool
 	default n
 	select PCI
+	select PC80_SYSTEM
 
 config ARCH_BINARY_ARMV7
 	bool
@@ -267,25 +268,8 @@ config ARCH_RAMSTAGE_X86
 
 # Warning: The file is included whether or not the if is here.
 # but the if controls how the evaluation occurs.
-if ARCH_BINARY_X86
 source src/arch/x86/Kconfig
-endif
-
-if ARCH_BINARY_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
 
@@ -1147,3 +1131,9 @@ config REG_SCRIPT
 	default n
 	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..f521323 100644
--- a/src/arch/armv7/Kconfig
+++ b/src/arch/armv7/Kconfig
@@ -4,15 +4,6 @@ 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
 
 choice
 	prompt "Bootblock behaviour"
diff --git a/src/arch/x86/Kconfig b/src/arch/x86/Kconfig
index 36c9356..b4f919e 100644
--- a/src/arch/x86/Kconfig
+++ b/src/arch/x86/Kconfig
@@ -3,9 +3,6 @@ menu "Architecture (x86)"
 config X86_ARCH_OPTIONS
 	bool
 	default y
-	select HAVE_ARCH_MEMSET
-	select HAVE_ARCH_MEMCPY
-	select HAVE_ARCH_MEMMOVE
 
 # This is an SMP option. It relates to starting up APs.
 # It is usually set in mainboard/*/Kconfig.
@@ -34,12 +31,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 +75,7 @@ config ROMCC
 
 config PC80_SYSTEM
 	bool
-	default y
+	default n
 
 config BOOTBLOCK_MAINBOARD_INIT
 	string
diff --git a/src/lib/Makefile.inc b/src/lib/Makefile.inc
index 3e2550c..07de0d0 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_BINARY_X86) += 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