diff options
| author | Gabe Black <gabeblack@google.com> | 2013-07-07 13:52:37 -0700 |
|---|---|---|
| committer | Ronald G. Minnich <rminnich@gmail.com> | 2013-07-11 17:55:36 +0200 |
| commit | 5fbfc911c159dc449d3955367908c5443f23ca19 (patch) | |
| tree | c0e15ed5cae0686ad48075d81ea8152138d3fbf4 | |
| parent | db02069d71af6adca96ff432ed0efd7218c076f3 (diff) | |
| download | coreboot-5fbfc911c159dc449d3955367908c5443f23ca19.tar.xz | |
Move the HAVE_ARCH_* config options from src/arch/x86 to src/.
The options that keep track of whether there are arch versions of the standard
string functions shouldn't be in the arch/x86 directory since they apply to
all architectures. Move them into the higher level, shared Kconfig defaulting
to off. Then, in each applicable arch (currently all of them) they can be
selected to on.
Change-Id: I7ea64a583230fdc28773f17fd7cc23e0f0a5f3d6
Signed-off-by: Gabe Black <gabeblack@chromium.org>
Reviewed-on: http://review.coreboot.org/3760
Tested-by: build bot (Jenkins)
Reviewed-by: Ronald G. Minnich <rminnich@gmail.com>
| -rw-r--r-- | src/Kconfig | 8 | ||||
| -rw-r--r-- | src/arch/armv7/Kconfig | 15 | ||||
| -rw-r--r-- | src/arch/x86/Kconfig | 14 |
3 files changed, 21 insertions, 16 deletions
diff --git a/src/Kconfig b/src/Kconfig index fdf40e5954..14e7801600 100644 --- a/src/Kconfig +++ b/src/Kconfig @@ -236,6 +236,14 @@ if ARCH_ARMV7 source src/arch/armv7/Kconfig endif +config HAVE_ARCH_MEMSET + bool + default n + +config HAVE_ARCH_MEMCPY + bool + default n + menu "Chipset" comment "CPU" diff --git a/src/arch/armv7/Kconfig b/src/arch/armv7/Kconfig index 633c5ef98d..130acb44e7 100644 --- a/src/arch/armv7/Kconfig +++ b/src/arch/armv7/Kconfig @@ -1,5 +1,12 @@ menu "Architecture (armv7)" + +config ARM_ARCH_OPTIONS + bool + default y + select HAVE_ARCH_MEMSET + select HAVE_ARCH_MEMCPY + # Maximum reboot count # TODO: Improve description. config MAX_REBOOT_CNT @@ -32,12 +39,4 @@ config UPDATE_IMAGE is a suitable file for further processing. The bootblock will not be modified. -config HAVE_ARCH_MEMSET - bool - default y - -config HAVE_ARCH_MEMCPY - bool - default y - endmenu diff --git a/src/arch/x86/Kconfig b/src/arch/x86/Kconfig index 95fc172695..287e2bcef0 100644 --- a/src/arch/x86/Kconfig +++ b/src/arch/x86/Kconfig @@ -1,5 +1,11 @@ menu "Architecture (x86)" +config X86_ARCH_OPTIONS + bool + default y + select HAVE_ARCH_MEMSET + select HAVE_ARCH_MEMCPY + config MARK_GRAPHICS_MEM_WRCOMB bool "Mark graphics memory as write-combining." default n @@ -95,14 +101,6 @@ config CMOS_DEFAULT_FILE config BOOTBLOCK_SOUTHBRIDGE_INIT string -config HAVE_ARCH_MEMSET - bool - default y - -config HAVE_ARCH_MEMCPY - bool - default y - config IOAPIC_INTERRUPTS_ON_FSB bool default y if !IOAPIC_INTERRUPTS_ON_APIC_SERIAL_BUS |