[coreboot-gerrit] New patch to review for coreboot: 45c5939 tegra124: Add some make rules which will wrap the bootblock in the BCT.

[Isaac Christensen (isaac.christensen@se-eng.com)]

Isaac Christensen (isaac.christensen at se-eng.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/6618

-gerrit

commit 45c5939bbc0047cf1098cf8b4a708e406b039308
Author: Gabe Black <gabeblack at google.com>
Date:   Fri Sep 27 03:06:34 2013 -0700

    tegra124: Add some make rules which will wrap the bootblock in the BCT.
    
    These rules slip into the normal bootblock preperation process and use the
    cbootimage utility to wrap it in a BCT.
    
    Change-Id: I8cf2a3fb6e9f1d792d536c533d4813acfb550cea
    Signed-off-by: Gabe Black <gabeblack at google.com>
    Reviewed-on: https://chromium-review.googlesource.com/170924
    Reviewed-by: Gabe Black <gabeblack at chromium.org>
    Commit-Queue: Gabe Black <gabeblack at chromium.org>
    Tested-by: Gabe Black <gabeblack at chromium.org>
    (cherry picked from commit cf4a9b0712c21b885bb59310671fb87e38abb665)
    Signed-off-by: Isaac Christensen <isaac.christensen at se-eng.com>
---
 src/soc/nvidia/tegra124/Makefile.inc | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/src/soc/nvidia/tegra124/Makefile.inc b/src/soc/nvidia/tegra124/Makefile.inc
index 49e2b1f..14707df 100644
--- a/src/soc/nvidia/tegra124/Makefile.inc
+++ b/src/soc/nvidia/tegra124/Makefile.inc
@@ -1,3 +1,5 @@
+CBOOTIMAGE = cbootimage
+
 bootblock-y += cbfs.c
 
 romstage-y += cbfs.c
@@ -7,3 +9,32 @@ romstage-y += timer.c
 ramstage-y += cbfs.c
 ramstage-y += monotonic_timer.c
 ramstage-y += timer.c
+
+# 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
+# use modifications to the main ARM Makefile. We do this in two ways. First,
+# we copy bootblock.elf to bootblock.raw.elf and allow the %.bin: %.elf
+# template rule to turn it into bootblock.raw.bin. This makes sure whatever
+# processing is supposed to happen to turn an .elf into a .bin happens.
+#
+# Second, we add our own rule for creating bootblock.bin from
+# bootblock.raw.bin which displaces the template rule. When other rules that
+# package up the image pull in bootblock.bin, it will be this wrapped version
+# instead of the raw bootblock.
+
+$(objcbfs)/bootblock.raw.elf: $(objcbfs)/bootblock.elf
+	cp $< $@
+
+$(obj)/generated/bct.bin: $(obj)/generated/bct.cfg
+	@printf "    CBOOTIMAGE $(subst $(obj)/,,$(@))\n"
+	$(CBOOTIMAGE) -gbct --soc tegra124 $< $@
+
+BCT_BIN = $(obj)/generated/bct.bin
+BCT_WRAPPER = $(obj)/generated/bct.wrapper
+$(objcbfs)/bootblock.bin: $(objcbfs)/bootblock.raw.bin $(BCT_BIN)
+	echo "Version    = 1;" > $(BCT_WRAPPER)
+	echo "Redundancy = 1;" >> $(BCT_WRAPPER)
+	echo "Bctfile    = $(BCT_BIN);" >> $(BCT_WRAPPER)
+	echo "BootLoader = $<,$(CONFIG_BOOTBLOCK_BASE),$(CONFIG_BOOTBLOCK_BASE),Complete;" >> $(BCT_WRAPPER)
+	@printf "    CBOOTIMAGE $(subst $(obj)/,,$(@))\n"
+	$(CBOOTIMAGE) $(BCT_WRAPPER) $@