From 121596a98fea008d15b052879239f2d2b0e16f6b Mon Sep 17 00:00:00 2001 From: Andrew Davis Date: Fri, 15 Jul 2022 11:38:54 -0500 Subject: [PATCH] arm: k3: config.mk: Read software revision information from file on HS Read the swrv.txt file from the TI Security Development Tools when TI_SECURE_DEVICE is enabled. This allows us to set our software revision in one place and have it used by all the tools that create TI x509 boot certificates. Signed-off-by: Andrew Davis --- arch/arm/mach-k3/config.mk | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/arch/arm/mach-k3/config.mk b/arch/arm/mach-k3/config.mk index 4feb57992d..9306f2627d 100644 --- a/arch/arm/mach-k3/config.mk +++ b/arch/arm/mach-k3/config.mk @@ -30,6 +30,14 @@ endif # X509 SWRV default SWRV = $(CONFIG_K3_X509_SWRV) +# On HS use SECDEV provided software revision or warn if not available +ifeq ($(CONFIG_TI_SECURE_DEVICE),y) +ifneq ($(wildcard $(TI_SECURE_DEV_PKG)/keys/swrv.txt),) +SWRV= $(shell cat $(TI_SECURE_DEV_PKG)/keys/swrv.txt) +else +$(warning "WARNING: Software revision file not found. Default may not work on HS hardware.") +endif +endif # tiboot3.bin is mandated by ROM and ROM only supports R5 boot. # So restrict tiboot3.bin creation for CPU_V7R. -- 2.39.5