Move ARCH_* from board/Kconfig to cpu or soc Kconfig.
CONFIG_ARCH is a property of the cpu or soc rather than a property of the board. Hence, move ARCH_* from every single board to respective cpu or soc Kconfigs. Also update abuild to ignore ARCH_ from mainboards. Change-Id: I6ec1206de5a20601c32d001a384a47f46e6ce479 Signed-off-by: Furquan Shaikh <furquan@google.com> Reviewed-on: http://review.coreboot.org/5570 Tested-by: build bot (Jenkins) Reviewed-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
This commit is contained in:
committed by
Kyösti Mälkki
parent
2d9725e763
commit
fd33781fbf
@@ -1,17 +1,12 @@
|
||||
# Warning: This file is included whether or not the if is here.
|
||||
# The if controls how the evaluation occurs.
|
||||
# (See also src/Kconfig)
|
||||
if ARCH_ARMV7
|
||||
|
||||
source src/cpu/allwinner/Kconfig
|
||||
source src/cpu/armltd/Kconfig
|
||||
source src/cpu/samsung/Kconfig
|
||||
source src/cpu/ti/Kconfig
|
||||
|
||||
endif # ARCH_ARM
|
||||
|
||||
if ARCH_X86
|
||||
|
||||
source src/cpu/amd/Kconfig
|
||||
source src/cpu/dmp/Kconfig
|
||||
source src/cpu/intel/Kconfig
|
||||
@@ -19,6 +14,8 @@ source src/cpu/via/Kconfig
|
||||
source src/cpu/qemu-x86/Kconfig
|
||||
source src/cpu/x86/Kconfig
|
||||
|
||||
if ARCH_X86
|
||||
|
||||
config CACHE_AS_RAM
|
||||
bool
|
||||
default !ROMCC
|
||||
|
@@ -6,6 +6,7 @@ if CPU_ALLWINNER_A10
|
||||
|
||||
config CPU_SPECIFIC_OPTIONS
|
||||
def_bool y
|
||||
select ARCH_ARMV7
|
||||
select HAVE_MONOTONIC_TIMER
|
||||
select HAVE_UART_SPECIAL
|
||||
select BOOTBLOCK_CONSOLE
|
||||
|
@@ -26,6 +26,7 @@ config CPU_AMD_AGESA
|
||||
default y if CPU_AMD_AGESA_FAMILY15_TN
|
||||
default y if CPU_AMD_AGESA_FAMILY16_KB
|
||||
default n
|
||||
select ARCH_X86
|
||||
select TSC_SYNC_LFENCE
|
||||
select UDELAY_LAPIC
|
||||
select LAPIC_MONOTONIC_TIMER
|
||||
|
@@ -19,6 +19,7 @@
|
||||
|
||||
config CPU_AMD_GEODE_GX1
|
||||
bool
|
||||
select ARCH_X86
|
||||
|
||||
if CPU_AMD_GEODE_GX1
|
||||
|
||||
|
@@ -19,6 +19,7 @@
|
||||
|
||||
config CPU_AMD_GEODE_GX2
|
||||
bool
|
||||
select ARCH_X86
|
||||
|
||||
if CPU_AMD_GEODE_GX2
|
||||
|
||||
|
@@ -1,5 +1,6 @@
|
||||
config CPU_AMD_GEODE_LX
|
||||
bool
|
||||
select ARCH_X86
|
||||
|
||||
if CPU_AMD_GEODE_LX
|
||||
|
||||
|
@@ -1,5 +1,6 @@
|
||||
config CPU_AMD_MODEL_10XXX
|
||||
bool
|
||||
select ARCH_X86
|
||||
select SSE
|
||||
select SSE2
|
||||
select MMCONF_SUPPORT_DEFAULT
|
||||
|
@@ -1,5 +1,6 @@
|
||||
config CPU_AMD_MODEL_FXX
|
||||
bool
|
||||
select ARCH_X86
|
||||
select MMX
|
||||
select SSE
|
||||
select SSE2
|
||||
|
@@ -1,2 +1,3 @@
|
||||
config CPU_AMD_SC520
|
||||
bool
|
||||
select ARCH_X86
|
||||
|
@@ -1,6 +1,6 @@
|
||||
config CPU_ARMLTD_CORTEX_A9
|
||||
depends on ARCH_ARMV7
|
||||
bool
|
||||
select ARCH_ARMV7
|
||||
default n
|
||||
|
||||
if CPU_ARMLTD_CORTEX_A9
|
||||
|
@@ -19,4 +19,5 @@
|
||||
|
||||
config CPU_DMP_VORTEX86EX
|
||||
bool
|
||||
select ARCH_X86
|
||||
select UDELAY_TSC
|
||||
|
@@ -1,4 +1,5 @@
|
||||
config CPU_INTEL_EP80579
|
||||
bool
|
||||
select ARCH_X86
|
||||
select SSE
|
||||
select SUPPORT_CPU_UCODE_IN_CBFS
|
||||
|
@@ -28,6 +28,7 @@ if CPU_INTEL_FSP_MODEL_206AX || CPU_INTEL_FSP_MODEL_306AX
|
||||
|
||||
config CPU_SPECIFIC_OPTIONS
|
||||
def_bool y
|
||||
select ARCH_X86
|
||||
select SMP
|
||||
select SSE2
|
||||
select UDELAY_LAPIC
|
||||
|
@@ -6,6 +6,7 @@ if CPU_INTEL_HASWELL
|
||||
|
||||
config CPU_SPECIFIC_OPTIONS
|
||||
def_bool y
|
||||
select ARCH_X86
|
||||
select BACKUP_DEFAULT_SMM_REGION
|
||||
select SMP
|
||||
select SSE2
|
||||
|
@@ -1,5 +1,6 @@
|
||||
config CPU_INTEL_MODEL_1067X
|
||||
bool
|
||||
select ARCH_X86
|
||||
select SMP
|
||||
select SSE2
|
||||
select TSC_SYNC_MFENCE
|
||||
|
@@ -1,5 +1,6 @@
|
||||
config CPU_INTEL_MODEL_106CX
|
||||
bool
|
||||
select ARCH_X86
|
||||
select SMP
|
||||
select SSE2
|
||||
select UDELAY_LAPIC
|
||||
|
@@ -5,6 +5,7 @@ if CPU_INTEL_MODEL_2065X
|
||||
|
||||
config CPU_SPECIFIC_OPTIONS
|
||||
def_bool y
|
||||
select ARCH_X86
|
||||
select SMP
|
||||
select SSE
|
||||
select SSE2
|
||||
|
@@ -8,6 +8,7 @@ if CPU_INTEL_MODEL_206AX || CPU_INTEL_MODEL_306AX
|
||||
|
||||
config CPU_SPECIFIC_OPTIONS
|
||||
def_bool y
|
||||
select ARCH_X86
|
||||
select SMP
|
||||
select SSE2
|
||||
select UDELAY_LAPIC
|
||||
|
@@ -1,4 +1,5 @@
|
||||
config CPU_INTEL_MODEL_65X
|
||||
bool
|
||||
select ARCH_X86
|
||||
select SMP
|
||||
select SUPPORT_CPU_UCODE_IN_CBFS
|
||||
|
@@ -1,4 +1,5 @@
|
||||
config CPU_INTEL_MODEL_67X
|
||||
bool
|
||||
select ARCH_X86
|
||||
select SMP
|
||||
select SUPPORT_CPU_UCODE_IN_CBFS
|
||||
|
@@ -20,5 +20,6 @@
|
||||
|
||||
config CPU_INTEL_MODEL_68X
|
||||
bool
|
||||
select ARCH_X86
|
||||
select SMP
|
||||
select SUPPORT_CPU_UCODE_IN_CBFS
|
||||
|
@@ -1,4 +1,5 @@
|
||||
config CPU_INTEL_MODEL_69X
|
||||
bool
|
||||
select ARCH_X86
|
||||
select SMP
|
||||
select SUPPORT_CPU_UCODE_IN_CBFS
|
||||
|
@@ -1,4 +1,5 @@
|
||||
config CPU_INTEL_MODEL_6BX
|
||||
bool
|
||||
select ARCH_X86
|
||||
select SMP
|
||||
select SUPPORT_CPU_UCODE_IN_CBFS
|
||||
|
@@ -1,4 +1,5 @@
|
||||
config CPU_INTEL_MODEL_6DX
|
||||
bool
|
||||
select ARCH_X86
|
||||
select SMP
|
||||
select SUPPORT_CPU_UCODE_IN_CBFS
|
||||
|
@@ -1,5 +1,6 @@
|
||||
config CPU_INTEL_MODEL_6EX
|
||||
bool
|
||||
select ARCH_X86
|
||||
select SMP
|
||||
select SSE2
|
||||
select UDELAY_LAPIC
|
||||
|
@@ -1,5 +1,6 @@
|
||||
config CPU_INTEL_MODEL_6FX
|
||||
bool
|
||||
select ARCH_X86
|
||||
select SMP
|
||||
select SSE2
|
||||
select UDELAY_LAPIC
|
||||
|
@@ -1,4 +1,5 @@
|
||||
config CPU_INTEL_MODEL_6XX
|
||||
bool
|
||||
select ARCH_X86
|
||||
select SMP
|
||||
select SUPPORT_CPU_UCODE_IN_CBFS
|
||||
|
@@ -1,4 +1,5 @@
|
||||
config CPU_INTEL_MODEL_F0X
|
||||
bool
|
||||
select ARCH_X86
|
||||
select SMP
|
||||
select SUPPORT_CPU_UCODE_IN_CBFS
|
||||
|
@@ -1,4 +1,5 @@
|
||||
config CPU_INTEL_MODEL_F1X
|
||||
bool
|
||||
select ARCH_X86
|
||||
select SMP
|
||||
select SUPPORT_CPU_UCODE_IN_CBFS
|
||||
|
@@ -1,4 +1,5 @@
|
||||
config CPU_INTEL_MODEL_F2X
|
||||
bool
|
||||
select ARCH_X86
|
||||
select SMP
|
||||
select SUPPORT_CPU_UCODE_IN_CBFS
|
||||
|
@@ -1,4 +1,5 @@
|
||||
config CPU_INTEL_MODEL_F3X
|
||||
bool
|
||||
select ARCH_X86
|
||||
select SMP
|
||||
select SUPPORT_CPU_UCODE_IN_CBFS
|
||||
|
@@ -1,4 +1,5 @@
|
||||
config CPU_INTEL_MODEL_F4X
|
||||
bool
|
||||
select ARCH_X86
|
||||
select SMP
|
||||
select SUPPORT_CPU_UCODE_IN_CBFS
|
||||
|
@@ -19,3 +19,4 @@
|
||||
|
||||
config CPU_QEMU_X86
|
||||
bool
|
||||
select ARCH_X86
|
||||
|
@@ -1,5 +1,5 @@
|
||||
config CPU_SAMSUNG_EXYNOS5250
|
||||
depends on ARCH_ARMV7
|
||||
select ARCH_ARMV7
|
||||
select HAVE_MONOTONIC_TIMER
|
||||
select HAVE_UART_SPECIAL
|
||||
select DYNAMIC_CBMEM
|
||||
|
@@ -1,5 +1,5 @@
|
||||
config CPU_SAMSUNG_EXYNOS5420
|
||||
depends on ARCH_ARMV7
|
||||
select ARCH_ARMV7
|
||||
select HAVE_MONOTONIC_TIMER
|
||||
select HAVE_UART_SPECIAL
|
||||
select DYNAMIC_CBMEM
|
||||
|
@@ -1,5 +1,5 @@
|
||||
config CPU_TI_AM335X
|
||||
depends on ARCH_ARMV7
|
||||
select ARCH_ARMV7
|
||||
select HAVE_MONOTONIC_TIMER
|
||||
select HAVE_UART_SPECIAL
|
||||
select BOOTBLOCK_CONSOLE
|
||||
|
@@ -5,6 +5,7 @@ if CPU_VIA_C3
|
||||
|
||||
config CPU_SPECIFIC_OPTIONS
|
||||
def_bool y
|
||||
select ARCH_X86
|
||||
select UDELAY_TSC
|
||||
select MMX
|
||||
select IOAPIC_INTERRUPTS_ON_APIC_SERIAL_BUS
|
||||
|
@@ -5,6 +5,7 @@ if CPU_VIA_C7
|
||||
|
||||
config CPU_SPECIFIC_OPTIONS
|
||||
def_bool y
|
||||
select ARCH_X86
|
||||
select UDELAY_TSC
|
||||
select MMX
|
||||
select SSE2
|
||||
|
@@ -24,6 +24,7 @@ if CPU_VIA_NANO
|
||||
|
||||
config CPU_SPECIFIC_OPTIONS
|
||||
def_bool y
|
||||
select ARCH_X86
|
||||
select UDELAY_TSC
|
||||
select MMX
|
||||
select SSE2
|
||||
|
Reference in New Issue
Block a user