Skip to contentSkip to conversation

Add support in toplevel Makefile of SDK

PATCH In review Aparna M 2 participants 7 messages May 13, 2022 – Aug 13, 2025

lore
Share & tools
lore

Aparna M

author
#0 lore raw

cover Add support in toplevel Makefile of SDK

Add support in toplevel makefile of SDK for:
- uboot build for am62xx-evm with DM firmware packaged with tispl.bin
- fitImage.itb build required for HS devices. Cureently adding support for am64xx-hs-evm.
- Combining sysfw.itb with tiboot3.bin to generate combined tiboot3.bin for k3 devices.
- sysfw-image build for am62xx-evm
- Rename UBOOT_MACHINE for am62xx-evm R5

Aparna M (5):
ti-tisdk-makefile: Makefile_u-boot-spl: Add support for u-boot-a53
build for am62xx-evm
ti-tisdk-makefile: Makefile_linux-fitimage: Add support to build
fitImage.itb for am64xx-hs-evm
ti-tisdk-makefile: Makefile_sysfw-image: Add support for combined
tiboot3.bin build in k3 devices
ti-tisdk-makefile: Makefile_sysfw-image: Add support for am62xx-evm
ti-tisdk-makefile: Rename UBOOT_MACHINE for R5 for am62xx-evm

 .../ti-tisdk-makefile/Makefile_linux-fitimage | 32 +++++++++++++++++++
 .../ti-tisdk-makefile/Makefile_sysfw-image    | 21 +++++++-----
 .../ti-tisdk-makefile/k3/Makefile_u-boot-spl  | 16 +++++++---
 .../ti-tisdk-makefile_1.0.bb                  |  8 ++++-
 4 files changed, 64 insertions(+), 13 deletions(-)
 create mode 100644 meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile/Makefile_linux-fitimage
Signature · 1 line
2.17.1
author
#1 lore raw

PATCH 1/5 ti-tisdk-makefile: Makefile_u-boot-spl: Add support for u-boot-a53 build for am62xx-evm

The DM firmware binary ipc_echo_testb_mcu1_0_release_strip.xer5f is packaged with tispl.bin in am62xx-evm. Add support for u-boot-a53 build for the device in toplevel Makefile of SDK.

---
 .../ti-tisdk-makefile/k3/Makefile_u-boot-spl     | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)
meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile/k3/Makefile_u-boot-spl +12 -4
index d1a5ed08..4b210d1c 100644
@@ -10,6 +10,7 @@ UBOOT_R5_BUILD_DIR=$(TI_SDK_PATH)/board-support/u-boot_build/r5
 UBOOT_ATF=$(TI_SDK_PATH)/board-support/prebuilt-images/bl31.bin
 UBOOT_TEE=$(TI_SDK_PATH)/board-support/prebuilt-images/bl32.bin
 UBOOT_SYSFW=$(TI_SDK_PATH)/board-support/prebuilt-images/sysfw.bin
+UBOOT_DMFW=$(TI_SDK_PATH)/board-support/prebuilt-images/ipc_echo_testb_mcu1_0_release_strip.xer5f
 
 u-boot: u-boot-a53 u-boot-r5
 u-boot_clean: u-boot-a53_clean u-boot-r5_clean
@@ -20,10 +21,17 @@ u-boot-a53:
 	@echo ===================================
 	$(MAKE) -j $(MAKE_JOBS) -C $(TI_SDK_PATH)/board-support/u-boot-* CROSS_COMPILE=$(CROSS_COMPILE) \
 		 $(UBOOT_MACHINE) O=$(UBOOT_A53_BUILD_DIR)
-	$(MAKE) -j $(MAKE_JOBS) -C $(TI_SDK_PATH)/board-support/u-boot-* CROSS_COMPILE=$(CROSS_COMPILE) \
-		CONFIG_MKIMAGE_DTC_PATH=$(UBOOT_A53_BUILD_DIR)/scripts/dtc/dtc \
-		ATF=$(UBOOT_ATF) TEE=$(UBOOT_TEE) \
-		O=$(UBOOT_A53_BUILD_DIR)
+	if [ $(PLATFORM) = am62xx-evm ]; then \
+		$(MAKE) -j $(MAKE_JOBS) -C $(TI_SDK_PATH)/board-support/u-boot-* CROSS_COMPILE=$(CROSS_COMPILE) \
+			CONFIG_MKIMAGE_DTC_PATH=$(UBOOT_A53_BUILD_DIR)/scripts/dtc/dtc \
+			ATF=$(UBOOT_ATF) TEE=$(UBOOT_TEE) DM=$(UBOOT_DMFW) \
+			O=$(UBOOT_A53_BUILD_DIR); \
+	else \
+		$(MAKE) -j $(MAKE_JOBS) -C $(TI_SDK_PATH)/board-support/u-boot-* CROSS_COMPILE=$(CROSS_COMPILE) \
+			CONFIG_MKIMAGE_DTC_PATH=$(UBOOT_A53_BUILD_DIR)/scripts/dtc/dtc \
+			ATF=$(UBOOT_ATF) TEE=$(UBOOT_TEE) \
+			O=$(UBOOT_A53_BUILD_DIR); \
+	fi
 
 u-boot-a53_clean:
 	@echo ===================================
Signature · 1 line
2.17.1
author
#2 lore raw

PATCH 2/5 ti-tisdk-makefile: Makefile_linux-fitimage: Add support to build fitImage.itb for am64xx-hs-evm

In reply to Aparna M

Add toplevel Makefile support for building fitImage.itb for am64xx-hs-evm.

---
 .../ti-tisdk-makefile/Makefile_linux-fitimage | 32 +++++++++++++++++++
 .../ti-tisdk-makefile_1.0.bb                  |  6 ++++
 2 files changed, 38 insertions(+)
 create mode 100644 meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile/Makefile_linux-fitimage
meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile/Makefile_linux-fitimage new file +32 -0
new file mode 100644
index 00000000..d2d49ccf
@@ -0,0 +1,32 @@
+# linux-fitimage build targets
+
+linux-fitimage: ${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh linux linux-dtbs
+	@echo =============================
+	@echo    Creating fitImage with signed binaries
+	@echo =============================
+	cd $(LINUXKERNEL_INSTALL_DIR)/arch/__KERNEL_ARCH__/boot/dts; \
+		for DTB in __KERNEL_DEVICETREE__; do \
+			${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh $$DTB $$DTB.sec; \
+		done;
+	cd $(LINUXKERNEL_INSTALL_DIR); \
+		${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh arch/arm64/boot/Image.gz linux.bin.sec
+	cd $(LINUXKERNEL_INSTALL_DIR); \
+		cp $(TI_SDK_PATH)/board-support/prebuilt-images/fitImage-its.its .; \
+		mkimage -f fitImage-its.its -r fitImage
+
+linux-fitimage_clean:
+	@echo =============================
+	@echo    Cleaning signed images and fitImage
+	@echo =============================
+	cd $(LINUXKERNEL_INSTALL_DIR)/arch/__KERNEL_ARCH__/boot/dts; \
+		for DTB in __KERNEL_DEVICETREE__; do \
+			rm -rf $$DTB.sec; \
+		done;
+	cd $(LINUXKERNEL_INSTALL_DIR); rm -rf linux.bin.sec fitImage
+
+linux-fitimage_install:
+	@echo ================================================
+	@echo    Installing fitImage
+	@echo ================================================
+	install -m 0644 $(LINUXKERNEL_INSTALL_DIR)/fitImage $(DESTDIR)/boot/
+
meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile_1.0.bb +6 -0
index f0a044f7..1cdd5345 100644
@@ -54,6 +54,7 @@ SRC_URI = "\
     file://Makefile_tiovx-app-host \
     file://Makefile_ti-ipc \
     file://Makefile_ti-img-rogue-driver \
+    file://Makefile_linux-fitimage \
 "
 
 PR = "r106"
@@ -198,10 +199,15 @@ MAKEFILES_append_am65xx = " \
 MAKEFILES_append_j7 = " pru-icss \
                             ti-img-rogue-driver \
 "
+
 MAKEFILES_append_am64xx = " \
                         pru-icss \
 "
 
+MAKEFILES_append_am64xx-hs-evm = " \
+                        linux-fitimage \
+"
+
 MAKEFILES_append_am62xx = " \
                         pru-icss \
 "
Signature · 1 line
2.17.1
author
#3 lore raw

PATCH 3/5 ti-tisdk-makefile: Makefile_sysfw-image: Add support for combined tiboot3.bin build in k3 devices

In reply to Aparna M

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.

---
 .../ti-tisdk-makefile/Makefile_sysfw-image        | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)
meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile/Makefile_sysfw-image +9 -6
index 65c79653..9a653769 100644
@@ -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 =============================
Signature · 1 line
2.17.1
author
#4 lore raw

PATCH 4/5 ti-tisdk-makefile: Makefile_sysfw-image: Add support for am62xx-evm

In reply to Aparna M

Add support for sysfw-image build for am62xx-evm.

---
 .../ti-tisdk-makefile/Makefile_sysfw-image                  | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile/Makefile_sysfw-image +4 -2
index 9a653769..08d80c35 100644
@@ -12,13 +12,15 @@ SYSFW_SOC_am65xx-evm = am65x
 SYSFW_SOC_am65xx-hs-evm = am65x
 SYSFW_SOC_am64xx-evm = am64x
 SYSFW_SOC_am64xx-hs-evm = am64x
-SYSFW_SOC_am62xx-evm = am62xx
+SYSFW_SOC_am62xx-evm = am62x
 SYSFW_SOC_j7-evm = j721e
 SYSFW_SOC_j7-hs-evm = j721e
 SYSFW_SOC = $(SYSFW_SOC_$(PLATFORM))
 
-SYSFW_PREFIX = ti-sci-firmware
+SYSFW_PREFIX_$(SYSFW_SOC) = ti-sci-firmware
 SYSFW_PREFIX_j7 = ti-fs-firmware
+SYSFW_PREFIX_am62x = ti-fs-firmware
+SYSFW_PREFIX = $(SYSFW_PREFIX_$(SYSFW_SOC))
 
 SYSFW_BASE = $(SYSFW_PREFIX)-$(SYSFW_SOC)-$(PLATFORM_TYPE)
 
Signature · 1 line
2.17.1
author
#5 lore raw

PATCH 5/5 ti-tisdk-makefile: Rename UBOOT_MACHINE for R5 for am62xx-evm

In reply to Aparna M

Rename UBOOT_MACHINE for R5 for am62xx-evm to am62x_evm_r5_config

---
 .../recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile_1.0.bb    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile_1.0.bb +1 -1
index 1cdd5345..471e2776 100644
@@ -374,7 +374,7 @@ K3_UBOOT_MACHINE_R5_j7-evm = "j721e_evm_r5_config"
 K3_UBOOT_MACHINE_R5_j7-hs-evm = "j721e_hs_evm_r5_config"
 K3_UBOOT_MACHINE_R5_j7200-evm = "j7200_evm_r5_config"
 K3_UBOOT_MACHINE_R5_j721s2-evm = "j721s2_evm_r5_config"
-K3_UBOOT_MACHINE_R5_am62xx-evm = "am62xx_evm_r5_config"
+K3_UBOOT_MACHINE_R5_am62xx-evm = "am62x_evm_r5_config"
 
 do_install_append_k3() {
     cat >> ${D}/Rules.make << __EOF__
Signature · 1 line
2.17.1
#6 lore raw

Re: [meta-arago][dunfell][PATCH 0/5] Add support in toplevel Makefile of

In reply to Aparna M

meta-arago / na / 20220513074923.28761-1-a-m1

PRC Results: FAIL

=========================================================
check-yocto-patches: PASS
=========================================================
Patches
----------------------------------------
All patches passed

=========================================================
apply-yocto-patch: FAIL
=========================================================
dunfell
=====================
Summary:
- Patch Series: [meta-arago][dunfell][PATCH 0/5] Add support in toplevel Makefile of SDK
- Submitter: From: Aparna M <[email protected]>
- Date: Date: Fri, 13 May 2022 13:19:18 +0530
- Num Patches: 5
- Mailing List (public inbox) Commit SHA: 48ec6f3a8af6719a4f2ee9e13522104ad2f314b5

Applied to:
- Repository: lcpd-prc-meta-arago
- Base Branch: dunfell
- Commit Author: Randolph Sapp <[email protected]>
- Commit Subject: meta-arago-distro: linux-firmware: remove cadence firmware
- Commit SHA: 86d19ced20934c8383c8a39f88d97c72e7e929ee

Patches
----------------------------------------
FAIL - [meta-arago][dunfell][PATCH 1/5] ti-tisdk-makefile: Makefile_u-boot-spl: Add support for u-boot-a53 build for am62xx-evm
error: patch failed: meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile/k3/Makefile_u-boot-spl:10
error: meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile/k3/Makefile_u-boot-spl: patch does not apply
Applying: ti-tisdk-makefile: Makefile_u-boot-spl: Add support for u-boot-a53 build for am62xx-evm Patch failed at 0001 ti-tisdk-makefile: Makefile_u-boot-spl: Add support for u-boot-a53 build for am62xx-evm