aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/Kconfig8
-rw-r--r--src/arch/armv7/Kconfig15
-rw-r--r--src/arch/x86/Kconfig14
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