aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSuman Anna2020-10-28 17:13:24 -0500
committerDan Murphy2020-11-06 09:02:05 -0600
commit7b4fe13d642d69a559724349aede4817891008a7 (patch)
tree147333620b0516f58088153195074d53802dbad7
parent529cba75e8e08084d011cc7ce73c618e1e18e069 (diff)
downloadk3-image-gen-7b4fe13d642d69a559724349aede4817891008a7.tar.gz
k3-image-gen-7b4fe13d642d69a559724349aede4817891008a7.tar.xz
k3-image-gen-7b4fe13d642d69a559724349aede4817891008a7.zip
Makefile: Introduce SCIFS variable to account for SYSFW name variations07.01.00.005
The System Firmware functionality on K3 J721E and J7200 SoCs has been reduced to only cater to the foundational security pieces starting from SYSFW 2020.08, and the binaries have been renamed accordingly. Introduce a Makefile variable SCIFS to account for these changes. Signed-off-by: Suman Anna <s-anna@ti.com> Acked-by: Praneeth Bajjuri <praneeth@ti.com> Signed-off-by: Dan Murphy <dmurphy@ti.com>
-rw-r--r--Makefile10
-rw-r--r--soc/am65x/Makefile1
-rw-r--r--soc/am65x_sr2/Makefile1
-rw-r--r--soc/j7200/Makefile1
-rw-r--r--soc/j721e/Makefile1
5 files changed, 9 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index 6a7758904..6a35ab0e7 100644
--- a/Makefile
+++ b/Makefile
@@ -61,13 +61,13 @@ endif
61 61
62# If using the default SYSFW make sure to manually copy/populate the unsigned 62# If using the default SYSFW make sure to manually copy/populate the unsigned
63# image into the root folder of this repository. 63# image into the root folder of this repository.
64SYSFW_PATH ?= ti-sci-firmware-${SOC}-gp.bin 64SYSFW_PATH ?= ti-$(SCIFS)-firmware-${SOC}-gp.bin
65SYSFW_HS_PATH ?= ti-sci-firmware-${SOC}-hs-enc.bin 65SYSFW_HS_PATH ?= ti-$(SCIFS)-firmware-${SOC}-hs-enc.bin
66SYSFW_HS_INNER_CERT_PATH ?= ti-sci-firmware-${SOC}-hs-cert.bin 66SYSFW_HS_INNER_CERT_PATH ?= ti-$(SCIFS)-firmware-${SOC}-hs-cert.bin
67SYSFW_HS_CERTS_PATH ?= ti-sci-firmware-${SOC}-hs-certs.bin 67SYSFW_HS_CERTS_PATH ?= ti-$(SCIFS)-firmware-${SOC}-hs-certs.bin
68 68
69# Must use FULL Git hash below, as it is used as part of an URL for direct DL 69# Must use FULL Git hash below, as it is used as part of an URL for direct DL
70SYSFW_GIT_HASH ?= 8a22979dc944f6f4f867e2ac637c51a317efaacd 70SYSFW_GIT_HASH ?= ae9394892a4e2302a75554ea2f3a3134ed0f28df
71 71
72# URL to download SYSFW release binary from if not provided otherwise 72# URL to download SYSFW release binary from if not provided otherwise
73SYSFW_DL_URL ?= https://git.ti.com/processor-firmware/ti-linux-firmware/blobs/raw/$(SYSFW_GIT_HASH)/ti-sysfw/$(SYSFW_PATH) 73SYSFW_DL_URL ?= https://git.ti.com/processor-firmware/ti-linux-firmware/blobs/raw/$(SYSFW_GIT_HASH)/ti-sysfw/$(SYSFW_PATH)
diff --git a/soc/am65x/Makefile b/soc/am65x/Makefile
index 8f091cd5c..585f116dc 100644
--- a/soc/am65x/Makefile
+++ b/soc/am65x/Makefile
@@ -31,6 +31,7 @@
31# 31#
32 32
33LOADADDR ?= 0x40000 33LOADADDR ?= 0x40000
34SCIFS = sci
34 35
35.PHONY: all 36.PHONY: all
36all: _objtree_build $(ITB) sysfw.itb 37all: _objtree_build $(ITB) sysfw.itb
diff --git a/soc/am65x_sr2/Makefile b/soc/am65x_sr2/Makefile
index 8f091cd5c..585f116dc 100644
--- a/soc/am65x_sr2/Makefile
+++ b/soc/am65x_sr2/Makefile
@@ -31,6 +31,7 @@
31# 31#
32 32
33LOADADDR ?= 0x40000 33LOADADDR ?= 0x40000
34SCIFS = sci
34 35
35.PHONY: all 36.PHONY: all
36all: _objtree_build $(ITB) sysfw.itb 37all: _objtree_build $(ITB) sysfw.itb
diff --git a/soc/j7200/Makefile b/soc/j7200/Makefile
index d8904d24d..03e091c31 100644
--- a/soc/j7200/Makefile
+++ b/soc/j7200/Makefile
@@ -34,6 +34,7 @@ SBL_LOADADDDR ?= 0x41c00000
34COMBINED_SYSFW_BRDCFG_LOADADDR ?= 0x7f000 34COMBINED_SYSFW_BRDCFG_LOADADDR ?= 0x7f000
35COMBINED_DM_BRDCFG_LOADADDR ?= 0x41c80000 35COMBINED_DM_BRDCFG_LOADADDR ?= 0x41c80000
36LOADADDR ?= 0x40000 36LOADADDR ?= 0x40000
37SCIFS = fs
37 38
38.PHONY: all 39.PHONY: all
39ifeq (,$(SBL)) 40ifeq (,$(SBL))
diff --git a/soc/j721e/Makefile b/soc/j721e/Makefile
index 8f091cd5c..8281dc93a 100644
--- a/soc/j721e/Makefile
+++ b/soc/j721e/Makefile
@@ -31,6 +31,7 @@
31# 31#
32 32
33LOADADDR ?= 0x40000 33LOADADDR ?= 0x40000
34SCIFS = fs
34 35
35.PHONY: all 36.PHONY: all
36all: _objtree_build $(ITB) sysfw.itb 37all: _objtree_build $(ITB) sysfw.itb