diff options
| -rw-r--r-- | src/arch/arm/Kconfig | 1 | ||||
| -rw-r--r-- | src/arch/arm64/Kconfig | 1 | ||||
| -rw-r--r-- | src/arch/mips/Kconfig | 1 | ||||
| -rw-r--r-- | src/arch/ppc64/Kconfig | 1 | ||||
| -rw-r--r-- | src/arch/riscv/Kconfig | 1 | ||||
| -rw-r--r-- | src/arch/x86/Kconfig | 1 | ||||
| -rw-r--r-- | src/lib/Kconfig | 6 | ||||
| -rw-r--r-- | src/lib/imd_cbmem.c | 6 |
8 files changed, 2 insertions, 16 deletions
diff --git a/src/arch/arm/Kconfig b/src/arch/arm/Kconfig index 9e10378510..47c333bf6a 100644 --- a/src/arch/arm/Kconfig +++ b/src/arch/arm/Kconfig @@ -17,7 +17,6 @@ config ARCH_ROMSTAGE_ARM config ARCH_RAMSTAGE_ARM bool select ARCH_ARM - select RAMSTAGE_CBMEM_TOP_ARG source src/arch/arm/armv4/Kconfig source src/arch/arm/armv7/Kconfig diff --git a/src/arch/arm64/Kconfig b/src/arch/arm64/Kconfig index c7eafe649a..3d1d1843e0 100644 --- a/src/arch/arm64/Kconfig +++ b/src/arch/arm64/Kconfig @@ -17,7 +17,6 @@ config ARCH_ROMSTAGE_ARM64 config ARCH_RAMSTAGE_ARM64 bool select ARCH_ARM64 - select RAMSTAGE_CBMEM_TOP_ARG source src/arch/arm64/armv8/Kconfig diff --git a/src/arch/mips/Kconfig b/src/arch/mips/Kconfig index 321bfc91fd..9df514b21b 100644 --- a/src/arch/mips/Kconfig +++ b/src/arch/mips/Kconfig @@ -22,7 +22,6 @@ config ARCH_BOOTBLOCK_MIPS default n select BOOTBLOCK_CUSTOM select C_ENVIRONMENT_BOOTBLOCK - select RAMSTAGE_CBMEM_TOP_ARG config ARCH_VERSTAGE_MIPS bool diff --git a/src/arch/ppc64/Kconfig b/src/arch/ppc64/Kconfig index da9c155917..0699e910ce 100644 --- a/src/arch/ppc64/Kconfig +++ b/src/arch/ppc64/Kconfig @@ -1,6 +1,5 @@ config ARCH_PPC64 bool - select RAMSTAGE_CBMEM_TOP_ARG config ARCH_BOOTBLOCK_PPC64 bool diff --git a/src/arch/riscv/Kconfig b/src/arch/riscv/Kconfig index 9ee781b4f0..f2ca571c97 100644 --- a/src/arch/riscv/Kconfig +++ b/src/arch/riscv/Kconfig @@ -90,7 +90,6 @@ config ARCH_ROMSTAGE_RISCV config ARCH_RAMSTAGE_RISCV bool default n - select RAMSTAGE_CBMEM_TOP_ARG config RISCV_USE_ARCH_TIMER bool diff --git a/src/arch/x86/Kconfig b/src/arch/x86/Kconfig index 37b7d2daaa..c5a5642974 100644 --- a/src/arch/x86/Kconfig +++ b/src/arch/x86/Kconfig @@ -16,7 +16,6 @@ config ARCH_X86 default n select PCI select RELOCATABLE_MODULES - select RAMSTAGE_CBMEM_TOP_ARG # stage selectors for x86 diff --git a/src/lib/Kconfig b/src/lib/Kconfig index b94ac495b7..cb1e4a5cc8 100644 --- a/src/lib/Kconfig +++ b/src/lib/Kconfig @@ -24,12 +24,6 @@ config RAMSTAGE_LIBHWBASE help Selected by features that require `libhwbase` in ramstage. -config RAMSTAGE_CBMEM_TOP_ARG - bool - help - Select this if stages run after romstage get the cbmem_top - pointer as the function arguments when called from romstage. - config FLATTENED_DEVICE_TREE bool help diff --git a/src/lib/imd_cbmem.c b/src/lib/imd_cbmem.c index cbd4b8f887..38620d2d06 100644 --- a/src/lib/imd_cbmem.c +++ b/src/lib/imd_cbmem.c @@ -51,16 +51,14 @@ uintptr_t _cbmem_top_ptr; void *cbmem_top(void) { - if (ENV_ROMSTAGE - || ((ENV_POSTCAR || ENV_RAMSTAGE) - && !CONFIG(RAMSTAGE_CBMEM_TOP_ARG))) { + if (ENV_ROMSTAGE) { MAYBE_STATIC_BSS void *top = NULL; if (top) return top; top = cbmem_top_chipset(); return top; } - if ((ENV_POSTCAR || ENV_RAMSTAGE) && CONFIG(RAMSTAGE_CBMEM_TOP_ARG)) + if (ENV_POSTCAR || ENV_RAMSTAGE) return (void *)_cbmem_top_ptr; dead_code(); |