<p>Martin Roth has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/22580">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">mainboard/google/kahlee: Update Grunt for 16MB ROM chip<br><br>- Update Grunt to 16MB chip in Kconfig.<br>- Move chromeos.fmd into variant directory & update Kconfig with the new<br>location.<br>- Add Grunt specific chromeos.fmd file.<br><br>BUG=b:69691210<br>TEST=Build grunt; Build & Boot Kahlee<br><br>Change-Id: I8d2f5e3255984d0d9a18df560f84f6db03b73a78<br>Signed-off-by: Martin Roth <martinroth@google.com><br>---<br>M src/mainboard/google/kahlee/Kconfig<br>A src/mainboard/google/kahlee/variants/grunt/chromeos.fmd<br>R src/mainboard/google/kahlee/variants/kahlee/chromeos.fmd<br>3 files changed, 51 insertions(+), 1 deletion(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/80/22580/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">diff --git a/src/mainboard/google/kahlee/Kconfig b/src/mainboard/google/kahlee/Kconfig<br>index 7173f1d..6c9bfcc 100644<br>--- a/src/mainboard/google/kahlee/Kconfig<br>+++ b/src/mainboard/google/kahlee/Kconfig<br>@@ -16,7 +16,8 @@<br> config BOARD_GOOGLE_BASEBOARD_KAHLEE<br> bool<br> select SOC_AMD_STONEYRIDGE_FT4<br>- select BOARD_ROMSIZE_KB_8192<br>+ select BOARD_ROMSIZE_KB_16384 if BOARD_GOOGLE_GRUNT<br>+ select BOARD_ROMSIZE_KB_8192 if BOARD_GOOGLE_KAHLEE<br> select DRIVERS_PS2_KEYBOARD<br> select EC_GOOGLE_CHROMEEC<br> select EC_GOOGLE_CHROMEEC_LPC<br>@@ -53,6 +54,15 @@<br> string<br> default "Google_Kahlee"<br> <br>+config FMDFILE<br>+ string<br>+ default "src/mainboard/$(CONFIG_MAINBOARD_DIR)/variants/${CONFIG_VARIANT_DIR}/chromeos.fmd" if CHROMEOS<br>+ default ""<br>+ help<br>+ The build system creates a default FMAP from ROM_SIZE and CBFS_SIZE,<br>+ but in some cases more complex setups are required.<br>+ When an fmd is specified, it overrides the default format.<br>+<br> config MAX_CPUS<br> int<br> default 4<br>diff --git a/src/mainboard/google/kahlee/variants/grunt/chromeos.fmd b/src/mainboard/google/kahlee/variants/grunt/chromeos.fmd<br>new file mode 100644<br>index 0000000..674e6d7<br>--- /dev/null<br>+++ b/src/mainboard/google/kahlee/variants/grunt/chromeos.fmd<br>@@ -0,0 +1,40 @@<br>+FLASH@0xFF000000 0x1000000 {<br>+ SI_BIOS@0x0 0x1000000 {<br>+ RW_SECTION_A@0x0 0x21E000 {<br>+ VBLOCK_A@0x0 0x10000<br>+ FW_MAIN_A(CBFS)@0x10000 0x20DFC0<br>+ RW_FWID_A@0x21DFC0 0x40<br>+ }<br>+ RW_SECTION_B@0x21E000 0x21E000 {<br>+ VBLOCK_B@0x0 0x10000<br>+ FW_MAIN_B(CBFS)@0x10000 0x20DFC0<br>+ RW_FWID_B@0x21DFC0 0x40<br>+ }<br>+ UNIFIED_MRC_CACHE@0x43C000 0x21000 {<br>+ RECOVERY_MRC_CACHE@0x0 0x10000<br>+ RW_MRC_CACHE@0x10000 0x10000<br>+ RW_VAR_MRC_CACHE@0x20000 0x1000<br>+ }<br>+ RW_ELOG@0x45D000 0x4000<br>+<br>+ RW_SHARED@0x461000 0x4000 {<br>+ SHARED_DATA@0x0 0x2000<br>+ VBLOCK_DEV@0x2000 0x2000<br>+ }<br>+ RW_VPD@0x465000 0x2000<br>+ RW_UNUSED@0x467000 0x599000<br>+ RW_LEGACY@0xA00000 0x200000<br>+<br>+ WP_RO@0xC00000 0x400000 {<br>+ RO_VPD@0x0 0x4000<br>+ RO_UNUSED@0x4000 0x17B000<br>+ RO_SECTION@0x17F000 0x281000 {<br>+ FMAP@0x0 0x800<br>+ RO_FRID@0x800 0x40<br>+ RO_FRID_PAD@0x840 0x7c0<br>+ GBB@0x1000 0x70000<br>+ COREBOOT(CBFS)@0x71000 0x210000<br>+ }<br>+ }<br>+ }<br>+}<br>diff --git a/src/mainboard/google/kahlee/chromeos.fmd b/src/mainboard/google/kahlee/variants/kahlee/chromeos.fmd<br>similarity index 100%<br>rename from src/mainboard/google/kahlee/chromeos.fmd<br>rename to src/mainboard/google/kahlee/variants/kahlee/chromeos.fmd<br></pre><p>To view, visit <a href="https://review.coreboot.org/22580">change 22580</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/22580"/><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: I8d2f5e3255984d0d9a18df560f84f6db03b73a78 </div>
<div style="display:none"> Gerrit-Change-Number: 22580 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Martin Roth <martinroth@google.com> </div>