From e14d7def4f2b77e676ca8997a4e1505998b7d53d Mon Sep 17 00:00:00 2001 From: Keith Hui Date: Sat, 2 Sep 2017 18:33:20 -0400 Subject: asus/p2b-ls,asus/p3b-f: Move to EARLY_CBMEM_INIT MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit These two boards have been boot tested with EARLY_CBMEM_INIT and is good to go. Change-Id: I2e69901ed83502894f6794b3c1d7bab9aab95e51 Signed-off-by: Keith Hui Reviewed-on: https://review.coreboot.org/21351 Reviewed-by: Aaron Durbin Tested-by: build bot (Jenkins) Reviewed-by: Paul Menzel Reviewed-by: Kyösti Mälkki --- src/mainboard/asus/p2b-ls/Kconfig | 1 - src/mainboard/asus/p2b-ls/romstage.c | 2 ++ src/mainboard/asus/p3b-f/Kconfig | 1 - src/mainboard/asus/p3b-f/romstage.c | 2 ++ 4 files changed, 4 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/mainboard/asus/p2b-ls/Kconfig b/src/mainboard/asus/p2b-ls/Kconfig index a0333a6b20..967ebd9f1d 100644 --- a/src/mainboard/asus/p2b-ls/Kconfig +++ b/src/mainboard/asus/p2b-ls/Kconfig @@ -18,7 +18,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy def_bool y select CPU_INTEL_SLOT_1 select NORTHBRIDGE_INTEL_I440BX - select LATE_CBMEM_INIT select SOUTHBRIDGE_INTEL_I82371EB select SUPERIO_WINBOND_W83977TF select HAVE_PIRQ_TABLE diff --git a/src/mainboard/asus/p2b-ls/romstage.c b/src/mainboard/asus/p2b-ls/romstage.c index ecfc8b8224..b7132248cf 100644 --- a/src/mainboard/asus/p2b-ls/romstage.c +++ b/src/mainboard/asus/p2b-ls/romstage.c @@ -25,6 +25,7 @@ /* FIXME: The ASUS P2B-LS has a Winbond W83977EF, actually. */ #include #include +#include #define SERIAL_DEV PNP_DEV(0x3f0, W83977TF_SP1) @@ -41,4 +42,5 @@ void mainboard_romstage_entry(unsigned long bist) enable_smbus(); sdram_initialize(); + cbmem_initialize_empty(); } diff --git a/src/mainboard/asus/p3b-f/Kconfig b/src/mainboard/asus/p3b-f/Kconfig index d860bb6bf3..212aa93f0b 100644 --- a/src/mainboard/asus/p3b-f/Kconfig +++ b/src/mainboard/asus/p3b-f/Kconfig @@ -18,7 +18,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy def_bool y select CPU_INTEL_SLOT_1 select NORTHBRIDGE_INTEL_I440BX - select LATE_CBMEM_INIT select SOUTHBRIDGE_INTEL_I82371EB select SUPERIO_WINBOND_W83977TF select HAVE_PIRQ_TABLE diff --git a/src/mainboard/asus/p3b-f/romstage.c b/src/mainboard/asus/p3b-f/romstage.c index 0bb5bca314..a474907d7e 100644 --- a/src/mainboard/asus/p3b-f/romstage.c +++ b/src/mainboard/asus/p3b-f/romstage.c @@ -25,6 +25,7 @@ /* FIXME: The ASUS P3B-F has a Winbond W83977EF, actually. */ #include #include +#include /* FIXME: The ASUS P3B-F has a Winbond W83977EF, actually. */ #define SERIAL_DEV PNP_DEV(0x3f0, W83977TF_SP1) @@ -79,4 +80,5 @@ void mainboard_romstage_entry(unsigned long bist) sdram_initialize(); disable_spd(); + cbmem_initialize_empty(); } -- cgit v1.2.3