|
[master][PATCH 07/11] ti-sci-fw: Fix for k3-image-gen issue for combined boot images
Denys Dmytriyenko
From: Yogesh Siraswar <yogeshs@ti.com>
This is temporary fix for combined boot images for KIG in meta-ti till the patch is integrated. Signed-off-by: Yogesh Siraswar <yogeshs@ti.com> Signed-off-by: Denys Dmytriyenko <denys@konsulko.com> --- ...ip-signing-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 0000000..196f3d3 --- /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 <yogeshs@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: Submitted +Signed-off-by: Yogesh Siraswar <yogeshs@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 59dd3ee..2dad0fe 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.7.4
|
|
|
|
[master][PATCH 11/11] Revert "ti-sci-fw: k3-image-gen: Revert SPL address change for mainline"
Denys Dmytriyenko
From: Nishanth Menon <nm@ti.com>
This reverts commit d5db41417295fe05a293f6d4d77a65ef6563f6ed. We should'nt have to carry patches for u-boot or kernel, since the upstream is now fixed since 5.14 kernel and u-boot 2021.10 tag onwards, lets revert the patch to allow upstream to work with 5.15+ kernel and 2021.10 u-boot (from the already applied commit cae609388f19 "recipes-bsp: u-boot-ti-mainline: Update to v2021.10 release"). Signed-off-by: Nishanth Menon <nm@ti.com> Signed-off-by: Yogesh Siraswar <yogeshs@ti.com> Signed-off-by: Denys Dmytriyenko <denys@konsulko.com> --- recipes-bsp/ti-linux-fw/ti-linux-fw.inc | 11 ------- ...am64x-Makefile-Move-the-SPL-Load-address-.patch | 36 ---------------------- 2 files changed, 47 deletions(-) delete mode 100644 recipes-bsp/ti-sci-fw/files/0001-Revert-soc-am64x-Makefile-Move-the-SPL-Load-address-.patch diff --git a/recipes-bsp/ti-linux-fw/ti-linux-fw.inc b/recipes-bsp/ti-linux-fw/ti-linux-fw.inc index d224f35..f160768 100644 --- a/recipes-bsp/ti-linux-fw/ti-linux-fw.inc +++ b/recipes-bsp/ti-linux-fw/ti-linux-fw.inc @@ -32,15 +32,4 @@ SRC_URI = " \ git://git.ti.com/k3-image-gen/k3-image-gen.git;protocol=git;branch=master;destsuffix=imggen;name=imggen \ " -# This is a protection in case the definition is not present in other distros. -ARAGO_BRAND ?= "" - -# Mainline u_boot 2021.07 and upstream kernel v5.13 tag cannot use new SPL address -# in K3-Imagegen -SRC_URI += "\ - ${@oe.utils.conditional('ARAGO_BRAND', 'mainline', '\ - file://0001-Revert-soc-am64x-Makefile-Move-the-SPL-Load-address-.patch;patchdir=../imggen \ - ', '', d)} \ -" - S = "${WORKDIR}/git" diff --git a/recipes-bsp/ti-sci-fw/files/0001-Revert-soc-am64x-Makefile-Move-the-SPL-Load-address-.patch b/recipes-bsp/ti-sci-fw/files/0001-Revert-soc-am64x-Makefile-Move-the-SPL-Load-address-.patch deleted file mode 100644 index 63a5796..0000000 --- a/recipes-bsp/ti-sci-fw/files/0001-Revert-soc-am64x-Makefile-Move-the-SPL-Load-address-.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 83d29d5e346083254e71fbe483cb14f6657b9965 Mon Sep 17 00:00:00 2001 -From: Nishanth Menon <nm@ti.com> -Date: Tue, 29 Jun 2021 12:03:29 -0500 -Subject: [PATCH] Revert "soc: am64x: Makefile: Move the SPL Load address to - 0x70000000" - -This reverts commit e411dc16862b5bb2d8befb12496b03d7b01c87b2. - -Mainline is NOT ready for the change yet as of u-boot 2021.07 + v5.13, -So, this patch reverts the SPL address change. - -This patch needs to be dropped once mainline u-boot and kernel have -migrated over to newer releases. - -Upstream-Status: Not applicable -Signed-off-by: Nishanth Menon <nm@ti.com> ---- - soc/am64x/Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/soc/am64x/Makefile b/soc/am64x/Makefile -index 45425428f9c6..e8747376f153 100644 ---- a/soc/am64x/Makefile -+++ b/soc/am64x/Makefile -@@ -30,7 +30,7 @@ - # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - # - --SBL_LOADADDDR ?= 0x70000000 -+SBL_LOADADDDR ?= 0x70020000 - COMBINED_SYSFW_BRDCFG_LOADADDR ?= 0x70000 - LOADADDR ?= 0x44000 - SCIFS = sci --- -2.32.0 - -- 2.7.4
|
|
|
|
[master][PATCH 09/11] linux-ti-staging: block sa2ul for am64x hs and j7200 hs device
Denys Dmytriyenko
From: Yogesh Siraswar <yogeshs@ti.com>
SA2UL GP driver will not work for HS. Need SA2UL HS driver. Till it is implemented blacklist sa2ul for am64xx hs and j7200 hs Suggested-by: Denys Dmytriyenko <denis@denix.org> Signed-off-by: Yogesh Siraswar <yogeshs@ti.com> Signed-off-by: Denys Dmytriyenko <denys@konsulko.com> --- recipes-kernel/linux/linux-ti-staging_5.10.bb | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/recipes-kernel/linux/linux-ti-staging_5.10.bb b/recipes-kernel/linux/linux-ti-staging_5.10.bb index 368b74d..1a0ec5d 100644 --- a/recipes-kernel/linux/linux-ti-staging_5.10.bb +++ b/recipes-kernel/linux/linux-ti-staging_5.10.bb @@ -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.7.4
|
|
|
|
[master][PATCH 10/11] linux-ti-mainline: Bump kernel version to v5.15
Denys Dmytriyenko
From: Ryan Eatmon <reatmon@ti.com>
This adds up numerous fixes for various k3 platforms. While at it, bump the ti-upstream-tools repo as this sync up gives us: config: audio_display: Update cdns-mhdp configs Signed-off-by: Ryan Eatmon <reatmon@ti.com> Signed-off-by: Nishanth Menon <nm@ti.com> Signed-off-by: Yogesh Siraswar <yogeshs@ti.com> Signed-off-by: Denys Dmytriyenko <denys@konsulko.com> --- recipes-kernel/linux/linux-ti-mainline_git.bb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/recipes-kernel/linux/linux-ti-mainline_git.bb b/recipes-kernel/linux/linux-ti-mainline_git.bb index 9489ed6..6fe2107 100644 --- a/recipes-kernel/linux/linux-ti-mainline_git.bb +++ b/recipes-kernel/linux/linux-ti-mainline_git.bb @@ -20,9 +20,9 @@ S = "${WORKDIR}/git" BRANCH = "master" TOOLS_BRANCH = "master" -# 5.13 Mainline version -SRCREV = "62fb9874f5da54fdb243003b386128037319b219" -PV = "5.13+git${SRCPV}" +# 5.15 Mainline version +SRCREV = "8bb7eca972ad531c9b149c0a51ab43a417385813" +PV = "5.15+git${SRCPV}" # Append to the MACHINE_KERNEL_PR so that a new SRCREV will cause a rebuild MACHINE_KERNEL_PR:append = "b" @@ -36,7 +36,7 @@ SRC_URI += " \ file://defconfig \ " -SRCREV_ti-upstream-tools = "c9b8150cb00a5beb7b7f3e42d0d817aa9392fabd" +SRCREV_ti-upstream-tools = "0f60697843bba6f8d721b14da92b1652563ccb95" SRCREV_FORMAT = "linux" KERNEL_DEVICETREE = "" -- 2.7.4
|
|
|
|
[master][PATCH 05/11] linux-ti-staging: Bump linux version for 08.01.00.006
Denys Dmytriyenko
From: Praneeth Bajjuri <praneeth@ti.com>
Bump linux and rt-linux version to 08.01.00.006 Signed-off-by: Praneeth Bajjuri <praneeth@ti.com> Signed-off-by: Denys Dmytriyenko <denys@konsulko.com> --- recipes-kernel/linux/linux-ti-staging-rt_5.10.bb | 2 +- recipes-kernel/linux/linux-ti-staging_5.10.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes-kernel/linux/linux-ti-staging-rt_5.10.bb b/recipes-kernel/linux/linux-ti-staging-rt_5.10.bb index b4475e1..10325a8 100644 --- a/recipes-kernel/linux/linux-ti-staging-rt_5.10.bb +++ b/recipes-kernel/linux/linux-ti-staging-rt_5.10.bb @@ -6,5 +6,5 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-5.10:" BRANCH = "ti-rt-linux-5.10.y" -SRCREV = "0c67d996db8f3c9149598bc98657ae28fee22208" +SRCREV = "541ec9a6995c3dd881d6f0b63cc714a08ded457d" PV = "5.10.65+git${SRCPV}" diff --git a/recipes-kernel/linux/linux-ti-staging_5.10.bb b/recipes-kernel/linux/linux-ti-staging_5.10.bb index 2d160ab..368b74d 100644 --- a/recipes-kernel/linux/linux-ti-staging_5.10.bb +++ b/recipes-kernel/linux/linux-ti-staging_5.10.bb @@ -23,7 +23,7 @@ S = "${WORKDIR}/git" BRANCH = "ti-linux-5.10.y" -SRCREV = "dfe78b39dc37d37666f04c788abcf7d72cca3e91" +SRCREV = "dcc6bedb2c2bdb509709e4ae08303206e95ce6c2" PV = "5.10.65+git${SRCPV}" # Append to the MACHINE_KERNEL_PR so that a new SRCREV will cause a rebuild -- 2.7.4
|
|
|
|
[master][PATCH 03/11] viddec-test-app: Add the viddec-test-app recipe
Denys Dmytriyenko
From: Sidraya <sidraya.bj@pathpartnertech.com>
The viddec-test-app provides the video decoder test app (tidec_decode) for j7-evm. Signed-off-by: David Huang <d-huang@ti.com> Signed-off-by: Angela Stegmaier <angelabaker@ti.com> Signed-off-by: Denys Dmytriyenko <denys@ti.com> Signed-off-by: Sidraya <sidraya.bj@pathpartnertech.com> Signed-off-by: Denys Dmytriyenko <denys@konsulko.com> --- .../ti-img-encode-decode/viddec-test-app_1.0.0.bb | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 recipes-bsp/ti-img-encode-decode/viddec-test-app_1.0.0.bb diff --git a/recipes-bsp/ti-img-encode-decode/viddec-test-app_1.0.0.bb b/recipes-bsp/ti-img-encode-decode/viddec-test-app_1.0.0.bb new file mode 100644 index 0000000..48a1753 --- /dev/null +++ b/recipes-bsp/ti-img-encode-decode/viddec-test-app_1.0.0.bb @@ -0,0 +1,18 @@ +SUMMARY = "Test applications for TI DEC (v4l2 decoder for IMG D5520)" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://main.c;beginline=1;endline=14;md5=f17e17d664f72942124e4fcf06c178ee" + +DEPENDS = "libdrm ffmpeg" + +inherit autotools pkgconfig + +PR = "r1" +SRCREV = "94a80c8c090dbfdc7fafd4e5bb78c2091e715af2" + +EXTRA_OEMAKE = "CC="${CC}"" +TARGET_CC_ARCH += "${LDFLAGS}" + +BRANCH = "master" +SRC_URI = "git://git.ti.com/jacinto7_multimedia/viddec-test-app.git;protocol=git;branch=${BRANCH}" + +S = "${WORKDIR}/git" -- 2.7.4
|
|
|
|
[master][PATCH 02/11] vxd-dec-fw: Move firmware one folder up in target
Denys Dmytriyenko
From: Yogesh Siraswar <yogeshs@ti.com>
The application expects the pvdec_full_bin.fw to be in /lib/fimware directory. Signed-off-by: Yogesh Siraswar <yogeshs@ti.com> Signed-off-by: Denys Dmytriyenko <denys@konsulko.com> --- recipes-bsp/ti-img-encode-decode/vxd-dec-fw_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes-bsp/ti-img-encode-decode/vxd-dec-fw_git.bb b/recipes-bsp/ti-img-encode-decode/vxd-dec-fw_git.bb index 7a184be..3563cc7 100644 --- a/recipes-bsp/ti-img-encode-decode/vxd-dec-fw_git.bb +++ b/recipes-bsp/ti-img-encode-decode/vxd-dec-fw_git.bb @@ -17,8 +17,8 @@ S = "${WORKDIR}/git" TARGET = "pvdec_full_bin.fw" do_install() { - install -d ${D}${base_libdir}/firmware/ti-img - install -m 0644 ${S}/ti-img/${TARGET} ${D}${base_libdir}/firmware/ti-img/${TARGET} + install -d ${D}${base_libdir}/firmware + install -m 0644 ${S}/ti-img/${TARGET} ${D}${base_libdir}/firmware/${TARGET} } FILES:${PN} = "${base_libdir}/firmware" -- 2.7.4
|
|
|
|
[master][PATCH 01/11] pru-icss_git.bb: update to PSSP v6.0.1
Denys Dmytriyenko
From: Nick Saulnier <nsaulnier@ti.com>
Found a bug in the PRU_ICSSG examples in PSSP v6.0.0, fixed in v6.0.1. Signed-off-by: Nick Saulnier <nsaulnier@ti.com> Signed-off-by: Yogesh Siraswar <yogeshs@ti.com> Signed-off-by: Denys Dmytriyenko <denys@konsulko.com> --- recipes-bsp/pru/pru-icss_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes-bsp/pru/pru-icss_git.bb b/recipes-bsp/pru/pru-icss_git.bb index 8d550fd..b690291 100644 --- a/recipes-bsp/pru/pru-icss_git.bb +++ b/recipes-bsp/pru/pru-icss_git.bb @@ -8,9 +8,9 @@ inherit update-alternatives BRANCH = "master" SRC_URI = "git://git.ti.com/pru-software-support-package/pru-software-support-package.git;protocol=git;branch=${BRANCH}" -SRCREV = "acd8479d7f3bdbb4536ceca3cd6803662babaa5a" +SRCREV = "8eee431384b6a1a9c96ae91a8e99485176b4d2b3" -PV = "6.0.0" +PV = "6.0.1" PR = "r0" require recipes-ti/includes/ti-paths.inc -- 2.7.4
|
|
|
|
[master][PATCH 00/11] Sync up with Dunfell #3
Denys Dmytriyenko
From: Denys Dmytriyenko <denys@konsulko.com>
Keep master up to date with latest changes in Dunfell, adjust to the new override syntax. Nick Saulnier (1): pru-icss_git.bb: update to PSSP v6.0.1 Nishanth Menon (1): Revert "ti-sci-fw: k3-image-gen: Revert SPL address change for mainline" Praneeth Bajjuri (2): linux-ti-staging: Bump linux version for 08.01.00.006 u-boot-ti-staging: Bump u-boot version for 08.01.00.006 Ryan Eatmon (1): linux-ti-mainline: Bump kernel version to v5.15 Sidraya (2): viddec-test-app: Add the viddec-test-app recipe videnc-test-app: Add the videnc-test-app recipe Yogesh Siraswar (4): vxd-dec-fw: Move firmware one folder up in target ti-sci-fw: Fix for k3-image-gen issue for combined boot images conf: j7200-hs: fix the wrong machine configuration included linux-ti-staging: block sa2ul for am64x hs and j7200 hs device conf/machine/j7200-hs-evm.conf | 2 +- recipes-bsp/pru/pru-icss_git.bb | 4 +- .../ti-img-encode-decode/viddec-test-app_1.0.0.bb | 18 ++++++ .../ti-img-encode-decode/videnc-test-app_1.0.0.bb | 18 ++++++ recipes-bsp/ti-img-encode-decode/vxd-dec-fw_git.bb | 4 +- recipes-bsp/ti-linux-fw/ti-linux-fw.inc | 11 ---- ...ip-signing-of-binaries-for-combined-boot-.patch | 64 ++++++++++++++++++++++ ...am64x-Makefile-Move-the-SPL-Load-address-.patch | 36 ------------ recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb | 5 ++ recipes-bsp/u-boot/u-boot-ti-staging_2021.01.bb | 4 +- recipes-kernel/linux/linux-ti-mainline_git.bb | 8 +-- recipes-kernel/linux/linux-ti-staging-rt_5.10.bb | 2 +- recipes-kernel/linux/linux-ti-staging_5.10.bb | 8 ++- 13 files changed, 124 insertions(+), 60 deletions(-) create mode 100644 recipes-bsp/ti-img-encode-decode/viddec-test-app_1.0.0.bb create mode 100644 recipes-bsp/ti-img-encode-decode/videnc-test-app_1.0.0.bb create mode 100644 recipes-bsp/ti-sci-fw/files/0001-Makefile-Skip-signing-of-binaries-for-combined-boot-.patch delete mode 100644 recipes-bsp/ti-sci-fw/files/0001-Revert-soc-am64x-Makefile-Move-the-SPL-Load-address-.patch -- 2.7.4
|
|
|
|
Re: [PATCH v2] ti-sgx-ddk-km: Fix build with kernel 5.10 and musl support
Denys Dmytriyenko
This one is also missing from master.
toggle quoted messageShow quoted text
On Thu, Dec 09, 2021 at 07:51:38PM -0500, Denys Dmytriyenko wrote:
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 withReviewed-by: Denys Dmytriyenko <denys@konsulko.com> --
Regards, Denys Dmytriyenko <denis@denix.org> PGP: 0x420902729A92C964 - https://denix.org/0x420902729A92C964 Fingerprint: 25FC E4A5 8A72 2F69 1186 6D76 4209 0272 9A92 C964
|
|
|
|
Re: [master][PATCH] prusw-fw-am65x-sr2: update with the new override syntax
Denys Dmytriyenko
Ping. I don't believe this one made it in yet.
toggle quoted messageShow quoted text
On Wed, Dec 01, 2021 at 06:38:18PM -0500, Denys Dmytriyenko wrote:
This got accidentally merged from Dunfell with the old syntax, fix it. --
Regards, Denys Dmytriyenko <denis@denix.org> PGP: 0x420902729A92C964 - https://denix.org/0x420902729A92C964 Fingerprint: 25FC E4A5 8A72 2F69 1186 6D76 4209 0272 9A92 C964
|
|
|
|
[PATCH v2] conf: am437xx-evm: re-introduce required DTBs for HDMI support
Amjad Ouled-Ameur
commit ba0ddc5ae9eb ("conf: am437xx-evm: Remove non-existent dtb* from
5.10") removed all non-existent dtb* for am437xx-evm as they were not available on linux 5.10 branch at that time. This patch reintroduces following HDMI DTBs. - am437x-gp-evm-hdmi.dtb - am43x-epos-evm-hdmi.dtb The required dts have been added to the 5.10LTS by these two following commits: - https://git.ti.com/cgit/ti-linux-kernel/ti-linux-kernel/commit/arch/arm/ boot/dts/am437x-gp-evm-hdmi.dts?h=ti-linux-5.10.y&id=25434078d3f93d1346af5 e52e0f150f9083321d8 - https://git.ti.com/cgit/ti-linux-kernel/ti-linux-kernel/commit/arch/arm/ boot/dts/am43x-epos-evm-hdmi.dts?h=ti-linux-5.10.y&id=c5114144b568e470a8f6 e613f7c6e8b88ad19d7e Signed-off-by: Amjad Ouled-Ameur <aouledameur@baylibre.com> --- Changes in V2: - Reworked commit message. V1: https://lists.yoctoproject.org/g/meta-ti/topic/patch_revert_conf/875669 71?p=,,,20,0,0,0::recentpostdate/sticky,,,20,2,0,87566971,previd=1639144992 271923805,nextid=1638294245910532029&previd=1639144992271923805&nextid=1638 294245910532029 Fixes: LCPD-24285 conf/machine/include/ti43x.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/machine/include/ti43x.inc b/conf/machine/include/ti43x.inc index 75b745b37839..6376a27830f8 100644 --- a/conf/machine/include/ti43x.inc +++ b/conf/machine/include/ti43x.inc @@ -27,9 +27,9 @@ PREFERRED_PROVIDER_u-boot = "u-boot-ti-staging" KERNEL_IMAGETYPE = "zImage" KERNEL_DEVICETREE = " \ - am437x-gp-evm.dtb \ + am437x-gp-evm.dtb am437x-gp-evm-hdmi.dtb \ am437x-sk-evm.dtb am437x-idk-evm.dtb \ - am43x-epos-evm.dtb \ + am43x-epos-evm.dtb am43x-epos-evm-hdmi.dtb \ " KERNEL_DEVICETREE += "${@oe.utils.conditional('ENABLE_TI_UIO_DEVICES', '1', 'am437x-idk-pru-excl-uio.dtb', '', d)}" -- 2.17.1
|
|
|
|
Re: [master][PATCH v2 00/26] Sync up with Dunfell #2
Denys Dmytriyenko
Ping
toggle quoted messageShow quoted text
On Fri, Nov 19, 2021 at 10:25:45PM -0500, Denys Dmytriyenko wrote:
From: Denys Dmytriyenko <denys@konsulko.com>
|
|
|
|
Re: [dunfell][PATCH] linux-ti-staging: block sa2ul for am64x hs and j7200 hs device
Denys Dmytriyenko
On Fri, Dec 10, 2021 at 02:56:24AM +0000, Yogesh Siraswar via lists.yoctoproject.org wrote:
SA2UL GP driver will not work for HS. Need SA2UL HS driver.BTW, there's a standard Suggested-by: tag... Signed-off-by: Yogesh Siraswar <yogeshs@ti.com>Reviewed-by: Denys Dmytriyenko <denys@konsulko.com> ---
|
|
|
|
[dunfell][PATCH] linux-ti-staging: block sa2ul for am64x hs and j7200 hs device
Yogesh Siraswar
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 <denis@denix.org> Signed-off-by: Yogesh Siraswar <yogeshs@ti.com> --- 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
|
|
|
|
Re: [dunfell/master PATCHv2] ti-sci-fw: Fix for k3-image-gen issue for combined boot images
Yogesh Siraswar
On 12/9/2021 12:23 PM, Vignesh Raghavendra wrote:
On 12/9/21 11:37 PM, praneeth via lists.yoctoproject.org wrote: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:
|
|
|
|
[master/dunfell][PATCH] conf: j7200-hs: fix the wrong machine configuration included
Yogesh Siraswar
j7-evm instead of j7200-evm was included causing boot failure
Signed-off-by: Yogesh Siraswar <yogeshs@ti.com> --- 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
|
|
|
|
Re: [PATCH v2] ti-sgx-ddk-km: Fix build with kernel 5.10 and musl support
Denys Dmytriyenko
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 withReviewed-by: Denys Dmytriyenko <denys@konsulko.com> ---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 +++++++++----
|
|
|
|
[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 <raj.khem@gmail.com> Cc: Denys Dmytriyenko <denys@konsulko.com> --- 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 <denys@ti.com> 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 <denys@ti.com> +Signed-off-by: Khem Raj <raj.khem@gmail.com> --- 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 00000000..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 <paul.barker@sancloud.com> +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 <paul.barker@sancloud.com> +--- + 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" diff --git a/recipes-graphics/libgles/ti-sgx-ddk-um_1.17.4948957.bb b/recipes-graphics/libgles/ti-sgx-ddk-um_1.17.4948957.bb index 87bbb437..9d55122c 100644 --- a/recipes-graphics/libgles/ti-sgx-ddk-um_1.17.4948957.bb +++ b/recipes-graphics/libgles/ti-sgx-ddk-um_1.17.4948957.bb @@ -32,6 +32,7 @@ inherit update-rc.d PROVIDES += "virtual/egl virtual/libgles1 virtual/libgles2 virtual/libgbm" DEPENDS += "libdrm udev wayland wayland-protocols libffi expat" +DEPENDS:append:libc-musl = " gcompat" RDEPENDS:${PN} += "libdrm libdrm-omap udev wayland wayland-protocols libffi expat" RPROVIDES:${PN} = "libegl libgles1 libgles2 libgbm" -- 2.34.1
|
|
|
|
Re: [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 <denis@denix.org> wrote:
Perhaps makes sense, I can spin a v2 with status 'Pending' Signed-off-by: Khem Raj <raj.khem@gmail.com>Reviewed-by: Denys Dmytriyenko <denys@konsulko.com>
|
|
|