<p>Patrick Rudolph has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/23793">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">soc/cavium: Add rom header images<br><br>Add HEX rom header images, required to boot NBL1FW.<br><br>Change-Id: Icd9cdf882ccdac591bec7240f1c7694fe0c0ad4d<br>Signed-off-by: Patrick Rudolph <patrick.rudolph@9elements.com><br>---<br>M src/soc/cavium/cn81xx/Makefile.inc<br>M src/soc/cavium/common/Makefile.inc<br>A src/soc/cavium/common/rom_clib_s_nbl1fw.bin.hex<br>A src/soc/cavium/common/rom_csib_s_nbl1fw.bin.hex<br>4 files changed, 53 insertions(+), 25 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/93/23793/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/soc/cavium/cn81xx/Makefile.inc b/src/soc/cavium/cn81xx/Makefile.inc</span><br><span>index f835b09..c910b08 100644</span><br><span>--- a/src/soc/cavium/cn81xx/Makefile.inc</span><br><span>+++ b/src/soc/cavium/cn81xx/Makefile.inc</span><br><span>@@ -97,29 +97,4 @@</span><br><span> CPPFLAGS_common += -Isrc/soc/cavium/common/include/soc/bdk/</span><br><span> #CPPFLAGS_common += -Isrc/soc/cavium/common/include/soc/bdk/libdram</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-# FIXME: Generate the ROM code load information block structure.</span><br><span style="color: hsl(0, 100%, 40%);">-# For NBL1FW the first 256 bytes are ignored and should be zeros.</span><br><span style="color: hsl(0, 100%, 40%);">-# For TLB1FW the first 256 bytes should be randomized.</span><br><span style="color: hsl(0, 100%, 40%);">-#FIXME: Generate bootblock more intelligently</span><br><span style="color: hsl(0, 100%, 40%);">-$(objcbfs)/bootblock.bin: $(objcbfs)/bootblock.raw.bin</span><br><span style="color: hsl(0, 100%, 40%);">- @printf "Generating: $(subst $(obj)/,,$(@))\n"</span><br><span style="color: hsl(0, 100%, 40%);">-# cp $< $@</span><br><span style="color: hsl(0, 100%, 40%);">-# @mkdir -p $(dir $@)</span><br><span style="color: hsl(0, 100%, 40%);">-# @$(IBSTOOL) --from=$< --to=$@ --nontrusted</span><br><span style="color: hsl(0, 100%, 40%);">- # Insert CLIB at 0x10000 and CSIB at 0x10100</span><br><span style="color: hsl(0, 100%, 40%);">-# dd if=/dev/zero bs=1k count=512 2>/dev/null | tr '\000' '\377' > $@</span><br><span style="color: hsl(0, 100%, 40%);">- dd if=rom_clib_s_nbl1fw.bin of=$@ bs=1 seek=$$((0x10000)) conv=notrunc</span><br><span style="color: hsl(0, 100%, 40%);">- dd if=rom_csib_s_nbl1fw.bin of=$@ bs=1 seek=$$((0x10100)) conv=notrunc</span><br><span style="color: hsl(0, 100%, 40%);">- # Insert header at 0x20000</span><br><span style="color: hsl(0, 100%, 40%);">-# According to OFFSET field description, first 256 bytes of NBL1FW are ignored.</span><br><span style="color: hsl(0, 100%, 40%);">-# dd if=/dev/zero bs=1 count=256 2>/dev/null | tr '\000' '\377' > _pad256.bin</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- # FIXME: 0x20000-0x20100 should be ignored, but Cavium's image populates it.</span><br><span style="color: hsl(0, 100%, 40%);">- ## dd if=_pad256.bin of=$@ bs=1 seek=$$((0x20000)) conv=notrunc 2>/dev/null</span><br><span style="color: hsl(0, 100%, 40%);">- # TODO inject length of firmware at offset 0x04 of header</span><br><span style="color: hsl(0, 100%, 40%);">- ##dd if=$< of=$@ bs=1 seek=$$((0x20100)) conv=notrunc 2>/dev/null</span><br><span style="color: hsl(0, 100%, 40%);">- dd if=$< of=$@ bs=1 seek=$$((0x20000)) conv=notrunc</span><br><span style="color: hsl(0, 100%, 40%);">-# dd if=nbl1fw_header.bin of=$@ bs=1 seek=$$((0x20000)) conv=notrunc</span><br><span style="color: hsl(0, 100%, 40%);">-# # TODO: Calculate CRC32 of image and inject at offset 0x10 of header</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> endif</span><br><span>diff --git a/src/soc/cavium/common/Makefile.inc b/src/soc/cavium/common/Makefile.inc</span><br><span>index feeeb6e..5f47a1d 100644</span><br><span>--- a/src/soc/cavium/common/Makefile.inc</span><br><span>+++ b/src/soc/cavium/common/Makefile.inc</span><br><span>@@ -45,4 +45,25 @@</span><br><span> </span><br><span> CPPFLAGS_common += -Isrc/soc/cavium/common/include</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ROM_HEADER_BIN := $(objgenerated)/rom_header.bin</span><br><span style="color: hsl(120, 100%, 40%);">+ROM_HEADER_SOURCES += rom_clib_s_nbl1fw</span><br><span style="color: hsl(120, 100%, 40%);">+ROM_HEADER_SOURCES += rom_csib_s_nbl1fw</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ROM_HEADER_DEPS := $(foreach f, $(ROM_HEADER_SOURCES), src/soc/cavium/common/$(f).bin.hex)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+# Include ROM header</span><br><span style="color: hsl(120, 100%, 40%);">+$(ROM_HEADER_BIN): $(ROM_HEADER_DEPS)</span><br><span style="color: hsl(120, 100%, 40%);">+ for f in $+; \</span><br><span style="color: hsl(120, 100%, 40%);">+ do for c in $$(cat $$f | grep -v ^#); \</span><br><span style="color: hsl(120, 100%, 40%);">+ do printf $$(printf '\%o' 0x$$c); \</span><br><span style="color: hsl(120, 100%, 40%);">+ done; \</span><br><span style="color: hsl(120, 100%, 40%);">+ done > $@</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+$(objcbfs)/bootblock.bin: $(objcbfs)/bootblock.raw.bin $(ROM_HEADER_BIN)</span><br><span style="color: hsl(120, 100%, 40%);">+ @printf " GEN $(subst $(obj)/,,$(@))\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ # Insert CLIB at 0x10000 and CSIB at 0x10100</span><br><span style="color: hsl(120, 100%, 40%);">+ dd if=$(ROM_HEADER_BIN) of=$@ bs=1 seek=$$((0x10000)) conv=notrunc status=none</span><br><span style="color: hsl(120, 100%, 40%);">+ # Insert bootblock at 0x20000</span><br><span style="color: hsl(120, 100%, 40%);">+ dd if=$(objcbfs)/bootblock.raw.bin of=$@ bs=1 seek=$$((0x20000)) conv=notrunc status=none</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> endif</span><br><span>diff --git a/src/soc/cavium/common/rom_clib_s_nbl1fw.bin.hex b/src/soc/cavium/common/rom_clib_s_nbl1fw.bin.hex</span><br><span>new file mode 100644</span><br><span>index 0000000..231c6a6</span><br><span>--- /dev/null</span><br><span>+++ b/src/soc/cavium/common/rom_clib_s_nbl1fw.bin.hex</span><br><span>@@ -0,0 +1,16 @@</span><br><span style="color: hsl(120, 100%, 40%);">+43 56 4d 5f 43 4c 49 42 00 00 00 00 00 00 00 00</span><br><span style="color: hsl(120, 100%, 40%);">+00 00 02 00 00 00 00 00 00 00 03 00 00 00 00 00</span><br><span style="color: hsl(120, 100%, 40%);">+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00</span><br><span style="color: hsl(120, 100%, 40%);">+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00</span><br><span style="color: hsl(120, 100%, 40%);">+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00</span><br><span style="color: hsl(120, 100%, 40%);">+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00</span><br><span style="color: hsl(120, 100%, 40%);">+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00</span><br><span style="color: hsl(120, 100%, 40%);">+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00</span><br><span style="color: hsl(120, 100%, 40%);">+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00</span><br><span style="color: hsl(120, 100%, 40%);">+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00</span><br><span style="color: hsl(120, 100%, 40%);">+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00</span><br><span style="color: hsl(120, 100%, 40%);">+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00</span><br><span style="color: hsl(120, 100%, 40%);">+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00</span><br><span style="color: hsl(120, 100%, 40%);">+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00</span><br><span style="color: hsl(120, 100%, 40%);">+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00</span><br><span style="color: hsl(120, 100%, 40%);">+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00</span><br><span>diff --git a/src/soc/cavium/common/rom_csib_s_nbl1fw.bin.hex b/src/soc/cavium/common/rom_csib_s_nbl1fw.bin.hex</span><br><span>new file mode 100644</span><br><span>index 0000000..f7a2021</span><br><span>--- /dev/null</span><br><span>+++ b/src/soc/cavium/common/rom_csib_s_nbl1fw.bin.hex</span><br><span>@@ -0,0 +1,16 @@</span><br><span style="color: hsl(120, 100%, 40%);">+43 56 4d 5f 43 53 49 42 00 00 00 00 00 00 00 00</span><br><span style="color: hsl(120, 100%, 40%);">+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00</span><br><span style="color: hsl(120, 100%, 40%);">+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00</span><br><span style="color: hsl(120, 100%, 40%);">+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00</span><br><span style="color: hsl(120, 100%, 40%);">+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00</span><br><span style="color: hsl(120, 100%, 40%);">+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00</span><br><span style="color: hsl(120, 100%, 40%);">+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00</span><br><span style="color: hsl(120, 100%, 40%);">+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00</span><br><span style="color: hsl(120, 100%, 40%);">+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00</span><br><span style="color: hsl(120, 100%, 40%);">+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00</span><br><span style="color: hsl(120, 100%, 40%);">+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00</span><br><span style="color: hsl(120, 100%, 40%);">+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00</span><br><span style="color: hsl(120, 100%, 40%);">+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00</span><br><span style="color: hsl(120, 100%, 40%);">+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00</span><br><span style="color: hsl(120, 100%, 40%);">+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00</span><br><span style="color: hsl(120, 100%, 40%);">+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/23793">change 23793</a>. To unsubscribe, or for help writing mail filters, 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/23793"/><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: Icd9cdf882ccdac591bec7240f1c7694fe0c0ad4d </div>
<div style="display:none"> Gerrit-Change-Number: 23793 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Patrick Rudolph <patrick.rudolph@9elements.com> </div>