diff options
author | Daniel Boulby <daniel.boulby@arm.com> | 2022-07-25 14:07:57 +0100 |
---|---|---|
committer | Daniel Boulby <daniel.boulby@arm.com> | 2022-07-28 16:38:08 +0100 |
commit | f6c288ea2ea3b885b9d31d3c34e2afdc860ae80b (patch) | |
tree | 28258117368e9eff27efb495a9451bf4a7638ecb /Makefile | |
parent | c4adb5e64ef5e9b0fc0a31cc2b7c01b910501bd5 (diff) |
fix(build): race condition in sp layout generation
To prevent concurrency errors make it so generate_json.sh is
only called once during make. To do this supply a list of
present partitions to the script and generate the sp_layout
file using this.
Signed-off-by: Daniel Boulby <daniel.boulby@arm.com>
Change-Id: If9987cf5cd88be4ca617ce304e37d95346fb481b
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 7 |
1 files changed, 7 insertions, 0 deletions
@@ -112,6 +112,9 @@ include tftf/tests/tests.mk include fwu/ns_bl1u/ns_bl1u.mk include fwu/ns_bl2u/ns_bl2u.mk +# List of secure partitions present. +SECURE_PARTITIONS := + # Only platform fvp supports cactus_mm, quark ifeq (${ARCH}-${PLAT},aarch64-fvp) include spm/cactus_mm/cactus_mm.mk @@ -531,6 +534,10 @@ ifeq (${ARCH}-${PLAT},aarch64-tc0) $(eval $(call MAKE_IMG,ivy)) endif +SP_LAYOUT: + ${Q}tools/generate_json/generate_json.sh \ + $(BUILD_PLAT) $(SECURE_PARTITIONS) + # The EL3 test payload is only supported in AArch64. It has an independent build # system. .PHONY: el3_payload |