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>
This commit is contained in:
Kyösti Mälkki
2018-06-03 07:11:00 +03:00
committed by Patrick Georgi
parent 513a1a81f7
commit 74e0390e74
4 changed files with 0 additions and 23 deletions

View File

@@ -234,7 +234,6 @@ config NO_RELOCATABLE_RAMSTAGE
config RELOCATABLE_RAMSTAGE config RELOCATABLE_RAMSTAGE
bool bool
depends on EARLY_CBMEM_INIT
default !NO_RELOCATABLE_RAMSTAGE default !NO_RELOCATABLE_RAMSTAGE
select RELOCATABLE_MODULES select RELOCATABLE_MODULES
help help
@@ -451,12 +450,10 @@ config RESUME_PATH_SAME_AS_BOOT
config HAVE_ROMSTAGE_CONSOLE_SPINLOCK config HAVE_ROMSTAGE_CONSOLE_SPINLOCK
bool bool
depends on EARLY_CBMEM_INIT
default n default n
config HAVE_ROMSTAGE_NVRAM_CBFS_SPINLOCK config HAVE_ROMSTAGE_NVRAM_CBFS_SPINLOCK
bool bool
depends on EARLY_CBMEM_INIT
default n default n
help help
This should be enabled on certain plaforms, such as the AMD 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 config HAVE_ROMSTAGE_MICROCODE_CBFS_SPINLOCK
bool bool
depends on EARLY_CBMEM_INIT
default n default n
config HAVE_MONOTONIC_TIMER config HAVE_MONOTONIC_TIMER
@@ -1133,9 +1129,6 @@ config NO_XIP_EARLY_STAGES
help help
Identify if early stages are eXecute-In-Place(XIP). Identify if early stages are eXecute-In-Place(XIP).
config EARLY_CBMEM_INIT
def_bool !LATE_CBMEM_INIT
config EARLY_CBMEM_LIST config EARLY_CBMEM_LIST
bool bool
default n default n

View File

@@ -129,18 +129,6 @@ config CBMEM_TOP_BACKUP
Platform implements non-volatile storage to cache cbmem_top() Platform implements non-volatile storage to cache cbmem_top()
over stage transitions and optionally also over S3 suspend. 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 config PRERAM_CBMEM_CONSOLE_SIZE
hex hex
default 0xc00 default 0xc00

View File

@@ -35,7 +35,6 @@ if USBDEBUG
config USBDEBUG_IN_ROMSTAGE config USBDEBUG_IN_ROMSTAGE
bool "Enable early (pre-RAM) usbdebug" bool "Enable early (pre-RAM) usbdebug"
default y default y
depends on EARLY_CBMEM_INIT
help help
Configuring USB controllers in system-agent binary may cause Configuring USB controllers in system-agent binary may cause
problems to usbdebug. Disabling this option delays usbdebug to problems to usbdebug. Disabling this option delays usbdebug to

View File

@@ -10,9 +10,6 @@ endchoice
source "src/mainboard/*/Kconfig" 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 config BOARD_ROMSIZE_KB_64
bool bool
config BOARD_ROMSIZE_KB_128 config BOARD_ROMSIZE_KB_128