[coreboot-gerrit] Change in coreboot[master]: mainboard/asus/p[23]b*: Move to EARLY_CBMEM_INIT
Keith Hui (Code Review)
gerrit at coreboot.org
Sun Sep 3 00:56:05 CEST 2017
Keith Hui has uploaded this change for review. ( https://review.coreboot.org/21351
Change subject: mainboard/asus/p[23]b*: Move to EARLY_CBMEM_INIT
......................................................................
mainboard/asus/p[23]b*: Move to EARLY_CBMEM_INIT
Move select ASUS 440BX boards to EARLY_CBMEM_INIT. A LATE_CBMEM_INIT
guard remains at this time to allow reverting, which can be removed in a
followup as they are boot tested and confirmed stable.
Developed and boot tested on p2b-ls.
Brought to you by https://review.coreboot.org/c/20977/.
Change-Id: I2e69901ed83502894f6794b3c1d7bab9aab95e51
Signed-off-by: Keith Hui <buurin at gmail.com>
---
M src/mainboard/asus/p2b-d/Kconfig
M src/mainboard/asus/p2b-ds/Kconfig
M src/mainboard/asus/p2b-ds/romstage.c
M src/mainboard/asus/p2b-f/Kconfig
M src/mainboard/asus/p2b-ls/Kconfig
M src/mainboard/asus/p2b-ls/romstage.c
M src/mainboard/asus/p2b/Kconfig
M src/mainboard/asus/p2b/romstage.c
M src/mainboard/asus/p3b-f/Kconfig
M src/mainboard/asus/p3b-f/romstage.c
10 files changed, 14 insertions(+), 6 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/51/21351/1
diff --git a/src/mainboard/asus/p2b-d/Kconfig b/src/mainboard/asus/p2b-d/Kconfig
index 8bee3e1..ba2e7e0 100644
--- a/src/mainboard/asus/p2b-d/Kconfig
+++ b/src/mainboard/asus/p2b-d/Kconfig
@@ -18,7 +18,6 @@
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-ds/Kconfig b/src/mainboard/asus/p2b-ds/Kconfig
index 405edca..7d69d1f 100644
--- a/src/mainboard/asus/p2b-ds/Kconfig
+++ b/src/mainboard/asus/p2b-ds/Kconfig
@@ -18,7 +18,6 @@
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-ds/romstage.c b/src/mainboard/asus/p2b-ds/romstage.c
index 1d34bd9..286c47c 100644
--- a/src/mainboard/asus/p2b-ds/romstage.c
+++ b/src/mainboard/asus/p2b-ds/romstage.c
@@ -24,6 +24,7 @@
#include <superio/winbond/common/winbond.h>
#include <superio/winbond/w83977tf/w83977tf.h>
#include <lib.h>
+#include <cbmem.h>
#define SERIAL_DEV PNP_DEV(0x3f0, W83977TF_SP1)
@@ -40,4 +41,7 @@
enable_smbus();
sdram_initialize();
+#if IS_ENABLED(CONFIG_EARLY_CBMEM_INIT)
+ cbmem_initialize_empty();
+#endif
}
diff --git a/src/mainboard/asus/p2b-f/Kconfig b/src/mainboard/asus/p2b-f/Kconfig
index 7386ba9..b702c1b 100644
--- a/src/mainboard/asus/p2b-f/Kconfig
+++ b/src/mainboard/asus/p2b-f/Kconfig
@@ -18,7 +18,6 @@
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/Kconfig b/src/mainboard/asus/p2b-ls/Kconfig
index a0333a6..967ebd9 100644
--- a/src/mainboard/asus/p2b-ls/Kconfig
+++ b/src/mainboard/asus/p2b-ls/Kconfig
@@ -18,7 +18,6 @@
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 ecfc8b8..b713224 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 <superio/winbond/w83977tf/w83977tf.h>
#include <lib.h>
+#include <cbmem.h>
#define SERIAL_DEV PNP_DEV(0x3f0, W83977TF_SP1)
@@ -41,4 +42,5 @@
enable_smbus();
sdram_initialize();
+ cbmem_initialize_empty();
}
diff --git a/src/mainboard/asus/p2b/Kconfig b/src/mainboard/asus/p2b/Kconfig
index f2e85b6..6b934a5 100644
--- a/src/mainboard/asus/p2b/Kconfig
+++ b/src/mainboard/asus/p2b/Kconfig
@@ -18,7 +18,6 @@
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/romstage.c b/src/mainboard/asus/p2b/romstage.c
index 70e4323..41c7c5e 100644
--- a/src/mainboard/asus/p2b/romstage.c
+++ b/src/mainboard/asus/p2b/romstage.c
@@ -24,6 +24,7 @@
#include <superio/winbond/common/winbond.h>
#include <superio/winbond/w83977tf/w83977tf.h>
#include <lib.h>
+#include <cbmem.h>
#define SERIAL_DEV PNP_DEV(0x3f0, W83977TF_SP1)
@@ -40,4 +41,7 @@
enable_smbus();
sdram_initialize();
+#if IS_ENABLED(CONFIG_EARLY_CBMEM_INIT)
+ cbmem_initialize_empty();
+#endif
}
diff --git a/src/mainboard/asus/p3b-f/Kconfig b/src/mainboard/asus/p3b-f/Kconfig
index d860bb6..212aa93 100644
--- a/src/mainboard/asus/p3b-f/Kconfig
+++ b/src/mainboard/asus/p3b-f/Kconfig
@@ -18,7 +18,6 @@
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 0bb5bca..c7586dc 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 <superio/winbond/w83977tf/w83977tf.h>
#include <lib.h>
+#include <cbmem.h>
/* FIXME: The ASUS P3B-F has a Winbond W83977EF, actually. */
#define SERIAL_DEV PNP_DEV(0x3f0, W83977TF_SP1)
@@ -79,4 +80,7 @@
sdram_initialize();
disable_spd();
+#if IS_ENABLED(CONFIG_EARLY_CBMEM_INIT)
+ cbmem_initialize_empty();
+#endif
}
--
To view, visit https://review.coreboot.org/21351
To unsubscribe, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2e69901ed83502894f6794b3c1d7bab9aab95e51
Gerrit-Change-Number: 21351
Gerrit-PatchSet: 1
Gerrit-Owner: Keith Hui <buurin at gmail.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.coreboot.org/pipermail/coreboot-gerrit/attachments/20170902/f4dfa8c3/attachment-0001.html>
More information about the coreboot-gerrit
mailing list