From 07c4447588ed53b526563d0a9f61e401d24d0952 Mon Sep 17 00:00:00 2001 From: Manish Pandey Date: Tue, 26 May 2020 23:59:36 +0100 Subject: [PATCH] sptool: append cert_tool arguments. To support secure boot of SP's update cert tool arguments while generating sp_gen.mk which in turn is consumed by build system. Signed-off-by: Manish Pandey Change-Id: I2293cee9b7c684c27d387aba18e0294c701fb1cc --- Makefile | 1 + tools/sptool/sp_mk_generator.py | 11 +++++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 2f53cdf1b..f836fddb7 100644 --- a/Makefile +++ b/Makefile @@ -1010,6 +1010,7 @@ ifdef SP_LAYOUT_FILE endif -include $(BUILD_PLAT)/sp_gen.mk FIP_DEPS += sp + CRT_DEPS += sp NEED_SP_PKG := yes else ifeq (${SPMD_SPM_AT_SEL2},1) diff --git a/tools/sptool/sp_mk_generator.py b/tools/sptool/sp_mk_generator.py index 6b6fa1914..f2387f6b1 100755 --- a/tools/sptool/sp_mk_generator.py +++ b/tools/sptool/sp_mk_generator.py @@ -11,7 +11,8 @@ Layout file can exist outside of TF-A tree and the paths of Image and PM files must be relative to it. This script parses the layout file and generates a make file which updates -FDT_SOURCES, FIP_ARGS and SPTOOL_ARGS which are used in later build steps. +FDT_SOURCES, FIP_ARGS, CRT_ARGS and SPTOOL_ARGS which are used in later build +steps. This script also gets SP "uuid" from parsing its PM and converting it to a standard format. @@ -24,6 +25,7 @@ Secure Partition entry FDT_SOURCES += sp1.dts SPTOOL_ARGS += -i sp1.bin:sp1.dtb -o sp1.pkg FIP_ARGS += --blob uuid=XXXXX-XXX...,file=sp1.pkg + CRT_ARGS += --sp-pkg1 sp1.pkg A typical SP_LAYOUT_FILE file will look like { @@ -59,7 +61,7 @@ dtb_dir = out_dir + "/fdts/" print(dtb_dir) with open(gen_file, 'w') as out_file: - for key in data.keys(): + for idx, key in enumerate(data.keys()): """ Append FDT_SOURCES @@ -97,4 +99,9 @@ with open(gen_file, 'w') as out_file: Append FIP_ARGS """ out_file.write("FIP_ARGS += --blob uuid=" + uuid_std + ",file=" + dst + "\n") + + """ + Append CRT_ARGS + """ + out_file.write("CRT_ARGS += --sp-pkg" + str(idx + 1) + " " + dst + "\n") out_file.write("\n")