On Thu, Dec 09, 2021 at 12:18:02PM +0000, Yogesh Siraswar via
lists.yoctoproject.org wrote:
> This is temporary fix for combined boot images for KIG in meta-ti till
> the patch is integrated.
>
> Upstream-Status: Submitted
Upstream-Status goes into the patch file itself, not the commit message - see
below.
> Signed-off-by: Yogesh Siraswar <yoge...@ti.com>
> ---
> ...gning-of-binaries-for-combined-boot-.patch | 63 +++++++++++++++++++
> recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb | 5 ++
> 2 files changed, 68 insertions(+)
> create mode 100644
> recipes-bsp/ti-sci-fw/files/0001-Makefile-Skip-signing-of-binaries-for-combined-boot-.patch
>
> diff --git
> a/recipes-bsp/ti-sci-fw/files/0001-Makefile-Skip-signing-of-binaries-for-combined-boot-.patch
>
> b/recipes-bsp/ti-sci-fw/files/0001-Makefile-Skip-signing-of-binaries-for-combined-boot-.patch
> new file mode 100644
> index 00000000..93b0c325
> --- /dev/null
> +++
> b/recipes-bsp/ti-sci-fw/files/0001-Makefile-Skip-signing-of-binaries-for-combined-boot-.patch
> @@ -0,0 +1,63 @@
> +From 2efc79702a47f9cbbeecbb2f604577f1ec8c95ba Mon Sep 17 00:00:00 2001
> +From: Yogesh Siraswar <yoge...@ti.com>
> +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 goes here.
> +Signed-off-by: Yogesh Siraswar <yoge...@ti.com>
> +---
> + 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/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb
> b/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb
> index 6d48bf23..13ae1f6b 100644
> --- a/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb
> +++ b/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb
> @@ -47,6 +47,11 @@ 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} \
> --
> 2.17.1
>
>
>
>
--
Regards,
Denys Dmytriyenko <de...@denix.org>
PGP: 0x420902729A92C964 - https://denix.org/0x420902729A92C964
Fingerprint: 25FC E4A5 8A72 2F69 1186 6D76 4209 0272 9A92 C964
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#14271):
https://lists.yoctoproject.org/g/meta-ti/message/14271
Mute This Topic: https://lists.yoctoproject.org/mt/87610509/21656
Group Owner: meta-ti+ow...@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/meta-ti/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
