[coreboot-gerrit] New patch to review for coreboot: 2944cd9 t132: add Kconfig option for MTS microcode directory

[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/8614

-gerrit

commit 2944cd9a4cd9a596364c49f308d86b06c20e1d94
Author: Aaron Durbin <adurbin at chromium.org>
Date:   Mon Jul 14 19:13:07 2014 -0500

    t132: add Kconfig option for MTS microcode directory
    
    In order to make sharing of the location of MTS microcode easier
    provide a Kconfig option that is the path to the files.
    
    BUG=chrome-os-partner:30569
    BRANCH=None
    TEST=Built rush coreboot.
    
    Original-Change-Id: I36775d0018fc8591d5e77c2943e28a51381713f5
    Original-Signed-off-by: Aaron Durbin <adurbin at chromium.org>
    Original-Reviewed-on: https://chromium-review.googlesource.com/207839
    Original-Reviewed-by: Tom Warren <twarren at nvidia.com>
    Original-Reviewed-by: Furquan Shaikh <furquan at chromium.org>
    (cherry picked from commit 6f1de0e7fd312c1d6798e65d4b43d586f0994337)
    Signed-off-by: Marc Jones <marc.jones at se-eng.com>
    
    Change-Id: I660cb9d8bd13c765c89b54b0807b5b3ee836e807
---
 src/soc/nvidia/tegra132/Kconfig      |  6 ++++++
 src/soc/nvidia/tegra132/Makefile.inc | 10 +++++++++-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/soc/nvidia/tegra132/Kconfig b/src/soc/nvidia/tegra132/Kconfig
index 4dcf26f..3396cc8 100644
--- a/src/soc/nvidia/tegra132/Kconfig
+++ b/src/soc/nvidia/tegra132/Kconfig
@@ -87,4 +87,10 @@ config CONSOLE_PRERAM_BUFFER_BASE
 	hex "memory address of the CBMEM console buffer"
 	default 0x40004020
 
+config MTS_DIRECTORY
+	string "Directory where MTS microcode files are located"
+	default "3rdparty/cpu/nvidia/tegra132/current/prod"
+	help
+	  Path to directory where MTS microcode files are located.
+
 endif
diff --git a/src/soc/nvidia/tegra132/Makefile.inc b/src/soc/nvidia/tegra132/Makefile.inc
index 7371dbb..88ba51c 100644
--- a/src/soc/nvidia/tegra132/Makefile.inc
+++ b/src/soc/nvidia/tegra132/Makefile.inc
@@ -74,7 +74,8 @@ $(obj)/generated/bct.bin: $(obj)/generated/bct.cfg $(CBOOTIMAGE)
 
 BCT_BIN = $(obj)/generated/bct.bin
 BCT_WRAPPER = $(obj)/generated/bct.wrapper
-PREBOOT_MTS_FILE = 3rdparty/cpu/nvidia/tegra132/current/prod/preboot_cr.bin
+MTS_DIR = $(CONFIG_MTS_DIRECTORY)
+PREBOOT_MTS_FILE = $(MTS_DIR)/preboot_cr.bin
 $(objcbfs)/bootblock.bin: $(objcbfs)/bootblock.raw.bin $(BCT_BIN) $(CBOOTIMAGE)
 	echo "Version    = 1;" > $(BCT_WRAPPER)
 	echo "Redundancy = 1;" >> $(BCT_WRAPPER)
@@ -84,3 +85,10 @@ $(objcbfs)/bootblock.bin: $(objcbfs)/bootblock.raw.bin $(BCT_BIN) $(CBOOTIMAGE)
 	echo "BootLoader = $<,$(CONFIG_BOOTBLOCK_BASE),$(CONFIG_BOOTBLOCK_BASE),Complete;" >> $(BCT_WRAPPER)
 	@printf "    CBOOTIMAGE $(subst $(obj)/,,$(@))\n"
 	$(CBOOTIMAGE) $(CBOOTIMAGE_OPTS) $(BCT_WRAPPER) $@
+
+# MTS microcode
+MTS_FILE = $(MTS_DIR)/mts_cr.bin
+MTS_FILE_CBFS = mts
+cbfs-files-y += $(MTS_FILE_CBFS)
+$(MTS_FILE_CBFS)-file := $(MTS_FILE)
+$(MTS_FILE_CBFS)-type := 0x50