Makefile: Introduce SCIFS variable to account for SYSFW name variations

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>

Makefile

@@ -61,13 +61,13 @@ endif
 
 # If using the default SYSFW make sure to manually copy/populate the unsigned
 # image into the root folder of this repository.
-SYSFW_PATH ?= ti-sci-firmware-${SOC}-gp.bin
-SYSFW_HS_PATH ?= ti-sci-firmware-${SOC}-hs-enc.bin
-SYSFW_HS_INNER_CERT_PATH ?= ti-sci-firmware-${SOC}-hs-cert.bin
-SYSFW_HS_CERTS_PATH ?= ti-sci-firmware-${SOC}-hs-certs.bin
+SYSFW_PATH ?= ti-$(SCIFS)-firmware-${SOC}-gp.bin
+SYSFW_HS_PATH ?= ti-$(SCIFS)-firmware-${SOC}-hs-enc.bin
+SYSFW_HS_INNER_CERT_PATH ?= ti-$(SCIFS)-firmware-${SOC}-hs-cert.bin
+SYSFW_HS_CERTS_PATH ?= ti-$(SCIFS)-firmware-${SOC}-hs-certs.bin
 
 # Must use FULL Git hash below, as it is used as part of an URL for direct DL
-SYSFW_GIT_HASH ?= 8a22979dc944f6f4f867e2ac637c51a317efaacd
+SYSFW_GIT_HASH ?= ae9394892a4e2302a75554ea2f3a3134ed0f28df
 
 # URL to download SYSFW release binary from if not provided otherwise
 SYSFW_DL_URL ?= https://git.ti.com/processor-firmware/ti-linux-firmware/blobs/raw/$(SYSFW_GIT_HASH)/ti-sysfw/$(SYSFW_PATH)

soc/am65x/Makefile

@@ -31,6 +31,7 @@
 #
 
 LOADADDR ?= 0x40000
+SCIFS = sci
 
 .PHONY: all
 all: _objtree_build $(ITB) sysfw.itb

soc/am65x_sr2/Makefile

@@ -31,6 +31,7 @@
 #
 
 LOADADDR ?= 0x40000
+SCIFS = sci
 
 .PHONY: all
 all: _objtree_build $(ITB) sysfw.itb

soc/j7200/Makefile

@@ -34,6 +34,7 @@ SBL_LOADADDDR ?= 0x41c00000
 COMBINED_SYSFW_BRDCFG_LOADADDR ?= 0x7f000
 COMBINED_DM_BRDCFG_LOADADDR ?= 0x41c80000
 LOADADDR ?= 0x40000
+SCIFS = fs
 
 .PHONY: all
 ifeq (,$(SBL))

soc/j721e/Makefile

@@ -31,6 +31,7 @@
 #
 
 LOADADDR ?= 0x40000
+SCIFS = fs
 
 .PHONY: all
 all: _objtree_build $(ITB) sysfw.itb