arch/x86: Make X86 stages select ARCH_X86
Also, don't define the default as this results in spurious lines in the .config. TEST: Build all boards with where config.h differed with BUILD_TIMELESS=1 and remained the same Change-Id: Ic77b696f493d7648f317f0ba0a27fdee5212961e Signed-off-by: Arthur Heymans <arthur@aheymans.xyz> Reviewed-on: https://review.coreboot.org/c/coreboot/+/31316 Reviewed-by: Angel Pons <th3fanbus@gmail.com> Reviewed-by: Nico Huber <nico.h@gmx.de> Reviewed-by: HAOUAS Elyes <ehaouas@noos.fr> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
parent
80759b0dbd
commit
b86e96ab8c
|
@ -13,7 +13,6 @@
|
|||
|
||||
config ARCH_X86
|
||||
bool
|
||||
default n
|
||||
select PCI
|
||||
select RELOCATABLE_MODULES
|
||||
|
||||
|
@ -21,17 +20,16 @@ config ARCH_X86
|
|||
|
||||
config ARCH_BOOTBLOCK_X86_32
|
||||
bool
|
||||
default n
|
||||
select ARCH_X86
|
||||
select BOOTBLOCK_CUSTOM if ROMCC_BOOTBLOCK
|
||||
|
||||
config ARCH_VERSTAGE_X86_32
|
||||
bool
|
||||
default n
|
||||
select ARCH_X86
|
||||
|
||||
config ARCH_ROMSTAGE_X86_32
|
||||
bool
|
||||
default n
|
||||
select ARCH_X86
|
||||
|
||||
config ARCH_POSTCAR_X86_32
|
||||
bool
|
||||
|
@ -39,23 +37,22 @@ config ARCH_POSTCAR_X86_32
|
|||
|
||||
config ARCH_RAMSTAGE_X86_32
|
||||
bool
|
||||
default n
|
||||
select ARCH_X86
|
||||
|
||||
# stage selectors for x64
|
||||
|
||||
config ARCH_BOOTBLOCK_X86_64
|
||||
bool
|
||||
default n
|
||||
select ARCH_X86
|
||||
select BOOTBLOCK_CUSTOM if ROMCC_BOOTBLOCK
|
||||
|
||||
config ARCH_VERSTAGE_X86_64
|
||||
bool
|
||||
default n
|
||||
select ARCH_X86
|
||||
|
||||
config ARCH_ROMSTAGE_X86_64
|
||||
bool
|
||||
default n
|
||||
select ARCH_X86
|
||||
|
||||
config ARCH_POSTCAR_X86_64
|
||||
bool
|
||||
|
@ -63,7 +60,9 @@ config ARCH_POSTCAR_X86_64
|
|||
|
||||
config ARCH_RAMSTAGE_X86_64
|
||||
bool
|
||||
default n
|
||||
select ARCH_X86
|
||||
|
||||
if ARCH_X86
|
||||
|
||||
config ARCH_X86_64_PGTBL_LOC
|
||||
hex "x86_64 page table location in CBFS"
|
||||
|
@ -350,3 +349,5 @@ config MAX_PIRQ_LINKS
|
|||
also have a separate link for ATA or IOAPIC interrupts. When the PIRQ
|
||||
table specifies links greater than 4, pirq_route_irqs will not
|
||||
function properly, unless this variable is correctly set.
|
||||
|
||||
endif
|
||||
|
|
|
@ -3,7 +3,6 @@ if BOARD_APPLE_MACBOOK11 || BOARD_APPLE_MACBOOK21 || BOARD_APPLE_IMAC52
|
|||
config BOARD_SPECIFIC_OPTIONS
|
||||
def_bool y
|
||||
select SYSTEM_TYPE_LAPTOP
|
||||
select ARCH_X86
|
||||
select CPU_INTEL_SOCKET_M
|
||||
select NORTHBRIDGE_INTEL_I945
|
||||
select NORTHBRIDGE_INTEL_SUBTYPE_I945GM
|
||||
|
|
|
@ -20,7 +20,6 @@ if BOARD_ASROCK_G41C_GS || BOARD_ASROCK_G41C_GS_R2_0 || \
|
|||
|
||||
config BOARD_SPECIFIC_OPTIONS
|
||||
def_bool y
|
||||
select ARCH_X86
|
||||
select CPU_INTEL_SOCKET_LGA775
|
||||
select NORTHBRIDGE_INTEL_X4X
|
||||
select SOUTHBRIDGE_INTEL_I82801GX
|
||||
|
|
|
@ -17,7 +17,6 @@ if BOARD_ASUS_P5GC_MX
|
|||
|
||||
config BOARD_SPECIFIC_OPTIONS
|
||||
def_bool y
|
||||
select ARCH_X86
|
||||
select CPU_INTEL_SOCKET_LGA775
|
||||
select NORTHBRIDGE_INTEL_I945
|
||||
select NORTHBRIDGE_INTEL_SUBTYPE_I945GC
|
||||
|
|
|
@ -18,7 +18,6 @@ if BOARD_ASUS_P5QC || BOARD_ASUS_P5Q_PRO || BOARD_ASUS_P5QL_PRO
|
|||
|
||||
config BOARD_SPECIFIC_OPTIONS
|
||||
def_bool y
|
||||
select ARCH_X86
|
||||
select CPU_INTEL_SOCKET_LGA775
|
||||
select NORTHBRIDGE_INTEL_X4X
|
||||
select SOUTHBRIDGE_INTEL_I82801JX
|
||||
|
|
|
@ -18,7 +18,6 @@ if BOARD_ASUS_P5QPL_AM || BOARD_ASUS_P5G41T_M_LX
|
|||
|
||||
config BOARD_SPECIFIC_OPTIONS
|
||||
def_bool y
|
||||
select ARCH_X86
|
||||
select CPU_INTEL_SOCKET_LGA775
|
||||
select NORTHBRIDGE_INTEL_X4X
|
||||
select SOUTHBRIDGE_INTEL_I82801GX
|
||||
|
|
|
@ -17,7 +17,6 @@ if BOARD_ASUS_P8H61_M_PRO
|
|||
|
||||
config BOARD_SPECIFIC_OPTIONS
|
||||
def_bool y
|
||||
select ARCH_X86
|
||||
select BOARD_ROMSIZE_KB_4096
|
||||
select HAVE_ACPI_RESUME
|
||||
select HAVE_ACPI_TABLES
|
||||
|
|
|
@ -18,7 +18,6 @@ if BOARD_FOXCONN_G41S_K || BOARD_FOXCONN_G41M
|
|||
|
||||
config BOARD_SPECIFIC_OPTIONS
|
||||
def_bool y
|
||||
select ARCH_X86
|
||||
select CPU_INTEL_SOCKET_LGA775
|
||||
select NORTHBRIDGE_INTEL_X4X
|
||||
select SOUTHBRIDGE_INTEL_I82801GX
|
||||
|
|
|
@ -17,7 +17,6 @@ if BOARD_GIGABYTE_GA_945GCM_S2L || BOARD_GIGABYTE_GA_945GCM_S2C
|
|||
|
||||
config BOARD_SPECIFIC_OPTIONS
|
||||
def_bool y
|
||||
select ARCH_X86
|
||||
select CPU_INTEL_SOCKET_LGA775
|
||||
select NORTHBRIDGE_INTEL_I945
|
||||
select NORTHBRIDGE_INTEL_SUBTYPE_I945GC
|
||||
|
|
|
@ -2,7 +2,6 @@ if BOARD_GIGABYTE_GA_B75M_D3H || BOARD_GIGABYTE_GA_B75M_D3V || BOARD_GIGABYTE_GA
|
|||
|
||||
config BOARD_SPECIFIC_OPTIONS
|
||||
def_bool y
|
||||
select ARCH_X86
|
||||
select NORTHBRIDGE_INTEL_SANDYBRIDGE
|
||||
select USE_NATIVE_RAMINIT
|
||||
select SOUTHBRIDGE_INTEL_C216
|
||||
|
|
|
@ -17,7 +17,6 @@ if BOARD_GIGABYTE_GA_G41M_ES2L
|
|||
|
||||
config BOARD_SPECIFIC_OPTIONS
|
||||
def_bool y
|
||||
select ARCH_X86
|
||||
select CPU_INTEL_SOCKET_LGA775
|
||||
select NORTHBRIDGE_INTEL_X4X
|
||||
select SOUTHBRIDGE_INTEL_I82801GX
|
||||
|
|
|
@ -17,7 +17,6 @@ if BOARD_GIGABYTE_GA_H61M_S2PV || BOARD_GIGABYTE_GA_H61MA_D3V
|
|||
|
||||
config BOARD_SPECIFIC_OPTIONS
|
||||
def_bool y
|
||||
select ARCH_X86
|
||||
select BOARD_ROMSIZE_KB_4096
|
||||
select HAVE_ACPI_RESUME
|
||||
select HAVE_ACPI_TABLES
|
||||
|
|
|
@ -18,7 +18,6 @@ if BOARD_INTEL_DG41WV
|
|||
|
||||
config BOARD_SPECIFIC_OPTIONS
|
||||
def_bool y
|
||||
select ARCH_X86
|
||||
select CPU_INTEL_SOCKET_LGA775
|
||||
select NORTHBRIDGE_INTEL_X4X
|
||||
select SOUTHBRIDGE_INTEL_I82801GX
|
||||
|
|
|
@ -18,7 +18,6 @@ if BOARD_INTEL_DG43GT
|
|||
|
||||
config BOARD_SPECIFIC_OPTIONS
|
||||
def_bool y
|
||||
select ARCH_X86
|
||||
select CPU_INTEL_SOCKET_LGA775
|
||||
select NORTHBRIDGE_INTEL_X4X
|
||||
select SOUTHBRIDGE_INTEL_I82801JX
|
||||
|
|
|
@ -18,7 +18,6 @@ if BOARD_LENOVO_THINKCENTRE_A58
|
|||
|
||||
config BOARD_SPECIFIC_OPTIONS
|
||||
def_bool y
|
||||
select ARCH_X86
|
||||
select CPU_INTEL_SOCKET_LGA775
|
||||
select NORTHBRIDGE_INTEL_X4X
|
||||
select SOUTHBRIDGE_INTEL_I82801GX
|
||||
|
|
|
@ -2,7 +2,6 @@ if BOARD_MSI_MS7707
|
|||
|
||||
config BOARD_SPECIFIC_OPTIONS
|
||||
def_bool y
|
||||
select ARCH_X86
|
||||
select NORTHBRIDGE_INTEL_SANDYBRIDGE
|
||||
select USE_NATIVE_RAMINIT
|
||||
select SOUTHBRIDGE_INTEL_BD82X6X
|
||||
|
|
|
@ -2,7 +2,6 @@ if BOARD_SAPPHIRE_PUREPLATINUMH61
|
|||
|
||||
config BOARD_SPECIFIC_OPTIONS
|
||||
def_bool y
|
||||
select ARCH_X86
|
||||
select NORTHBRIDGE_INTEL_SANDYBRIDGE
|
||||
select USE_NATIVE_RAMINIT
|
||||
select SOUTHBRIDGE_INTEL_BD82X6X
|
||||
|
|
Loading…
Reference in New Issue