diff options
| author | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2018-06-03 07:11:00 +0300 |
|---|---|---|
| committer | Patrick Georgi <pgeorgi@google.com> | 2018-12-22 11:49:17 +0000 |
| commit | 74e0390e7487fc531d95cffe7736ab8b5512062a (patch) | |
| tree | c71dcd5d1663d52b16187062796cec8c5b4debf3 | |
| parent | 513a1a81f778b9fddbb55a36a38b2dd855215327 (diff) | |
cbmem: Always use EARLY_CBMEM_INIT
Wipe out all remains of EARLY/LATE_CBMEM_INIT.
Change-Id: Ice75ec0434bef60fa9493037f48833e38044d6e8
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/26828
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Nico Huber <nico.h@gmx.de>
| -rw-r--r-- | src/Kconfig | 7 | ||||
| -rw-r--r-- | src/arch/x86/Kconfig | 12 | ||||
| -rw-r--r-- | src/drivers/usb/Kconfig | 1 | ||||
| -rw-r--r-- | src/mainboard/Kconfig | 3 |
4 files changed, 0 insertions, 23 deletions
diff --git a/src/Kconfig b/src/Kconfig index 62a7a92368..87b088f893 100644 --- a/src/Kconfig +++ b/src/Kconfig @@ -234,7 +234,6 @@ config NO_RELOCATABLE_RAMSTAGE config RELOCATABLE_RAMSTAGE bool - depends on EARLY_CBMEM_INIT default !NO_RELOCATABLE_RAMSTAGE select RELOCATABLE_MODULES help @@ -451,12 +450,10 @@ config RESUME_PATH_SAME_AS_BOOT config HAVE_ROMSTAGE_CONSOLE_SPINLOCK bool - depends on EARLY_CBMEM_INIT default n config HAVE_ROMSTAGE_NVRAM_CBFS_SPINLOCK bool - depends on EARLY_CBMEM_INIT default n help This should be enabled on certain plaforms, such as the AMD @@ -465,7 +462,6 @@ config HAVE_ROMSTAGE_NVRAM_CBFS_SPINLOCK config HAVE_ROMSTAGE_MICROCODE_CBFS_SPINLOCK bool - depends on EARLY_CBMEM_INIT default n config HAVE_MONOTONIC_TIMER @@ -1133,9 +1129,6 @@ config NO_XIP_EARLY_STAGES help Identify if early stages are eXecute-In-Place(XIP). -config EARLY_CBMEM_INIT - def_bool !LATE_CBMEM_INIT - config EARLY_CBMEM_LIST bool default n diff --git a/src/arch/x86/Kconfig b/src/arch/x86/Kconfig index 7c8371eff1..794ea115de 100644 --- a/src/arch/x86/Kconfig +++ b/src/arch/x86/Kconfig @@ -129,18 +129,6 @@ config CBMEM_TOP_BACKUP Platform implements non-volatile storage to cache cbmem_top() over stage transitions and optionally also over S3 suspend. -config LATE_CBMEM_INIT - def_bool n - select CBMEM_TOP_BACKUP - help - Enable this in chipset's Kconfig if northbridge does not implement - early cbmem_top() call for romstage. CBMEM tables will be allocated - late in ramstage, after PCI devices resources are known. - - WARNING: Late CBMEM initialization is deprecated. Platforms that - don't support early CBMEM initialization will be removed after - the release of coreboot 4.7. - config PRERAM_CBMEM_CONSOLE_SIZE hex default 0xc00 diff --git a/src/drivers/usb/Kconfig b/src/drivers/usb/Kconfig index 6965896d7e..d48bf32936 100644 --- a/src/drivers/usb/Kconfig +++ b/src/drivers/usb/Kconfig @@ -35,7 +35,6 @@ if USBDEBUG config USBDEBUG_IN_ROMSTAGE bool "Enable early (pre-RAM) usbdebug" default y - depends on EARLY_CBMEM_INIT help Configuring USB controllers in system-agent binary may cause problems to usbdebug. Disabling this option delays usbdebug to diff --git a/src/mainboard/Kconfig b/src/mainboard/Kconfig index 04dca4adf5..2de807026b 100644 --- a/src/mainboard/Kconfig +++ b/src/mainboard/Kconfig @@ -10,9 +10,6 @@ endchoice source "src/mainboard/*/Kconfig" -comment "WARNING: This mainboard uses LATE_CBMEM_INIT, which is deprecated" - depends on LATE_CBMEM_INIT - config BOARD_ROMSIZE_KB_64 bool config BOARD_ROMSIZE_KB_128 |