diff mbox series

[meta-arago,dunfell,3/5] ti-tisdk-makefile: Makefile_sysfw-image: Add support for combined tiboot3.bin build in k3 devices

Message ID 20220513074923.28761-4-a-m1@ti.com
State Accepted
Delegated to: Ryan Eatmon
Headers show
Series Add support in toplevel Makefile of SDK | expand

Commit Message

Aparna M May 13, 2022, 7:49 a.m. UTC 
Add support to combine sysfw.itb with tiboot3.bin to generate a combined
tiboot3.bin for k3 devices. Additionally, add support for both GP and HS
machines.

Signed-off-by: Aparna M <a-m1@ti.com>
---
 .../ti-tisdk-makefile/Makefile_sysfw-image        | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)
diff mbox series

Patch

diff --git a/meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile/Makefile_sysfw-image b/meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile/Makefile_sysfw-image
index 65c79653..9a653769 100644
--- a/meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile/Makefile_sysfw-image
+++ b/meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile/Makefile_sysfw-image
@@ -23,28 +23,31 @@  SYSFW_PREFIX_j7 = ti-fs-firmware
 SYSFW_BASE = $(SYSFW_PREFIX)-$(SYSFW_SOC)-$(PLATFORM_TYPE)
 
 SYSFW_MAKEARGS_common = SYSFW_DL_URL="" SYSFW_HS_DL_URL="" SYSFW_HS_INNER_CERT_DL_URL="" \
-                        SYSFW_PATH=$(TI_SDK_PATH)/board-support/prebuilt-images/$(SYSFW_BASE).bin \
-                        SOC=$(SYSFW_SOC) CONFIG=$(SYSFW_CONFIG)
+			SOC=$(SYSFW_SOC) CONFIG=$(SYSFW_CONFIG)
+
+SYSFW_MAKEARGS_gp = SYSFW_PATH=$(TI_SDK_PATH)/board-support/prebuilt-images/$(SYSFW_BASE).bin
 
-SYSFW_MAKEARGS_gp =
 SYSFW_MAKEARGS_hs = HS=1 SYSFW_HS_PATH=$(TI_SDK_PATH)/board-support/prebuilt-images/$(SYSFW_BASE)-enc.bin \
-                    SYSFW_HS_INNER_CERT_PATH=$(TI_SDK_PATH)/board-support/prebuilt-images/$(SYSFW_BASE)-cert.bin
+		    SYSFW_HS_INNER_CERT_PATH=$(TI_SDK_PATH)/board-support/prebuilt-images/$(SYSFW_BASE)-cert.bin \
+		    SYSFW_PATH=$(TI_SDK_PATH)/board-support/prebuilt-images/$(SYSFW_BASE)-enc.bin
 
 SYSFW_MAKEARGS = $(SYSFW_MAKEARGS_common) $(SYSFW_MAKEARGS_$(PLATFORM_TYPE))
 
+SBL_PATH = $(TI_SDK_PATH)/board-support/u-boot_build/r5/spl/u-boot-spl.bin
+
 # Depend on linux-dtbs for the dtc utility
 sysfw-image: linux-dtbs
 	@echo =============================
 	@echo    Building SYSFW Image
 	@echo =============================
 	@cd board-support; cd `find . -maxdepth 1 -type d -name "*k3-image*"`; \
-		make $(SYSFW_MAKEARGS) CROSS_COMPILE=$(CROSS_COMPILE_ARMV7) PATH=$(PATH):$(LINUXKERNEL_INSTALL_DIR)/scripts/dtc
+		make SBL=$(SBL_PATH) $(SYSFW_MAKEARGS) CROSS_COMPILE=$(CROSS_COMPILE_ARMV7) PATH=$(PATH):$(LINUXKERNEL_INSTALL_DIR)/scripts/dtc
 
 sysfw-image_clean:
 	@echo =============================
 	@echo    Cleaning SYSFW Image
 	@echo =============================
-	@cd board-support; cd `find . -maxdepth 1 -type d -name "*k3-image*"`; make clean
+	@cd board-support; cd `find . -maxdepth 1 -type d -name "*k3-image*"`; make $(SYSFW_MAKEARGS) clean
 
 sysfw-image_install:
 	@echo =============================