From 7904e720d5bd1a2fdbf5a4077759b1741895bcf4 Mon Sep 17 00:00:00 2001 From: Kyösti Mälkki Date: Sun, 3 Jun 2018 14:55:10 +0300 Subject: arch/x86: Flag platforms without RELOCATABLE_RAMSTAGE MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit To flip the Kconfig default, flag some platforms with NO_RELOCATABLE_RAMSTAGE. Change-Id: I72c6d07e5a60789bbe0e068a0130d7e3bd07a1d5 Signed-off-by: Kyösti Mälkki Reviewed-on: https://review.coreboot.org/26814 Tested-by: build bot (Jenkins) Reviewed-by: Aaron Durbin --- src/Kconfig | 5 +++++ src/northbridge/amd/amdfam10/Kconfig | 1 + src/northbridge/amd/lx/Kconfig | 1 + src/northbridge/intel/i440bx/Kconfig | 1 + src/northbridge/via/vx900/Kconfig | 1 + src/soc/intel/fsp_baytrail/Kconfig | 1 + src/soc/intel/fsp_broadwell_de/Kconfig | 1 + 7 files changed, 11 insertions(+) (limited to 'src') diff --git a/src/Kconfig b/src/Kconfig index 4c1a0da708..ac8668dbd8 100644 --- a/src/Kconfig +++ b/src/Kconfig @@ -227,6 +227,11 @@ config UBSAN say N because it adds a small performance penalty and may abort on code that happens to work in spite of the UB. +config NO_RELOCATABLE_RAMSTAGE + bool + default n if ARCH_X86 + default y + config RELOCATABLE_RAMSTAGE depends on EARLY_CBMEM_INIT bool "Build the ramstage to be relocatable in 32-bit address space." diff --git a/src/northbridge/amd/amdfam10/Kconfig b/src/northbridge/amd/amdfam10/Kconfig index b414d91f3b..ba397a9294 100644 --- a/src/northbridge/amd/amdfam10/Kconfig +++ b/src/northbridge/amd/amdfam10/Kconfig @@ -24,6 +24,7 @@ config NORTHBRIDGE_AMD_AMDFAM10 select PCIEXP_COMMON_CLOCK select PCIEXP_CLK_PM select PCIEXP_L1_SUB_STATE + select NO_RELOCATABLE_RAMSTAGE if NORTHBRIDGE_AMD_AMDFAM10 config AGP_APERTURE_SIZE diff --git a/src/northbridge/amd/lx/Kconfig b/src/northbridge/amd/lx/Kconfig index abc3e4cdfb..53a0e0556b 100644 --- a/src/northbridge/amd/lx/Kconfig +++ b/src/northbridge/amd/lx/Kconfig @@ -2,6 +2,7 @@ config NORTHBRIDGE_AMD_LX bool select GEODE_VSA select LATE_CBMEM_INIT + select NO_RELOCATABLE_RAMSTAGE if NORTHBRIDGE_AMD_LX diff --git a/src/northbridge/intel/i440bx/Kconfig b/src/northbridge/intel/i440bx/Kconfig index 45cdd9c7f1..b9e2386a65 100644 --- a/src/northbridge/intel/i440bx/Kconfig +++ b/src/northbridge/intel/i440bx/Kconfig @@ -18,6 +18,7 @@ config NORTHBRIDGE_INTEL_I440BX select NO_MMCONF_SUPPORT select HAVE_DEBUG_RAM_SETUP select UDELAY_IO + select NO_RELOCATABLE_RAMSTAGE config SDRAMPWR_4DIMM bool diff --git a/src/northbridge/via/vx900/Kconfig b/src/northbridge/via/vx900/Kconfig index e9d94514ca..b666767f92 100644 --- a/src/northbridge/via/vx900/Kconfig +++ b/src/northbridge/via/vx900/Kconfig @@ -21,6 +21,7 @@ config NORTHBRIDGE_VIA_VX900 select HAVE_DEBUG_RAM_SETUP select HAVE_DEBUG_SMBUS select HAVE_HARD_RESET + select NO_RELOCATABLE_RAMSTAGE if NORTHBRIDGE_VIA_VX900 diff --git a/src/soc/intel/fsp_baytrail/Kconfig b/src/soc/intel/fsp_baytrail/Kconfig index 549ea55d19..0a1070bb4a 100644 --- a/src/soc/intel/fsp_baytrail/Kconfig +++ b/src/soc/intel/fsp_baytrail/Kconfig @@ -31,6 +31,7 @@ config CPU_SPECIFIC_OPTIONS select HAVE_SMI_HANDLER select HAVE_HARD_RESET select RELOCATABLE_MODULES + select NO_RELOCATABLE_RAMSTAGE select PARALLEL_MP select REG_SCRIPT select SMM_TSEG diff --git a/src/soc/intel/fsp_broadwell_de/Kconfig b/src/soc/intel/fsp_broadwell_de/Kconfig index bfacb3d0e2..65eb58d4cc 100644 --- a/src/soc/intel/fsp_broadwell_de/Kconfig +++ b/src/soc/intel/fsp_broadwell_de/Kconfig @@ -14,6 +14,7 @@ config CPU_SPECIFIC_OPTIONS select ARCH_RAMSTAGE_X86_32 select HAVE_HARD_RESET select RELOCATABLE_MODULES + select NO_RELOCATABLE_RAMSTAGE select PARALLEL_MP select SMP select IOAPIC -- cgit v1.2.3