Re: [meta-ti][dunfell][PATCH] linux-ti-staging: block sa2ul for am64x hs and j7200 hs device
On Fri, Dec 10, 2021 at 02:56:24AM +, Yogesh Siraswar via
lists.yoctoproject.org wrote:
> SA2UL GP driver will not work for HS. Need SA2UL HS driver.
> Till it is implemented blacklist sa2ul for am64xx hs and j7200 hs
>
> Change Suggested by: Denys Dmytriyenko
BTW, there's a standard Suggested-by: tag...
> Signed-off-by: Yogesh Siraswar
Reviewed-by: Denys Dmytriyenko
> ---
> recipes-kernel/linux/linux-ti-staging_5.10.bb | 8 +++-
> 1 file changed, 7 insertions(+), 1 deletion(-)
>
> diff --git a/recipes-kernel/linux/linux-ti-staging_5.10.bb
> b/recipes-kernel/linux/linux-ti-staging_5.10.bb
> index 9fd9506e..3f3d50af 100644
> --- a/recipes-kernel/linux/linux-ti-staging_5.10.bb
> +++ b/recipes-kernel/linux/linux-ti-staging_5.10.bb
> @@ -27,7 +27,7 @@ SRCREV = "dcc6bedb2c2bdb509709e4ae08303206e95ce6c2"
> PV = "5.10.65+git${SRCPV}"
>
> # Append to the MACHINE_KERNEL_PR so that a new SRCREV will cause a rebuild
> -MACHINE_KERNEL_PR_append = "a"
> +MACHINE_KERNEL_PR_append = "b"
> PR = "${MACHINE_KERNEL_PR}"
>
> KERNEL_GIT_URI = "git://git.ti.com/ti-linux-kernel/ti-linux-kernel.git"
> @@ -43,3 +43,9 @@ module_conf_ti_k3_r5_remoteproc = "softdep
> ti_k3_r5_remoteproc pre: virtio_rpmsg
> module_conf_ti_k3_dsp_remoteproc = "softdep ti_k3_dsp_remoteproc pre:
> virtio_rpmsg_bus"
> KERNEL_MODULE_PROBECONF += "rpmsg_client_sample ti_k3_r5_remoteproc
> ti_k3_dsp_remoteproc"
> KERNEL_MODULE_AUTOLOAD_append_j7 = " rpmsg_kdrv_switch"
> +
> +# Disable SA2UL for AM64x HS and J7200 HS
> +module_conf_sa2ul_am64xx-hs-evm = "blacklist sa2ul"
> +KERNEL_MODULE_PROBECONF_append_am64xx-hs-evm = " sa2ul"
> +module_conf_sa2ul_j7200-hs-evm = "blacklist sa2ul"
> +KERNEL_MODULE_PROBECONF_append_j7200-hs-evm = " sa2ul"
> --
> 2.17.1
>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#14284):
https://lists.yoctoproject.org/g/meta-ti/message/14284
Mute This Topic: https://lists.yoctoproject.org/mt/87628580/21656
Group Owner: meta-ti+ow...@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/meta-ti/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[meta-ti][dunfell][PATCH] linux-ti-staging: block sa2ul for am64x hs and j7200 hs device
SA2UL GP driver will not work for HS. Need SA2UL HS driver.
Till it is implemented blacklist sa2ul for am64xx hs and j7200 hs
Change Suggested by: Denys Dmytriyenko
Signed-off-by: Yogesh Siraswar
---
recipes-kernel/linux/linux-ti-staging_5.10.bb | 8 +++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/recipes-kernel/linux/linux-ti-staging_5.10.bb
b/recipes-kernel/linux/linux-ti-staging_5.10.bb
index 9fd9506e..3f3d50af 100644
--- a/recipes-kernel/linux/linux-ti-staging_5.10.bb
+++ b/recipes-kernel/linux/linux-ti-staging_5.10.bb
@@ -27,7 +27,7 @@ SRCREV = "dcc6bedb2c2bdb509709e4ae08303206e95ce6c2"
PV = "5.10.65+git${SRCPV}"
# Append to the MACHINE_KERNEL_PR so that a new SRCREV will cause a rebuild
-MACHINE_KERNEL_PR_append = "a"
+MACHINE_KERNEL_PR_append = "b"
PR = "${MACHINE_KERNEL_PR}"
KERNEL_GIT_URI = "git://git.ti.com/ti-linux-kernel/ti-linux-kernel.git"
@@ -43,3 +43,9 @@ module_conf_ti_k3_r5_remoteproc = "softdep
ti_k3_r5_remoteproc pre: virtio_rpmsg
module_conf_ti_k3_dsp_remoteproc = "softdep ti_k3_dsp_remoteproc pre:
virtio_rpmsg_bus"
KERNEL_MODULE_PROBECONF += "rpmsg_client_sample ti_k3_r5_remoteproc
ti_k3_dsp_remoteproc"
KERNEL_MODULE_AUTOLOAD_append_j7 = " rpmsg_kdrv_switch"
+
+# Disable SA2UL for AM64x HS and J7200 HS
+module_conf_sa2ul_am64xx-hs-evm = "blacklist sa2ul"
+KERNEL_MODULE_PROBECONF_append_am64xx-hs-evm = " sa2ul"
+module_conf_sa2ul_j7200-hs-evm = "blacklist sa2ul"
+KERNEL_MODULE_PROBECONF_append_j7200-hs-evm = " sa2ul"
--
2.17.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#14283):
https://lists.yoctoproject.org/g/meta-ti/message/14283
Mute This Topic: https://lists.yoctoproject.org/mt/87628580/21656
Group Owner: meta-ti+ow...@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/meta-ti/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [meta-ti] [dunfell/master PATCHv2] ti-sci-fw: Fix for k3-image-gen issue for combined boot images
On 12/9/2021 12:23 PM, Vignesh Raghavendra wrote:
On 12/9/21 11:37 PM, praneeth via lists.yoctoproject.org wrote:
[...]
@@ -0,0 +1,64 @@
+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
No need to introduce COMBINED_BOOT_IMAGE or SIGN_BINARY.
Use COMBINED_SYSFW_BRDCFG_LOADADDR like rest of Makefile does:
I had done that before I realized that J7200 doesn't use
COMBINED_SYSFW_BRDCFG_LOADADDR. So now instead of checking multiple
COMBINED variables I just cleaned it up for simplicity.
Entire patch can be replaced with below diff:
diff --git a/Makefile b/Makefile
index 47b3b20..18e9eb5 100644
--- a/Makefile
+++ b/Makefile
@@ -217,10 +217,12 @@ $(soc_objroot)/%.o: %.c
# On HS board configuration binaries must be signed
ifdef HS
+ifneq (,$(COMBINED_SYSFW_BRDCFG_LOADADDR))
%.bin.unsigned: %.o
$(CROSS_COMPILE)objcopy -S -O binary $< $@
%.bin: %.bin.unsigned
$(TI_SECURE_DEV_PKG)/scripts/secure-binary-image.sh $< $@
+endif
else
%.bin: %.o
$(CROSS_COMPILE)objcopy -S -O binary $< $@
++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 ?= 0x7000
++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 ?= 0x41c0
++COMBINED_BOOT_IMAGE = 1
+ COMBINED_TIFS_BRDCFG_LOADADDR ?= 0x7f000
+ COMBINED_DM_BRDCFG_LOADADDR ?= 0x41c8
+ LOADADDR ?= 0x4
+--
+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} \
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#14282):
https://lists.yoctoproject.org/g/meta-ti/message/14282
Mute This Topic: https://lists.yoctoproject.org/mt/87617657/21656
Group Owner: meta-ti+ow...@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/meta-ti/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[meta-ti][master/dunfell][PATCH] conf: j7200-hs: fix the wrong machine configuration included
j7-evm instead of j7200-evm was included causing boot failure Signed-off-by: Yogesh Siraswar --- conf/machine/j7200-hs-evm.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/machine/j7200-hs-evm.conf b/conf/machine/j7200-hs-evm.conf index c55be005..a5bd637e 100644 --- a/conf/machine/j7200-hs-evm.conf +++ b/conf/machine/j7200-hs-evm.conf @@ -2,7 +2,7 @@ #@NAME: J7200 HS EVM #@DESCRIPTION: Machine configuration for the TI J7200 HS EVM -require conf/machine/j7-evm.conf +require conf/machine/j7200-evm.conf UBOOT_MACHINE = "j7200_hs_evm_a72_defconfig" -- 2.17.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#14281): https://lists.yoctoproject.org/g/meta-ti/message/14281 Mute This Topic: https://lists.yoctoproject.org/mt/87626790/21656 Group Owner: meta-ti+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/meta-ti/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [meta-ti] [PATCH v2] ti-sgx-ddk-km: Fix build with kernel 5.10 and musl support
On Thu, Dec 09, 2021 at 04:25:22PM -0800, Khem Raj wrote: > This adds a patch to fix runtime problems loading the kernel module with > kernel 5.10 > > Adds support to build with musl targets > > Add yoe to recognised OE distributions > > Signed-off-by: Khem Raj > Cc: Denys Dmytriyenko Reviewed-by: Denys Dmytriyenko > --- > v2: Add upstream status to patches Thanks! Although I wonder if the first patch should be treated as "Inappropriate [OE-specific]", as it was there for few years already and does actually add support for OE-specific toolchains... > ...mbedded-hardfp-toolchain-w-o-gnueabi.patch | 20 + > ...02-Fix-driver-config-for-5.10-kernel.patch | 29 +++ > .../ti-sgx-ddk-km_1.17.4948957.bb | 1 + > .../libgles/ti-sgx-ddk-um_1.17.4948957.bb | 1 + > 4 files changed, 46 insertions(+), 5 deletions(-) > create mode 100644 > recipes-bsp/powervr-drivers/ti-sgx-ddk-km/0002-Fix-driver-config-for-5.10-kernel.patch > > diff --git > a/recipes-bsp/powervr-drivers/ti-sgx-ddk-km/0001-km-support-OpenEmbedded-hardfp-toolchain-w-o-gnueabi.patch > > b/recipes-bsp/powervr-drivers/ti-sgx-ddk-km/0001-km-support-OpenEmbedded-hardfp-toolchain-w-o-gnueabi.patch > index 15105eac..4f71ea9d 100644 > --- > a/recipes-bsp/powervr-drivers/ti-sgx-ddk-km/0001-km-support-OpenEmbedded-hardfp-toolchain-w-o-gnueabi.patch > +++ > b/recipes-bsp/powervr-drivers/ti-sgx-ddk-km/0001-km-support-OpenEmbedded-hardfp-toolchain-w-o-gnueabi.patch > @@ -1,23 +1,33 @@ > -From 755632b4f3a40996a12bc7816a9839af7112040a Mon Sep 17 00:00:00 2001 > +From a1c191a020f6eebc9a94b641be1fca7885fc9dd2 Mon Sep 17 00:00:00 2001 > From: Denys Dmytriyenko > Date: Mon, 9 Sep 2019 17:05:48 -0400 > -Subject: [PATCH] km: support OpenEmbedded hardfp toolchain w/o -gnueabihf > +Subject: [PATCH 1/2] km: support OpenEmbedded hardfp toolchain w/o -gnueabihf > suffix > > +OE toolchains are not having armhf in its name but they still are armhf > +ABI, teach this to sgx module build system > + > +recognize musleabi in tuples as well > + > +Add yoe distro support > + > +Upstream-Status: Pending > + > Signed-off-by: Denys Dmytriyenko > +Signed-off-by: Khem Raj > --- > eurasia_km/eurasiacon/build/linux2/config/compiler.mk | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/eurasia_km/eurasiacon/build/linux2/config/compiler.mk > b/eurasia_km/eurasiacon/build/linux2/config/compiler.mk > -index dead2f9..2ba3e5e 100644 > +index dead2f9..1b5f090 100644 > --- a/eurasia_km/eurasiacon/build/linux2/config/compiler.mk > +++ b/eurasia_km/eurasiacon/build/linux2/config/compiler.mk > @@ -68,12 +68,12 @@ define calculate-compiler-preferred-target > ifneq ($$(filter aarch64-%,$$($(1)_compiler_preferred_target)),) > $(1)_compiler_preferred_target := aarch64-linux-gnu > endif > -+ ifneq ($$(filter arm-%-gnueabihf arm-oe-linux-gnueabi > arm-poky-linux-gnueabi,$$($(1)_compiler_preferred_target)),) > ++ ifneq ($$(filter arm-%-gnueabihf arm-oe-linux-gnueabi > arm-poky-linux-gnueabi arm-yoe-linux-gnueabi arm-oe-linux-musleabi > arm-poky-linux-musleabi > arm-yoe-linux-musleabi,$$($(1)_compiler_preferred_target)),) > + $(1)_compiler_preferred_target := arm-linux-gnueabihf > + endif > ifneq ($$(filter arm-%-gnueabi armv7a-cros-linux-gnueabi > armv7hl-redhat-linux-gnueabi,$$($(1)_compiler_preferred_target)),) > @@ -30,5 +40,5 @@ index dead2f9..2ba3e5e 100644 > endef > > -- > -2.7.4 > +2.34.1 > > diff --git > a/recipes-bsp/powervr-drivers/ti-sgx-ddk-km/0002-Fix-driver-config-for-5.10-kernel.patch > > b/recipes-bsp/powervr-drivers/ti-sgx-ddk-km/0002-Fix-driver-config-for-5.10-kernel.patch > new file mode 100644 > index ..1f097909 > --- /dev/null > +++ > b/recipes-bsp/powervr-drivers/ti-sgx-ddk-km/0002-Fix-driver-config-for-5.10-kernel.patch > @@ -0,0 +1,29 @@ > +From 57c3aafacde126786077afa7bfc07ec261acffaf Mon Sep 17 00:00:00 2001 > +From: Paul Barker > +Date: Wed, 27 Oct 2021 10:34:32 +0100 > +Subject: [PATCH 2/2] Fix driver config for 5.10 kernel > + > +See https://github.com/openpvrsgx-devgroup/linux_openpvrsgx/issues/3. > + > +Upstream-Status: Pending > +Ref: BSP-66 > +Signed-off-by: Paul Barker > +--- > + eurasia_km/eurasiacon/build/linux2/config/core.mk | 1 + > + 1 file changed, 1 insertion(+) > + > +diff --git a/eurasia_km/eurasiacon/build/linux2/config/core.mk > b/eurasia_km/eurasiacon/build/linux2/config/core.mk > +index 3f27926..18d515a 100644 > +--- a/eurasia_km/eurasiacon/build/linux2/config/core.mk > b/eurasia_km/eurasiacon/build/linux2/config/core.mk > +@@ -590,6 +590,7 @@ ifneq ($(BUFFERCLASS_MODULE),) > + $(eval $(call BothConfigMake,BUFFERCLASS_MODULE,$(BUFFERCLASS_MODULE))) > + endif > + > ++PVR_LINUX_MEM_AREA_USE_VMAP = 1 > + ifneq ($(strip $(KERNELDIR)),) > + PVR_LINUX_MEM_AREA_POOL_MAX_PAGES ?= 0 > + ifneq ($(PVR_LINUX_MEM_AREA_POOL_MAX_PAGES),0) > +-- > +2.34.1 > + > diff --git a/recipes-bsp/powervr-drivers/ti-sg
[meta-ti] [PATCH v2] ti-sgx-ddk-km: Fix build with kernel 5.10 and musl support
This adds a patch to fix runtime problems loading the kernel module with
kernel 5.10
Adds support to build with musl targets
Add yoe to recognised OE distributions
Signed-off-by: Khem Raj
Cc: Denys Dmytriyenko
---
v2: Add upstream status to patches
...mbedded-hardfp-toolchain-w-o-gnueabi.patch | 20 +
...02-Fix-driver-config-for-5.10-kernel.patch | 29 +++
.../ti-sgx-ddk-km_1.17.4948957.bb | 1 +
.../libgles/ti-sgx-ddk-um_1.17.4948957.bb | 1 +
4 files changed, 46 insertions(+), 5 deletions(-)
create mode 100644
recipes-bsp/powervr-drivers/ti-sgx-ddk-km/0002-Fix-driver-config-for-5.10-kernel.patch
diff --git
a/recipes-bsp/powervr-drivers/ti-sgx-ddk-km/0001-km-support-OpenEmbedded-hardfp-toolchain-w-o-gnueabi.patch
b/recipes-bsp/powervr-drivers/ti-sgx-ddk-km/0001-km-support-OpenEmbedded-hardfp-toolchain-w-o-gnueabi.patch
index 15105eac..4f71ea9d 100644
---
a/recipes-bsp/powervr-drivers/ti-sgx-ddk-km/0001-km-support-OpenEmbedded-hardfp-toolchain-w-o-gnueabi.patch
+++
b/recipes-bsp/powervr-drivers/ti-sgx-ddk-km/0001-km-support-OpenEmbedded-hardfp-toolchain-w-o-gnueabi.patch
@@ -1,23 +1,33 @@
-From 755632b4f3a40996a12bc7816a9839af7112040a Mon Sep 17 00:00:00 2001
+From a1c191a020f6eebc9a94b641be1fca7885fc9dd2 Mon Sep 17 00:00:00 2001
From: Denys Dmytriyenko
Date: Mon, 9 Sep 2019 17:05:48 -0400
-Subject: [PATCH] km: support OpenEmbedded hardfp toolchain w/o -gnueabihf
+Subject: [PATCH 1/2] km: support OpenEmbedded hardfp toolchain w/o -gnueabihf
suffix
+OE toolchains are not having armhf in its name but they still are armhf
+ABI, teach this to sgx module build system
+
+recognize musleabi in tuples as well
+
+Add yoe distro support
+
+Upstream-Status: Pending
+
Signed-off-by: Denys Dmytriyenko
+Signed-off-by: Khem Raj
---
eurasia_km/eurasiacon/build/linux2/config/compiler.mk | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/eurasia_km/eurasiacon/build/linux2/config/compiler.mk
b/eurasia_km/eurasiacon/build/linux2/config/compiler.mk
-index dead2f9..2ba3e5e 100644
+index dead2f9..1b5f090 100644
--- a/eurasia_km/eurasiacon/build/linux2/config/compiler.mk
+++ b/eurasia_km/eurasiacon/build/linux2/config/compiler.mk
@@ -68,12 +68,12 @@ define calculate-compiler-preferred-target
ifneq ($$(filter aarch64-%,$$($(1)_compiler_preferred_target)),)
$(1)_compiler_preferred_target := aarch64-linux-gnu
endif
-+ ifneq ($$(filter arm-%-gnueabihf arm-oe-linux-gnueabi
arm-poky-linux-gnueabi,$$($(1)_compiler_preferred_target)),)
++ ifneq ($$(filter arm-%-gnueabihf arm-oe-linux-gnueabi
arm-poky-linux-gnueabi arm-yoe-linux-gnueabi arm-oe-linux-musleabi
arm-poky-linux-musleabi
arm-yoe-linux-musleabi,$$($(1)_compiler_preferred_target)),)
+ $(1)_compiler_preferred_target := arm-linux-gnueabihf
+ endif
ifneq ($$(filter arm-%-gnueabi armv7a-cros-linux-gnueabi
armv7hl-redhat-linux-gnueabi,$$($(1)_compiler_preferred_target)),)
@@ -30,5 +40,5 @@ index dead2f9..2ba3e5e 100644
endef
--
-2.7.4
+2.34.1
diff --git
a/recipes-bsp/powervr-drivers/ti-sgx-ddk-km/0002-Fix-driver-config-for-5.10-kernel.patch
b/recipes-bsp/powervr-drivers/ti-sgx-ddk-km/0002-Fix-driver-config-for-5.10-kernel.patch
new file mode 100644
index ..1f097909
--- /dev/null
+++
b/recipes-bsp/powervr-drivers/ti-sgx-ddk-km/0002-Fix-driver-config-for-5.10-kernel.patch
@@ -0,0 +1,29 @@
+From 57c3aafacde126786077afa7bfc07ec261acffaf Mon Sep 17 00:00:00 2001
+From: Paul Barker
+Date: Wed, 27 Oct 2021 10:34:32 +0100
+Subject: [PATCH 2/2] Fix driver config for 5.10 kernel
+
+See https://github.com/openpvrsgx-devgroup/linux_openpvrsgx/issues/3.
+
+Upstream-Status: Pending
+Ref: BSP-66
+Signed-off-by: Paul Barker
+---
+ eurasia_km/eurasiacon/build/linux2/config/core.mk | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/eurasia_km/eurasiacon/build/linux2/config/core.mk
b/eurasia_km/eurasiacon/build/linux2/config/core.mk
+index 3f27926..18d515a 100644
+--- a/eurasia_km/eurasiacon/build/linux2/config/core.mk
b/eurasia_km/eurasiacon/build/linux2/config/core.mk
+@@ -590,6 +590,7 @@ ifneq ($(BUFFERCLASS_MODULE),)
+ $(eval $(call BothConfigMake,BUFFERCLASS_MODULE,$(BUFFERCLASS_MODULE)))
+ endif
+
++PVR_LINUX_MEM_AREA_USE_VMAP = 1
+ ifneq ($(strip $(KERNELDIR)),)
+ PVR_LINUX_MEM_AREA_POOL_MAX_PAGES ?= 0
+ ifneq ($(PVR_LINUX_MEM_AREA_POOL_MAX_PAGES),0)
+--
+2.34.1
+
diff --git a/recipes-bsp/powervr-drivers/ti-sgx-ddk-km_1.17.4948957.bb
b/recipes-bsp/powervr-drivers/ti-sgx-ddk-km_1.17.4948957.bb
index 3848e84e..e6247e08 100644
--- a/recipes-bsp/powervr-drivers/ti-sgx-ddk-km_1.17.4948957.bb
+++ b/recipes-bsp/powervr-drivers/ti-sgx-ddk-km_1.17.4948957.bb
@@ -22,6 +22,7 @@ BRANCH = "ti-img-sgx/${PV}/k5.10"
SRC_URI =
"git://git.ti.com/graphics/omap5-sgx-ddk-linux.git;protocol=git;branch=${BRANCH}
\
file://0001-km-support-OpenEmbedded-hardfp-toolchain-w-o-gnueabi.patch \
+file://0002-Fix-driver-config-for-5.10-kernel.patch \
Re: [meta-ti] [PATCH] ti-sgx-ddk-km: Fix build with kernel 5.10 and musl support
On Thu, Dec 9, 2021 at 2:34 PM Denys Dmytriyenko wrote: > > On Thu, Dec 09, 2021 at 10:48:42AM -0800, Khem Raj wrote: > > This adds a patch to fix runtime problems loading the kernel module with > > kernel 5.10 > > > > Adds support to build with musl targets > > > > Add yoe to recognised OE distributions > > Looks good to me. Should the patch have Upstream-Status? Not sure if it should > be "Pending" or something else though... Perhaps makes sense, I can spin a v2 with status 'Pending' > > > > Signed-off-by: Khem Raj > > Cc: Denys Dmytriyenko > > Reviewed-by: Denys Dmytriyenko > > > > --- > > ...mbedded-hardfp-toolchain-w-o-gnueabi.patch | 18 > > ...02-Fix-driver-config-for-5.10-kernel.patch | 28 +++ > > .../ti-sgx-ddk-km_1.17.4948957.bb | 1 + > > 3 files changed, 42 insertions(+), 5 deletions(-) > > create mode 100644 > > recipes-bsp/powervr-drivers/ti-sgx-ddk-km/0002-Fix-driver-config-for-5.10-kernel.patch > > > > diff --git > > a/recipes-bsp/powervr-drivers/ti-sgx-ddk-km/0001-km-support-OpenEmbedded-hardfp-toolchain-w-o-gnueabi.patch > > > > b/recipes-bsp/powervr-drivers/ti-sgx-ddk-km/0001-km-support-OpenEmbedded-hardfp-toolchain-w-o-gnueabi.patch > > index 15105eac..d58764fe 100644 > > --- > > a/recipes-bsp/powervr-drivers/ti-sgx-ddk-km/0001-km-support-OpenEmbedded-hardfp-toolchain-w-o-gnueabi.patch > > +++ > > b/recipes-bsp/powervr-drivers/ti-sgx-ddk-km/0001-km-support-OpenEmbedded-hardfp-toolchain-w-o-gnueabi.patch > > @@ -1,23 +1,31 @@ > > -From 755632b4f3a40996a12bc7816a9839af7112040a Mon Sep 17 00:00:00 2001 > > +From a1c191a020f6eebc9a94b641be1fca7885fc9dd2 Mon Sep 17 00:00:00 2001 > > From: Denys Dmytriyenko > > Date: Mon, 9 Sep 2019 17:05:48 -0400 > > -Subject: [PATCH] km: support OpenEmbedded hardfp toolchain w/o -gnueabihf > > +Subject: [PATCH 1/2] km: support OpenEmbedded hardfp toolchain w/o > > -gnueabihf > > suffix > > > > +OE toolchains are not having armhf in its name but they still are armhf > > +ABI, teach this to sgx module build system > > + > > +recognize musleabi in tuples as well > > + > > +Add yoe distro support > > + > > Signed-off-by: Denys Dmytriyenko > > +Signed-off-by: Khem Raj > > --- > > eurasia_km/eurasiacon/build/linux2/config/compiler.mk | 6 +++--- > > 1 file changed, 3 insertions(+), 3 deletions(-) > > > > diff --git a/eurasia_km/eurasiacon/build/linux2/config/compiler.mk > > b/eurasia_km/eurasiacon/build/linux2/config/compiler.mk > > -index dead2f9..2ba3e5e 100644 > > +index dead2f9..1b5f090 100644 > > --- a/eurasia_km/eurasiacon/build/linux2/config/compiler.mk > > +++ b/eurasia_km/eurasiacon/build/linux2/config/compiler.mk > > @@ -68,12 +68,12 @@ define calculate-compiler-preferred-target > > ifneq ($$(filter aarch64-%,$$($(1)_compiler_preferred_target)),) > > $(1)_compiler_preferred_target := aarch64-linux-gnu > > endif > > -+ ifneq ($$(filter arm-%-gnueabihf arm-oe-linux-gnueabi > > arm-poky-linux-gnueabi,$$($(1)_compiler_preferred_target)),) > > ++ ifneq ($$(filter arm-%-gnueabihf arm-oe-linux-gnueabi > > arm-poky-linux-gnueabi arm-yoe-linux-gnueabi arm-oe-linux-musleabi > > arm-poky-linux-musleabi > > arm-yoe-linux-musleabi,$$($(1)_compiler_preferred_target)),) > > + $(1)_compiler_preferred_target := arm-linux-gnueabihf > > + endif > > ifneq ($$(filter arm-%-gnueabi armv7a-cros-linux-gnueabi > > armv7hl-redhat-linux-gnueabi,$$($(1)_compiler_preferred_target)),) > > @@ -30,5 +38,5 @@ index dead2f9..2ba3e5e 100644 > > endef > > > > -- > > -2.7.4 > > +2.34.1 > > > > diff --git > > a/recipes-bsp/powervr-drivers/ti-sgx-ddk-km/0002-Fix-driver-config-for-5.10-kernel.patch > > > > b/recipes-bsp/powervr-drivers/ti-sgx-ddk-km/0002-Fix-driver-config-for-5.10-kernel.patch > > new file mode 100644 > > index ..d9745703 > > --- /dev/null > > +++ > > b/recipes-bsp/powervr-drivers/ti-sgx-ddk-km/0002-Fix-driver-config-for-5.10-kernel.patch > > @@ -0,0 +1,28 @@ > > +From 57c3aafacde126786077afa7bfc07ec261acffaf Mon Sep 17 00:00:00 2001 > > +From: Paul Barker > > +Date: Wed, 27 Oct 2021 10:34:32 +0100 > > +Subject: [PATCH 2/2] Fix driver config for 5.10 kernel > > + > > +See https://github.com/openpvrsgx-devgroup/linux_openpvrsgx/issues/3. > > + > > +Ref: BSP-66 > > +Signed-off-by: Paul Barker > > +--- > > + eurasia_km/eurasiacon/build/linux2/config/core.mk | 1 + > > + 1 file changed, 1 insertion(+) > > + > > +diff --git a/eurasia_km/eurasiacon/build/linux2/config/core.mk > > b/eurasia_km/eurasiacon/build/linux2/config/core.mk > > +index 3f27926..18d515a 100644 > > +--- a/eurasia_km/eurasiacon/build/linux2/config/core.mk > > b/eurasia_km/eurasiacon/build/linux2/config/core.mk > > +@@ -590,6 +590,7 @@ ifneq ($(BUFFERCLASS_MODULE),) > > + $(eval $(call BothConfigMake,BUFFERCLASS_MODULE,$(BUFFERCLASS_MODULE))) > > + endif > > + > > ++PVR_LINUX_MEM_AREA_USE_VMAP = 1 > > + ifneq ($(strip $(KERNELDIR)),) > > + PVR_LINUX_MEM_AREA_POOL_MAX_PAGES ?= 0 > > + ifneq
Re: [meta-ti] [PATCH] ti-sgx-ddk-km: Fix build with kernel 5.10 and musl support
On Thu, Dec 09, 2021 at 10:48:42AM -0800, Khem Raj wrote: > This adds a patch to fix runtime problems loading the kernel module with > kernel 5.10 > > Adds support to build with musl targets > > Add yoe to recognised OE distributions Looks good to me. Should the patch have Upstream-Status? Not sure if it should be "Pending" or something else though... > Signed-off-by: Khem Raj > Cc: Denys Dmytriyenko Reviewed-by: Denys Dmytriyenko > --- > ...mbedded-hardfp-toolchain-w-o-gnueabi.patch | 18 > ...02-Fix-driver-config-for-5.10-kernel.patch | 28 +++ > .../ti-sgx-ddk-km_1.17.4948957.bb | 1 + > 3 files changed, 42 insertions(+), 5 deletions(-) > create mode 100644 > recipes-bsp/powervr-drivers/ti-sgx-ddk-km/0002-Fix-driver-config-for-5.10-kernel.patch > > diff --git > a/recipes-bsp/powervr-drivers/ti-sgx-ddk-km/0001-km-support-OpenEmbedded-hardfp-toolchain-w-o-gnueabi.patch > > b/recipes-bsp/powervr-drivers/ti-sgx-ddk-km/0001-km-support-OpenEmbedded-hardfp-toolchain-w-o-gnueabi.patch > index 15105eac..d58764fe 100644 > --- > a/recipes-bsp/powervr-drivers/ti-sgx-ddk-km/0001-km-support-OpenEmbedded-hardfp-toolchain-w-o-gnueabi.patch > +++ > b/recipes-bsp/powervr-drivers/ti-sgx-ddk-km/0001-km-support-OpenEmbedded-hardfp-toolchain-w-o-gnueabi.patch > @@ -1,23 +1,31 @@ > -From 755632b4f3a40996a12bc7816a9839af7112040a Mon Sep 17 00:00:00 2001 > +From a1c191a020f6eebc9a94b641be1fca7885fc9dd2 Mon Sep 17 00:00:00 2001 > From: Denys Dmytriyenko > Date: Mon, 9 Sep 2019 17:05:48 -0400 > -Subject: [PATCH] km: support OpenEmbedded hardfp toolchain w/o -gnueabihf > +Subject: [PATCH 1/2] km: support OpenEmbedded hardfp toolchain w/o -gnueabihf > suffix > > +OE toolchains are not having armhf in its name but they still are armhf > +ABI, teach this to sgx module build system > + > +recognize musleabi in tuples as well > + > +Add yoe distro support > + > Signed-off-by: Denys Dmytriyenko > +Signed-off-by: Khem Raj > --- > eurasia_km/eurasiacon/build/linux2/config/compiler.mk | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/eurasia_km/eurasiacon/build/linux2/config/compiler.mk > b/eurasia_km/eurasiacon/build/linux2/config/compiler.mk > -index dead2f9..2ba3e5e 100644 > +index dead2f9..1b5f090 100644 > --- a/eurasia_km/eurasiacon/build/linux2/config/compiler.mk > +++ b/eurasia_km/eurasiacon/build/linux2/config/compiler.mk > @@ -68,12 +68,12 @@ define calculate-compiler-preferred-target > ifneq ($$(filter aarch64-%,$$($(1)_compiler_preferred_target)),) > $(1)_compiler_preferred_target := aarch64-linux-gnu > endif > -+ ifneq ($$(filter arm-%-gnueabihf arm-oe-linux-gnueabi > arm-poky-linux-gnueabi,$$($(1)_compiler_preferred_target)),) > ++ ifneq ($$(filter arm-%-gnueabihf arm-oe-linux-gnueabi > arm-poky-linux-gnueabi arm-yoe-linux-gnueabi arm-oe-linux-musleabi > arm-poky-linux-musleabi > arm-yoe-linux-musleabi,$$($(1)_compiler_preferred_target)),) > + $(1)_compiler_preferred_target := arm-linux-gnueabihf > + endif > ifneq ($$(filter arm-%-gnueabi armv7a-cros-linux-gnueabi > armv7hl-redhat-linux-gnueabi,$$($(1)_compiler_preferred_target)),) > @@ -30,5 +38,5 @@ index dead2f9..2ba3e5e 100644 > endef > > -- > -2.7.4 > +2.34.1 > > diff --git > a/recipes-bsp/powervr-drivers/ti-sgx-ddk-km/0002-Fix-driver-config-for-5.10-kernel.patch > > b/recipes-bsp/powervr-drivers/ti-sgx-ddk-km/0002-Fix-driver-config-for-5.10-kernel.patch > new file mode 100644 > index ..d9745703 > --- /dev/null > +++ > b/recipes-bsp/powervr-drivers/ti-sgx-ddk-km/0002-Fix-driver-config-for-5.10-kernel.patch > @@ -0,0 +1,28 @@ > +From 57c3aafacde126786077afa7bfc07ec261acffaf Mon Sep 17 00:00:00 2001 > +From: Paul Barker > +Date: Wed, 27 Oct 2021 10:34:32 +0100 > +Subject: [PATCH 2/2] Fix driver config for 5.10 kernel > + > +See https://github.com/openpvrsgx-devgroup/linux_openpvrsgx/issues/3. > + > +Ref: BSP-66 > +Signed-off-by: Paul Barker > +--- > + eurasia_km/eurasiacon/build/linux2/config/core.mk | 1 + > + 1 file changed, 1 insertion(+) > + > +diff --git a/eurasia_km/eurasiacon/build/linux2/config/core.mk > b/eurasia_km/eurasiacon/build/linux2/config/core.mk > +index 3f27926..18d515a 100644 > +--- a/eurasia_km/eurasiacon/build/linux2/config/core.mk > b/eurasia_km/eurasiacon/build/linux2/config/core.mk > +@@ -590,6 +590,7 @@ ifneq ($(BUFFERCLASS_MODULE),) > + $(eval $(call BothConfigMake,BUFFERCLASS_MODULE,$(BUFFERCLASS_MODULE))) > + endif > + > ++PVR_LINUX_MEM_AREA_USE_VMAP = 1 > + ifneq ($(strip $(KERNELDIR)),) > + PVR_LINUX_MEM_AREA_POOL_MAX_PAGES ?= 0 > + ifneq ($(PVR_LINUX_MEM_AREA_POOL_MAX_PAGES),0) > +-- > +2.34.1 > + > diff --git a/recipes-bsp/powervr-drivers/ti-sgx-ddk-km_1.17.4948957.bb > b/recipes-bsp/powervr-drivers/ti-sgx-ddk-km_1.17.4948957.bb > index 3848e84e..e6247e08 100644 > --- a/recipes-bsp/powervr-drivers/ti-sgx-ddk-km_1.17.4948957.bb > +++ b/recipes-bsp/powervr-drivers/ti-sgx-dd
[meta-ti] [PATCH] ti-sgx-ddk-km: Fix build with kernel 5.10 and musl support
This adds a patch to fix runtime problems loading the kernel module with
kernel 5.10
Adds support to build with musl targets
Add yoe to recognised OE distributions
Signed-off-by: Khem Raj
Cc: Denys Dmytriyenko
---
...mbedded-hardfp-toolchain-w-o-gnueabi.patch | 18
...02-Fix-driver-config-for-5.10-kernel.patch | 28 +++
.../ti-sgx-ddk-km_1.17.4948957.bb | 1 +
3 files changed, 42 insertions(+), 5 deletions(-)
create mode 100644
recipes-bsp/powervr-drivers/ti-sgx-ddk-km/0002-Fix-driver-config-for-5.10-kernel.patch
diff --git
a/recipes-bsp/powervr-drivers/ti-sgx-ddk-km/0001-km-support-OpenEmbedded-hardfp-toolchain-w-o-gnueabi.patch
b/recipes-bsp/powervr-drivers/ti-sgx-ddk-km/0001-km-support-OpenEmbedded-hardfp-toolchain-w-o-gnueabi.patch
index 15105eac..d58764fe 100644
---
a/recipes-bsp/powervr-drivers/ti-sgx-ddk-km/0001-km-support-OpenEmbedded-hardfp-toolchain-w-o-gnueabi.patch
+++
b/recipes-bsp/powervr-drivers/ti-sgx-ddk-km/0001-km-support-OpenEmbedded-hardfp-toolchain-w-o-gnueabi.patch
@@ -1,23 +1,31 @@
-From 755632b4f3a40996a12bc7816a9839af7112040a Mon Sep 17 00:00:00 2001
+From a1c191a020f6eebc9a94b641be1fca7885fc9dd2 Mon Sep 17 00:00:00 2001
From: Denys Dmytriyenko
Date: Mon, 9 Sep 2019 17:05:48 -0400
-Subject: [PATCH] km: support OpenEmbedded hardfp toolchain w/o -gnueabihf
+Subject: [PATCH 1/2] km: support OpenEmbedded hardfp toolchain w/o -gnueabihf
suffix
+OE toolchains are not having armhf in its name but they still are armhf
+ABI, teach this to sgx module build system
+
+recognize musleabi in tuples as well
+
+Add yoe distro support
+
Signed-off-by: Denys Dmytriyenko
+Signed-off-by: Khem Raj
---
eurasia_km/eurasiacon/build/linux2/config/compiler.mk | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/eurasia_km/eurasiacon/build/linux2/config/compiler.mk
b/eurasia_km/eurasiacon/build/linux2/config/compiler.mk
-index dead2f9..2ba3e5e 100644
+index dead2f9..1b5f090 100644
--- a/eurasia_km/eurasiacon/build/linux2/config/compiler.mk
+++ b/eurasia_km/eurasiacon/build/linux2/config/compiler.mk
@@ -68,12 +68,12 @@ define calculate-compiler-preferred-target
ifneq ($$(filter aarch64-%,$$($(1)_compiler_preferred_target)),)
$(1)_compiler_preferred_target := aarch64-linux-gnu
endif
-+ ifneq ($$(filter arm-%-gnueabihf arm-oe-linux-gnueabi
arm-poky-linux-gnueabi,$$($(1)_compiler_preferred_target)),)
++ ifneq ($$(filter arm-%-gnueabihf arm-oe-linux-gnueabi
arm-poky-linux-gnueabi arm-yoe-linux-gnueabi arm-oe-linux-musleabi
arm-poky-linux-musleabi
arm-yoe-linux-musleabi,$$($(1)_compiler_preferred_target)),)
+ $(1)_compiler_preferred_target := arm-linux-gnueabihf
+ endif
ifneq ($$(filter arm-%-gnueabi armv7a-cros-linux-gnueabi
armv7hl-redhat-linux-gnueabi,$$($(1)_compiler_preferred_target)),)
@@ -30,5 +38,5 @@ index dead2f9..2ba3e5e 100644
endef
--
-2.7.4
+2.34.1
diff --git
a/recipes-bsp/powervr-drivers/ti-sgx-ddk-km/0002-Fix-driver-config-for-5.10-kernel.patch
b/recipes-bsp/powervr-drivers/ti-sgx-ddk-km/0002-Fix-driver-config-for-5.10-kernel.patch
new file mode 100644
index ..d9745703
--- /dev/null
+++
b/recipes-bsp/powervr-drivers/ti-sgx-ddk-km/0002-Fix-driver-config-for-5.10-kernel.patch
@@ -0,0 +1,28 @@
+From 57c3aafacde126786077afa7bfc07ec261acffaf Mon Sep 17 00:00:00 2001
+From: Paul Barker
+Date: Wed, 27 Oct 2021 10:34:32 +0100
+Subject: [PATCH 2/2] Fix driver config for 5.10 kernel
+
+See https://github.com/openpvrsgx-devgroup/linux_openpvrsgx/issues/3.
+
+Ref: BSP-66
+Signed-off-by: Paul Barker
+---
+ eurasia_km/eurasiacon/build/linux2/config/core.mk | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/eurasia_km/eurasiacon/build/linux2/config/core.mk
b/eurasia_km/eurasiacon/build/linux2/config/core.mk
+index 3f27926..18d515a 100644
+--- a/eurasia_km/eurasiacon/build/linux2/config/core.mk
b/eurasia_km/eurasiacon/build/linux2/config/core.mk
+@@ -590,6 +590,7 @@ ifneq ($(BUFFERCLASS_MODULE),)
+ $(eval $(call BothConfigMake,BUFFERCLASS_MODULE,$(BUFFERCLASS_MODULE)))
+ endif
+
++PVR_LINUX_MEM_AREA_USE_VMAP = 1
+ ifneq ($(strip $(KERNELDIR)),)
+ PVR_LINUX_MEM_AREA_POOL_MAX_PAGES ?= 0
+ ifneq ($(PVR_LINUX_MEM_AREA_POOL_MAX_PAGES),0)
+--
+2.34.1
+
diff --git a/recipes-bsp/powervr-drivers/ti-sgx-ddk-km_1.17.4948957.bb
b/recipes-bsp/powervr-drivers/ti-sgx-ddk-km_1.17.4948957.bb
index 3848e84e..e6247e08 100644
--- a/recipes-bsp/powervr-drivers/ti-sgx-ddk-km_1.17.4948957.bb
+++ b/recipes-bsp/powervr-drivers/ti-sgx-ddk-km_1.17.4948957.bb
@@ -22,6 +22,7 @@ BRANCH = "ti-img-sgx/${PV}/k5.10"
SRC_URI =
"git://git.ti.com/graphics/omap5-sgx-ddk-linux.git;protocol=git;branch=${BRANCH}
\
file://0001-km-support-OpenEmbedded-hardfp-toolchain-w-o-gnueabi.patch \
+file://0002-Fix-driver-config-for-5.10-kernel.patch \
"
S = "${WORKDIR}/git"
--
2.34.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#14276):
[meta-ti] [dunfell/master PATCHv3] ti-sci-fw: Fix for k3-image-gen issue for combined boot images
From: Yogesh Siraswar
This is temporary fix for combined boot images for KIG in meta-ti till
the patch is integrated.
Signed-off-by: Vignesh Raghavendra
Signed-off-by: Yogesh Siraswar
Signed-off-by: Praneeth Bajjuri
---
v3: Addressed review comments and simplified the patch further
...gning-of-binaries-for-combined-boot-.patch | 38 +++
recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb| 5 +++
2 files changed, 43 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 ..604c0c60
--- /dev/null
+++
b/recipes-bsp/ti-sci-fw/files/0001-Makefile-Skip-signing-of-binaries-for-combined-boot-.patch
@@ -0,0 +1,38 @@
+From 31134a5750ab645394c7ae72e8da46509d48bfb4 Mon Sep 17 00:00:00 2001
+From: Vignesh Raghavendra
+Date: Thu, 9 Dec 2021 12:24:08 -0600
+Subject: [tiKIG PATCHv2] Makefile: Skip signing of binaries for HS combined
+ boot
+
+Combined sysfw binaries used in tiboot3.bin do not require signed images.
+This fixes HS boot failures on am64x and j7200.
+
+Upstream-Status: Submitted
+Signed-off-by: Vignesh Raghavendra
+Signed-off-by: Yogesh Siraswar
+Signed-off-by: Praneeth Bajjuri
+---
+
+ Makefile | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/Makefile b/Makefile
+index 47b3b20..18e9eb5 100644
+--- a/Makefile
b/Makefile
+@@ -217,10 +217,12 @@ $(soc_objroot)/%.o: %.c
+
+ # On HS board configuration binaries must be signed
+ ifdef HS
++ifneq (,$(COMBINED_SYSFW_BRDCFG_LOADADDR))
+ %.bin.unsigned: %.o
+ $(CROSS_COMPILE)objcopy -S -O binary $< $@
+ %.bin: %.bin.unsigned
+ $(TI_SECURE_DEV_PKG)/scripts/secure-binary-image.sh $< $@
++endif
+ else
+ %.bin: %.o
+ $(CROSS_COMPILE)objcopy -S -O binary $< $@
+--
+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..00756fd8 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
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#14275):
https://lists.yoctoproject.org/g/meta-ti/message/14275
Mute This Topic: https://lists.yoctoproject.org/mt/87618406/21656
Group Owner: meta-ti+ow...@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/meta-ti/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [meta-ti] [dunfell/master PATCHv2] ti-sci-fw: Fix for k3-image-gen issue for combined boot images
On 12/9/21 11:37 PM, praneeth via lists.yoctoproject.org wrote:
[...]
> @@ -0,0 +1,64 @@
> +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
No need to introduce COMBINED_BOOT_IMAGE or SIGN_BINARY.
Use COMBINED_SYSFW_BRDCFG_LOADADDR like rest of Makefile does:
Entire patch can be replaced with below diff:
diff --git a/Makefile b/Makefile
index 47b3b20..18e9eb5 100644
--- a/Makefile
+++ b/Makefile
@@ -217,10 +217,12 @@ $(soc_objroot)/%.o: %.c
# On HS board configuration binaries must be signed
ifdef HS
+ifneq (,$(COMBINED_SYSFW_BRDCFG_LOADADDR))
%.bin.unsigned: %.o
$(CROSS_COMPILE)objcopy -S -O binary $< $@
%.bin: %.bin.unsigned
$(TI_SECURE_DEV_PKG)/scripts/secure-binary-image.sh $< $@
+endif
else
%.bin: %.o
$(CROSS_COMPILE)objcopy -S -O binary $< $@
> ++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 ?= 0x7000
> ++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 ?= 0x41c0
> ++COMBINED_BOOT_IMAGE = 1
> + COMBINED_TIFS_BRDCFG_LOADADDR ?= 0x7f000
> + COMBINED_DM_BRDCFG_LOADADDR ?= 0x41c8
> + LOADADDR ?= 0x4
> +--
> +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} \
>
>
>
>
>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#14274):
https://lists.yoctoproject.org/g/meta-ti/message/14274
Mute This Topic: https://lists.yoctoproject.org/mt/87617657/21656
Group Owner: meta-ti+ow...@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/meta-ti/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [meta-ti][dunfell][PATCH] ti-sci-fw: Fix for KIG issue for combined boot images
On 12/9/2021 7:24 AM, Denys Dmytriyenko wrote:
On Thu, Dec 09, 2021 at 12:18:02PM +, 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.
Submitted v2:
https://lists.yoctoproject.org/g/meta-ti/message/14272
Signed-off-by: Yogesh Siraswar
---
...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 ..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
+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
+---
+ 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 ?= 0x7000
++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 ?= 0x41c0
++COMBINED_BOOT_IMAGE = 1
+ COMBINED_TIFS_BRDCFG_LOADADDR ?= 0x7f000
+ COMBINED_DM_BRDCFG_LOADADDR ?= 0x41c8
+ LOADADDR ?= 0x4
+--
+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
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#14273):
https://lists.yoctoproject.org/g/meta-ti/message/14273
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]
-=-=-=-=-=-=-=-=-=-=-=-
[meta-ti] [dunfell/master PATCHv2] ti-sci-fw: Fix for k3-image-gen issue for combined boot images
From: Yogesh Siraswar
This is temporary fix for combined boot images for KIG in meta-ti till
the patch is integrated.
Signed-off-by: Yogesh Siraswar
---
v2: moved Upstream-Status description to .patch and updated commitmsg
...gning-of-binaries-for-combined-boot-.patch | 64 +++
recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb| 5 ++
2 files changed, 69 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 ..196f3d3f
--- /dev/null
+++
b/recipes-bsp/ti-sci-fw/files/0001-Makefile-Skip-signing-of-binaries-for-combined-boot-.patch
@@ -0,0 +1,64 @@
+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 ?= 0x7000
++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 ?= 0x41c0
++COMBINED_BOOT_IMAGE = 1
+ COMBINED_TIFS_BRDCFG_LOADADDR ?= 0x7f000
+ COMBINED_DM_BRDCFG_LOADADDR ?= 0x41c8
+ LOADADDR ?= 0x4
+--
+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
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#14272):
https://lists.yoctoproject.org/g/meta-ti/message/14272
Mute This Topic: https://lists.yoctoproject.org/mt/87617657/21656
Group Owner: meta-ti+ow...@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/meta-ti/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [meta-ti][dunfell][PATCH] ti-sci-fw: Fix for KIG issue for combined boot images
On Thu, Dec 09, 2021 at 12:18:02PM +, 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
> ---
> ...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 ..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
> +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
> +---
> + 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 ?= 0x7000
> ++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 ?= 0x41c0
> ++COMBINED_BOOT_IMAGE = 1
> + COMBINED_TIFS_BRDCFG_LOADADDR ?= 0x7f000
> + COMBINED_DM_BRDCFG_LOADADDR ?= 0x41c8
> + LOADADDR ?= 0x4
> +--
> +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
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]
-=-=-=-=-=-=-=-=-=-=-=-
[meta-ti][dunfell][PATCH] ti-sci-fw: Fix for KIG issue for combined boot images
This is temporary fix for combined boot images for KIG in meta-ti till
the patch is integrated.
Upstream-Status: Submitted
Signed-off-by: Yogesh Siraswar
---
...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 ..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
+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
+
+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 ?= 0x7000
++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 ?= 0x41c0
++COMBINED_BOOT_IMAGE = 1
+ COMBINED_TIFS_BRDCFG_LOADADDR ?= 0x7f000
+ COMBINED_DM_BRDCFG_LOADADDR ?= 0x41c8
+ LOADADDR ?= 0x4
+--
+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
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#14270):
https://lists.yoctoproject.org/g/meta-ti/message/14270
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]
-=-=-=-=-=-=-=-=-=-=-=-
