From 793e2df24b44b5f5e0cb07034a31e9fdbeb96edc Mon Sep 17 00:00:00 2001 From: Praneeth Bajjuri Date: Tue, 22 Feb 2022 04:14:13 +0000 Subject: Revert "ti-sci-fw: Fix for k3-image-gen issue for combined boot images" This reverts commit d29025f7e868bea6299b55caf78e684fc647be33. * associated fix in k3-image-gen is picked up now. commit 892c86501ff7 ("Makefile: Skip signing of binaries for HS combined boot") hence its no longer needed to carry the same fix from meta-ti here. Signed-off-by: Praneeth Bajjuri Signed-off-by: Ryan Eatmon Signed-off-by: Denys Dmytriyenko Signed-off-by: Ryan Eatmon --- ...ip-signing-of-binaries-for-combined-boot-.patch | 64 ---------------------- meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb | 5 -- 2 files changed, 69 deletions(-) delete mode 100644 meta-ti-bsp/recipes-bsp/ti-sci-fw/files/0001-Makefile-Skip-signing-of-binaries-for-combined-boot-.patch (limited to 'meta-ti-bsp/recipes-bsp/ti-sci-fw') diff --git a/meta-ti-bsp/recipes-bsp/ti-sci-fw/files/0001-Makefile-Skip-signing-of-binaries-for-combined-boot-.patch b/meta-ti-bsp/recipes-bsp/ti-sci-fw/files/0001-Makefile-Skip-signing-of-binaries-for-combined-boot-.patch deleted file mode 100644 index 196f3d3f..00000000 --- a/meta-ti-bsp/recipes-bsp/ti-sci-fw/files/0001-Makefile-Skip-signing-of-binaries-for-combined-boot-.patch +++ /dev/null @@ -1,64 +0,0 @@ -From 2efc79702a47f9cbbeecbb2f604577f1ec8c95ba Mon Sep 17 00:00:00 2001 -From: Yogesh Siraswar -Date: Wed, 8 Dec 2021 17:50:19 -0600 -Subject: [KIG PATCH] Makefile: Skip signing of binaries for combined boot hs - images - -Combined sysfw binaries used in tiboot.bin do not require signed images. -This fixes issues with AM64x HS and J7200 HS boot images - -Upstream-Status: Submitted -Signed-off-by: Yogesh Siraswar ---- - Makefile | 8 +++++++- - soc/am64x/Makefile | 1 + - soc/j7200/Makefile | 1 + - 3 files changed, 9 insertions(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index 47b3b20..ab465df 100644 ---- a/Makefile -+++ b/Makefile -@@ -215,8 +215,14 @@ $(soc_objroot)/%.o: %.c - $(CROSS_COMPILE)gcc $(CFLAGS) -c -o $@-pre-validated $< - python3 ./scripts/sysfw_boardcfg_validator.py -b $@-pre-validated -i -o $@ -s $(SOC) -l $@.log - --# On HS board configuration binaries must be signed -+# On HS board configuration binaries must be signed unless it is combined boot image - ifdef HS -+ifndef COMBINED_BOOT_IMAGE -+SIGN_BINARY=1 -+endif -+endif -+ -+ifdef SIGN_BINARY - %.bin.unsigned: %.o - $(CROSS_COMPILE)objcopy -S -O binary $< $@ - %.bin: %.bin.unsigned -diff --git a/soc/am64x/Makefile b/soc/am64x/Makefile -index bfbe3e5..33ebbd0 100644 ---- a/soc/am64x/Makefile -+++ b/soc/am64x/Makefile -@@ -31,6 +31,7 @@ - # - - SBL_LOADADDDR ?= 0x70000000 -+COMBINED_BOOT_IMAGE = 1 - COMBINED_SYSFW_BRDCFG_LOADADDR ?= 0x7b000 - LOADADDR ?= 0x44000 - SCIFS = sci -diff --git a/soc/j7200/Makefile b/soc/j7200/Makefile -index 3b754f7..0baef51 100644 ---- a/soc/j7200/Makefile -+++ b/soc/j7200/Makefile -@@ -31,6 +31,7 @@ - # - - SBL_LOADADDDR ?= 0x41c00000 -+COMBINED_BOOT_IMAGE = 1 - COMBINED_TIFS_BRDCFG_LOADADDR ?= 0x7f000 - COMBINED_DM_BRDCFG_LOADADDR ?= 0x41c80000 - LOADADDR ?= 0x40000 --- -2.17.1 - diff --git a/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb b/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb index dda47797..3d50b112 100644 --- a/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb +++ b/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb @@ -49,11 +49,6 @@ LD[unexport] = "1" do_configure[noexec] = "1" -SRC_URI:append:j7200-hs-evm-k3r5 = " \ - file://0001-Makefile-Skip-signing-of-binaries-for-combined-boot-.patch;patchdir=../imggen" -SRC_URI:append:am64xx-hs-evm-k3r5 = " \ - file://0001-Makefile-Skip-signing-of-binaries-for-combined-boot-.patch;patchdir=../imggen" - EXTRA_OEMAKE = "\ CROSS_COMPILE=${TARGET_PREFIX} SYSFW_DL_URL='' SYSFW_HS_DL_URL='' SYSFW_HS_INNER_CERT_DL_URL='' \ SYSFW_PATH="${SYSFW_TISCI}" SOC=${SYSFW_SOC} CONFIG=${SYSFW_CONFIG} \ -- cgit v1.2.3-54-g00ecf