[coreboot-gerrit] Patch set updated for coreboot: 3ef5a67 tegra132: add preboot MTS to bct generation

[Marc Jones (marc.jones@se-eng.com)]

Marc Jones (marc.jones at se-eng.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/8466

-gerrit

commit 3ef5a67fa3e51f6b7b1ff2e85bcd197ce7e359a1
Author: Aaron Durbin <adurbin at chromium.org>
Date:   Fri Jun 20 14:58:05 2014 -0500

    tegra132: add preboot MTS to bct generation
    
    The preboot MTS microcode needs to be supplied within the
    bct so the BootROM can load it. The size of the bootblock
    space in SPI needed to be extended to accomodate the extra
    length.
    
    BUG=chrome-os-partner:29059
    BUG=chrome-os-partner:29060
    BRANCH=None
    TEST=Built rush with updated cbootimage with t132 support.
    
    Original-Change-Id: Iafc1837cd81cc1165a9be5da6ec7425cec2e2ffc
    Original-Signed-off-by: Aaron Durbin <adurbin at chromium.org>
    Original-Reviewed-on: https://chromium-review.googlesource.com/204940
    Original-Reviewed-by: Furquan Shaikh <furquan at chromium.org>
    (cherry picked from commit 22e054496465c74fc12afd865d14b87c5858d889)
    Signed-off-by: Marc Jones <marc.jones at se-eng.com>
    
    Change-Id: I5e46c408a7215ecc789b0a0f35070ef9036a7d11
---
 src/soc/nvidia/tegra132/Makefile.inc | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/soc/nvidia/tegra132/Makefile.inc b/src/soc/nvidia/tegra132/Makefile.inc
index 5bbeefa..7371dbb 100644
--- a/src/soc/nvidia/tegra132/Makefile.inc
+++ b/src/soc/nvidia/tegra132/Makefile.inc
@@ -51,6 +51,7 @@ ramstage-y += ../tegra/pinmux.c
 ramstage-$(CONFIG_DRIVERS_UART) += uart.c
 
 CPPFLAGS_common += -Isrc/soc/nvidia/tegra132/include/
+CBOOTIMAGE_OPTS = --soc tegra132
 
 # We want to grab the bootblock right before it goes into the image and wrap
 # it inside a BCT, but ideally we would do that without making special, one
@@ -69,14 +70,17 @@ $(objcbfs)/bootblock.raw.elf: $(objcbfs)/bootblock.elf
 
 $(obj)/generated/bct.bin: $(obj)/generated/bct.cfg $(CBOOTIMAGE)
 	@printf "    CBOOTIMAGE $(subst $(obj)/,,$(@))\n"
-	$(CBOOTIMAGE) -gbct --soc tegra132 $< $@
+	$(CBOOTIMAGE) -gbct $(CBOOTIMAGE_OPTS) $< $@
 
 BCT_BIN = $(obj)/generated/bct.bin
 BCT_WRAPPER = $(obj)/generated/bct.wrapper
+PREBOOT_MTS_FILE = 3rdparty/cpu/nvidia/tegra132/current/prod/preboot_cr.bin
 $(objcbfs)/bootblock.bin: $(objcbfs)/bootblock.raw.bin $(BCT_BIN) $(CBOOTIMAGE)
 	echo "Version    = 1;" > $(BCT_WRAPPER)
 	echo "Redundancy = 1;" >> $(BCT_WRAPPER)
+	echo "Bctcopy    = 1;" >> $(BCT_WRAPPER)
 	echo "Bctfile    = $(BCT_BIN);" >> $(BCT_WRAPPER)
+	echo "MtsPreboot = $(PREBOOT_MTS_FILE),0x4000f000,0x4000f000,Complete;" >> $(BCT_WRAPPER)
 	echo "BootLoader = $<,$(CONFIG_BOOTBLOCK_BASE),$(CONFIG_BOOTBLOCK_BASE),Complete;" >> $(BCT_WRAPPER)
 	@printf "    CBOOTIMAGE $(subst $(obj)/,,$(@))\n"
-	$(CBOOTIMAGE) $(BCT_WRAPPER) $@
+	$(CBOOTIMAGE) $(CBOOTIMAGE_OPTS) $(BCT_WRAPPER) $@