From 2186a22ef2d30c85f3d1b5a8fed0cd3f34395e5a Mon Sep 17 00:00:00 2001 From: Gabe Black Date: Sun, 7 Jul 2013 13:52:37 -0700 Subject: [PATCH] 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. BUG=None TEST=Built and booted on Link and Snow. BRANCH=None Change-Id: I1711efa699ddf31d29ebc672bd3728b472c26bb7 Signed-off-by: Gabe Black Reviewed-on: https://gerrit.chromium.org/gerrit/61072 Reviewed-by: Ronald G. Minnich Commit-Queue: Gabe Black Tested-by: Gabe Black --- src/Kconfig | 8 ++++++++ src/arch/armv7/Kconfig | 7 +++++++ src/arch/x86/Kconfig | 14 ++++++-------- 3 files changed, 21 insertions(+), 8 deletions(-) diff --git a/src/Kconfig b/src/Kconfig index 657aa06710..f9fd8be966 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..048f069bfa 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 diff --git a/src/arch/x86/Kconfig b/src/arch/x86/Kconfig index f027205573..20badd7644 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 @@ -94,14 +100,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