<p>Keith Hui has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/21351">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">mainboard/asus/p[23]b*: Move to EARLY_CBMEM_INIT<br><br>Move select ASUS 440BX boards to EARLY_CBMEM_INIT. A LATE_CBMEM_INIT<br>guard remains at this time to allow reverting, which can be removed in a<br>followup as they are boot tested and confirmed stable.<br><br>Developed and boot tested on p2b-ls.<br><br>Brought to you by https://review.coreboot.org/c/20977/.<br><br>Change-Id: I2e69901ed83502894f6794b3c1d7bab9aab95e51<br>Signed-off-by: Keith Hui <buurin@gmail.com><br>---<br>M src/mainboard/asus/p2b-d/Kconfig<br>M src/mainboard/asus/p2b-ds/Kconfig<br>M src/mainboard/asus/p2b-ds/romstage.c<br>M src/mainboard/asus/p2b-f/Kconfig<br>M src/mainboard/asus/p2b-ls/Kconfig<br>M src/mainboard/asus/p2b-ls/romstage.c<br>M src/mainboard/asus/p2b/Kconfig<br>M src/mainboard/asus/p2b/romstage.c<br>M src/mainboard/asus/p3b-f/Kconfig<br>M src/mainboard/asus/p3b-f/romstage.c<br>10 files changed, 14 insertions(+), 6 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/51/21351/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">diff --git a/src/mainboard/asus/p2b-d/Kconfig b/src/mainboard/asus/p2b-d/Kconfig<br>index 8bee3e1..ba2e7e0 100644<br>--- a/src/mainboard/asus/p2b-d/Kconfig<br>+++ b/src/mainboard/asus/p2b-d/Kconfig<br>@@ -18,7 +18,6 @@<br>      def_bool y<br>    select CPU_INTEL_SLOT_1<br>       select NORTHBRIDGE_INTEL_I440BX<br>-      select LATE_CBMEM_INIT<br>        select SOUTHBRIDGE_INTEL_I82371EB<br>     select SUPERIO_WINBOND_W83977TF<br>       select HAVE_PIRQ_TABLE<br>diff --git a/src/mainboard/asus/p2b-ds/Kconfig b/src/mainboard/asus/p2b-ds/Kconfig<br>index 405edca..7d69d1f 100644<br>--- a/src/mainboard/asus/p2b-ds/Kconfig<br>+++ b/src/mainboard/asus/p2b-ds/Kconfig<br>@@ -18,7 +18,6 @@<br>        def_bool y<br>    select CPU_INTEL_SLOT_1<br>       select NORTHBRIDGE_INTEL_I440BX<br>-      select LATE_CBMEM_INIT<br>        select SOUTHBRIDGE_INTEL_I82371EB<br>     select SUPERIO_WINBOND_W83977TF<br>       select HAVE_PIRQ_TABLE<br>diff --git a/src/mainboard/asus/p2b-ds/romstage.c b/src/mainboard/asus/p2b-ds/romstage.c<br>index 1d34bd9..286c47c 100644<br>--- a/src/mainboard/asus/p2b-ds/romstage.c<br>+++ b/src/mainboard/asus/p2b-ds/romstage.c<br>@@ -24,6 +24,7 @@<br> #include <superio/winbond/common/winbond.h><br> #include <superio/winbond/w83977tf/w83977tf.h><br> #include <lib.h><br>+#include <cbmem.h><br> <br> #define SERIAL_DEV PNP_DEV(0x3f0, W83977TF_SP1)<br> <br>@@ -40,4 +41,7 @@<br> <br>       enable_smbus();<br>       sdram_initialize();<br>+#if IS_ENABLED(CONFIG_EARLY_CBMEM_INIT)<br>+        cbmem_initialize_empty();<br>+#endif<br> }<br>diff --git a/src/mainboard/asus/p2b-f/Kconfig b/src/mainboard/asus/p2b-f/Kconfig<br>index 7386ba9..b702c1b 100644<br>--- a/src/mainboard/asus/p2b-f/Kconfig<br>+++ b/src/mainboard/asus/p2b-f/Kconfig<br>@@ -18,7 +18,6 @@<br>    def_bool y<br>    select CPU_INTEL_SLOT_1<br>       select NORTHBRIDGE_INTEL_I440BX<br>-      select LATE_CBMEM_INIT<br>        select SOUTHBRIDGE_INTEL_I82371EB<br>     select SUPERIO_WINBOND_W83977TF<br>       select HAVE_PIRQ_TABLE<br>diff --git a/src/mainboard/asus/p2b-ls/Kconfig b/src/mainboard/asus/p2b-ls/Kconfig<br>index a0333a6..967ebd9 100644<br>--- a/src/mainboard/asus/p2b-ls/Kconfig<br>+++ b/src/mainboard/asus/p2b-ls/Kconfig<br>@@ -18,7 +18,6 @@<br>        def_bool y<br>    select CPU_INTEL_SLOT_1<br>       select NORTHBRIDGE_INTEL_I440BX<br>-      select LATE_CBMEM_INIT<br>        select SOUTHBRIDGE_INTEL_I82371EB<br>     select SUPERIO_WINBOND_W83977TF<br>       select HAVE_PIRQ_TABLE<br>diff --git a/src/mainboard/asus/p2b-ls/romstage.c b/src/mainboard/asus/p2b-ls/romstage.c<br>index ecfc8b8..b713224 100644<br>--- a/src/mainboard/asus/p2b-ls/romstage.c<br>+++ b/src/mainboard/asus/p2b-ls/romstage.c<br>@@ -25,6 +25,7 @@<br> /* FIXME: The ASUS P2B-LS has a Winbond W83977EF, actually. */<br> #include <superio/winbond/w83977tf/w83977tf.h><br> #include <lib.h><br>+#include <cbmem.h><br> <br> #define SERIAL_DEV PNP_DEV(0x3f0, W83977TF_SP1)<br> <br>@@ -41,4 +42,5 @@<br> <br>  enable_smbus();<br>       sdram_initialize();<br>+  cbmem_initialize_empty();<br> }<br>diff --git a/src/mainboard/asus/p2b/Kconfig b/src/mainboard/asus/p2b/Kconfig<br>index f2e85b6..6b934a5 100644<br>--- a/src/mainboard/asus/p2b/Kconfig<br>+++ b/src/mainboard/asus/p2b/Kconfig<br>@@ -18,7 +18,6 @@<br>     def_bool y<br>    select CPU_INTEL_SLOT_1<br>       select NORTHBRIDGE_INTEL_I440BX<br>-      select LATE_CBMEM_INIT<br>        select SOUTHBRIDGE_INTEL_I82371EB<br>     select SUPERIO_WINBOND_W83977TF<br>       select HAVE_PIRQ_TABLE<br>diff --git a/src/mainboard/asus/p2b/romstage.c b/src/mainboard/asus/p2b/romstage.c<br>index 70e4323..41c7c5e 100644<br>--- a/src/mainboard/asus/p2b/romstage.c<br>+++ b/src/mainboard/asus/p2b/romstage.c<br>@@ -24,6 +24,7 @@<br> #include <superio/winbond/common/winbond.h><br> #include <superio/winbond/w83977tf/w83977tf.h><br> #include <lib.h><br>+#include <cbmem.h><br> <br> #define SERIAL_DEV PNP_DEV(0x3f0, W83977TF_SP1)<br> <br>@@ -40,4 +41,7 @@<br> <br>   enable_smbus();<br>       sdram_initialize();<br>+#if IS_ENABLED(CONFIG_EARLY_CBMEM_INIT)<br>+        cbmem_initialize_empty();<br>+#endif<br> }<br>diff --git a/src/mainboard/asus/p3b-f/Kconfig b/src/mainboard/asus/p3b-f/Kconfig<br>index d860bb6..212aa93 100644<br>--- a/src/mainboard/asus/p3b-f/Kconfig<br>+++ b/src/mainboard/asus/p3b-f/Kconfig<br>@@ -18,7 +18,6 @@<br>    def_bool y<br>    select CPU_INTEL_SLOT_1<br>       select NORTHBRIDGE_INTEL_I440BX<br>-      select LATE_CBMEM_INIT<br>        select SOUTHBRIDGE_INTEL_I82371EB<br>     select SUPERIO_WINBOND_W83977TF<br>       select HAVE_PIRQ_TABLE<br>diff --git a/src/mainboard/asus/p3b-f/romstage.c b/src/mainboard/asus/p3b-f/romstage.c<br>index 0bb5bca..c7586dc 100644<br>--- a/src/mainboard/asus/p3b-f/romstage.c<br>+++ b/src/mainboard/asus/p3b-f/romstage.c<br>@@ -25,6 +25,7 @@<br> /* FIXME: The ASUS P3B-F has a Winbond W83977EF, actually. */<br> #include <superio/winbond/w83977tf/w83977tf.h><br> #include <lib.h><br>+#include <cbmem.h><br> <br> /* FIXME: The ASUS P3B-F has a Winbond W83977EF, actually. */<br> #define SERIAL_DEV PNP_DEV(0x3f0, W83977TF_SP1)<br>@@ -79,4 +80,7 @@<br>     sdram_initialize();<br> <br>        disable_spd();<br>+#if IS_ENABLED(CONFIG_EARLY_CBMEM_INIT)<br>+     cbmem_initialize_empty();<br>+#endif<br> }<br></pre><p>To view, visit <a href="https://review.coreboot.org/21351">change 21351</a>. To unsubscribe, visit <a href="https://review.coreboot.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://review.coreboot.org/21351"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: coreboot </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I2e69901ed83502894f6794b3c1d7bab9aab95e51 </div>
<div style="display:none"> Gerrit-Change-Number: 21351 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Keith Hui <buurin@gmail.com> </div>