|
Re: [kirkstone-next][PATCH] meta-ti: conf: am62xx-lp-evm: Fix DT and DT prefixes
Denys Dmytriyenko
On Thu, May 11, 2023 at 10:02:23AM +0530, Aradhya Bhatia wrote:
Hi DenysIf you use oe-layersetup scripts, then there are arago-kirkstone-config.txt and arago-master-config.txt config files available. Let us know if you see any issues. -- Denys |
|
|
|
[master/kirkstone][PATCH] conf: machine: Add extra tiboot3.bin version that matches default
Ryan Eatmon
When creating the boot partition we copy all of the images for the
different board types (gp, hs-fs, hs-se), but one of those we consider to be a default. That default is not copied with the longer name, but rather with the tiboot3.bin name. The issue comes when someone wants to boot with a different bin file. They need to copy the approriate longer named .bin file to tiboot3.bin. But then the original name of what tiboot3.bin is lost unless the use backs it up. This patch just additionally copies that longer named bin file so that anyone who wants to look at the boot partiion and decide to boot for a different board can know which file to copy to tiboot3.bin and does not need to worry about making a backup. Signed-off-by: Ryan Eatmon <reatmon@...> --- meta-ti-bsp/conf/machine/include/am62axx.inc | 1 + meta-ti-bsp/conf/machine/include/am62xx-lp.inc | 1 + meta-ti-bsp/conf/machine/include/am62xx.inc | 1 + meta-ti-bsp/conf/machine/j721s2-evm.conf | 1 + meta-ti-bsp/conf/machine/j784s4-evm.conf | 1 + 5 files changed, 5 insertions(+) diff --git a/meta-ti-bsp/conf/machine/include/am62axx.inc b/meta-ti-bsp/conf/machine/include/am62axx.inc index eacfa584..e708a313 100644 --- a/meta-ti-bsp/conf/machine/include/am62axx.inc +++ b/meta-ti-bsp/conf/machine/include/am62axx.inc @@ -7,6 +7,7 @@ TFA_K3_SYSTEM_SUSPEND = "1" # Default tiboot3.bin on AM62A is for HS-FS BBMULTICONFIG = "k3r5-hs-fs" +IMAGE_BOOT_FILES += "tiboot3-am62ax-hs-fs-evm.bin" do_image_complete[mcdepends] = "mc::k3r5-hs-fs:ti-sci-fw:do_deploy" # Since default tiboot3.bin on AM62A is for HS-FS, add a version for GP diff --git a/meta-ti-bsp/conf/machine/include/am62xx-lp.inc b/meta-ti-bsp/conf/machine/include/am62xx-lp.inc index bcc6f493..99237a90 100644 --- a/meta-ti-bsp/conf/machine/include/am62xx-lp.inc +++ b/meta-ti-bsp/conf/machine/include/am62xx-lp.inc @@ -7,6 +7,7 @@ TFA_K3_SYSTEM_SUSPEND = "1" # Default tiboot3.bin on AM62x LP is for HS-FS BBMULTICONFIG = "k3r5-hs-fs" +IMAGE_BOOT_FILES += "tiboot3-am62x-hs-fs-evm.bin" do_image_complete[mcdepends] = "mc::k3r5-hs-fs:ti-sci-fw:do_deploy" # Since default tiboot3.bin on AM62x LP is for HS-FS, add a version for HS-SE diff --git a/meta-ti-bsp/conf/machine/include/am62xx.inc b/meta-ti-bsp/conf/machine/include/am62xx.inc index c1e0ed0c..c98da5f5 100644 --- a/meta-ti-bsp/conf/machine/include/am62xx.inc +++ b/meta-ti-bsp/conf/machine/include/am62xx.inc @@ -8,6 +8,7 @@ PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver" # Default tiboot3.bin on AM62x is for HS-FS BBMULTICONFIG = "k3r5-hs-fs" +IMAGE_BOOT_FILES += "tiboot3-am62x-hs-fs-evm.bin" do_image_complete[mcdepends] = "mc::k3r5-hs-fs:ti-sci-fw:do_deploy" # Since default tiboot3.bin on AM62x is for HS-FS, add a version for GP diff --git a/meta-ti-bsp/conf/machine/j721s2-evm.conf b/meta-ti-bsp/conf/machine/j721s2-evm.conf index bdea7c44..78973600 100644 --- a/meta-ti-bsp/conf/machine/j721s2-evm.conf +++ b/meta-ti-bsp/conf/machine/j721s2-evm.conf @@ -21,6 +21,7 @@ UBOOT_MACHINE = "j721s2_evm_a72_defconfig" # Default tiboot3.bin on J721S2 is for GP BBMULTICONFIG = "k3r5-gp" +IMAGE_BOOT_FILES += "tiboot3-j721s2-gp-evm.bin" do_image_complete[mcdepends] = "mc::k3r5-gp:ti-sci-fw:do_deploy" # Since default tiboot3.bin on J721S2 is for GP, add a version for SR1.0 HS-FS diff --git a/meta-ti-bsp/conf/machine/j784s4-evm.conf b/meta-ti-bsp/conf/machine/j784s4-evm.conf index 4fe64d88..4274e800 100644 --- a/meta-ti-bsp/conf/machine/j784s4-evm.conf +++ b/meta-ti-bsp/conf/machine/j784s4-evm.conf @@ -21,6 +21,7 @@ UBOOT_MACHINE = "j784s4_evm_a72_defconfig" # Default tiboot3.bin on J784S4 is for GP BBMULTICONFIG = "k3r5-gp" +IMAGE_BOOT_FILES += "tiboot3-j784s4-gp-evm.bin" do_image_complete[mcdepends] = "mc::k3r5-gp:ti-sci-fw:do_deploy" # Since default tiboot3.bin on J784S4 is for GP, add a version for SR1.0 HS-FS -- 2.17.1 |
|
|
|
Re: [master/kirkstone][PATCH 2/2] trusted-firmware-a: only activate customizations for TI platforms
Ryan Eatmon
Already done. No worries.
toggle quoted message
Show quoted text
On 5/11/2023 2:49 PM, Denys Dmytriyenko wrote:
Sorry about all that - I can resend everything specifically for kirkstone --
Ryan Eatmon reatmon@... ----------------------------------------- Texas Instruments, Inc. - LCPD - MGTS |
|
|
|
Re: [master/kirkstone][PATCH 2/2] trusted-firmware-a: only activate customizations for TI platforms
Denys Dmytriyenko
Sorry about all that - I can resend everything specifically for kirkstone
toggle quoted message
Show quoted text
On Thu, May 11, 2023 at 02:46:11PM -0500, Ryan Eatmon via lists.yoctoproject.org wrote:
--
Regards, Denys Dmytriyenko <denis@...> PGP: 0x420902729A92C964 - https://denix.org/0x420902729A92C964 Fingerprint: 25FC E4A5 8A72 2F69 1186 6D76 4209 0272 9A92 C964 |
|
|
|
Re: [master/kirkstone][PATCH 2/2] trusted-firmware-a: only activate customizations for TI platforms
Ryan Eatmon
This does not apply against kirkstone cleanly because of a patch applied to the master recipe that is not in kirkstone. I'll fix it as I apply the patch, but I wanted to inform anyone trying it themselves.
toggle quoted message
Show quoted text
On 5/11/2023 1:43 PM, Denys Dmytriyenko wrote:
From: Denys Dmytriyenko <denys@...> --
Ryan Eatmon reatmon@... ----------------------------------------- Texas Instruments, Inc. - LCPD - MGTS |
|
|
|
Re: [master/kirkstone][PATCH 1/2] optee-os: only activate customizations for TI platforms
Ryan Eatmon
This does not apply against kirkstone cleanly because of the optee version change from 3.16 to % for master. I'll fix it as I apply the patch, but I wanted to inform anyone trying it themselves.
toggle quoted message
Show quoted text
On 5/11/2023 1:43 PM, Denys Dmytriyenko wrote:
From: Denys Dmytriyenko <denys@...> --
Ryan Eatmon reatmon@... ----------------------------------------- Texas Instruments, Inc. - LCPD - MGTS |
|
|
|
Re: [master/kirkstone][PATCH] mesa-pvr: convert bbappend into standalone alternative provider
Ryan Eatmon
This does not apply against kirkstone cleanly because of the mesa version change from 22 to 23 for master. I'll fix it as I apply the patch, but I wanted to inform anyone trying it themselves.
toggle quoted message
Show quoted text
On 5/11/2023 1:40 PM, Denys Dmytriyenko wrote:
From: Denys Dmytriyenko <denys@...> --
Ryan Eatmon reatmon@... ----------------------------------------- Texas Instruments, Inc. - LCPD - MGTS |
|
|
|
[master/kirkstone][PATCH 2/2] trusted-firmware-a: only activate customizations for TI platforms
Denys Dmytriyenko
From: Denys Dmytriyenko <denys@...>
Avoid inheriting ti-secdev class and adding unconditional dependency on TI_SECURE_DEV_PKG and other variables, when meta-ti-bsp is in the bblayers.conf stack, but not building for TI platforms. This solves yocto-check-layer signature test for Yocto Project compliance. Signed-off-by: Denys Dmytriyenko <denys@...> --- ...a_%.bbappend =3D> trusted-firmware-a-ti.inc} | 0 .../trusted-firmware-a_%.bbappend | 72 +------------------ 2 files changed, 3 insertions(+), 69 deletions(-) copy meta-ti-bsp/recipes-bsp/trusted-firmware-a/{trusted-firmware-a_%.bb= append =3D> trusted-firmware-a-ti.inc} (100%) diff --git a/meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-= a_%.bbappend b/meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmwar= e-a-ti.inc similarity index 100% copy from meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%= .bbappend copy to meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-ti.= inc diff --git a/meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-= a_%.bbappend b/meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmwar= e-a_%.bbappend index 4ea63205..00d08a51 100644 --- a/meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bba= ppend +++ b/meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bba= ppend @@ -1,70 +1,4 @@ -PV:k3 =3D "2.8+git${SRCPV}" -SRCREV_tfa:k3 =3D "2fcd408bb3a6756767a43c073c597cef06e7f2d5" -SRC_URI:k3 =3D "git://git.trustedfirmware.org/TF-A/trusted-firmware-a.gi= t;protocol=3Dhttps;name=3Dtfa;branch=3Dmaster" -COMPATIBLE_MACHINE:k3 =3D "k3" -TFA_BUILD_TARGET:k3 =3D "all" -TFA_INSTALL_TARGET:k3 =3D "bl31" -TFA_SPD:k3 =3D "opteed" +TFA_TI =3D "" +TFA_TI:k3 =3D "trusted-firmware-a-ti.inc" =20 -SRC_URI:append:k3 =3D " file://rwx-segments-ti.patch" -FILESEXTRAPATHS:prepend :=3D "${THISDIR}/files:" - -# Use TI SECDEV for signing -inherit ti-secdev - -EXTRA_OEMAKE:append:k3 =3D "${@ ' K3_USART=3D' + d.getVar('TFA_K3_USART'= ) if d.getVar('TFA_K3_USART') else ''}" -EXTRA_OEMAKE:append:k3 =3D "${@ ' K3_PM_SYSTEM_SUSPEND=3D' + d.getVar('T= FA_K3_SYSTEM_SUSPEND') if d.getVar('TFA_K3_SYSTEM_SUSPEND') else ''}" - -# Signing procedure for K3 HS devices -tfa_sign_k3hs() { - mv ${BUILD_DIR}/bl31.bin ${BUILD_DIR}/bl31.bin.unsigned - ${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh ${BUILD_DIR}/bl31.b= in.unsigned ${BUILD_DIR}/bl31.bin -} - -do_compile:append:am65xx-hs-evm() { - tfa_sign_k3hs -} - -do_compile:append:am64xx-evm() { - tfa_sign_k3hs -} - -do_compile:append:am62xx-evm() { - tfa_sign_k3hs -} - -do_compile:append:am62xx-lp-evm() { - tfa_sign_k3hs -} - -do_compile:append:am62axx-evm() { - tfa_sign_k3hs -} - -do_compile:append:j721e-hs-evm() { - tfa_sign_k3hs -} - -do_compile:append:j7200-hs-evm() { - tfa_sign_k3hs -} - -do_compile:append:j721s2-hs-evm() { - tfa_sign_k3hs -} - -do_compile:append:j784s4-hs-evm() { - tfa_sign_k3hs -} - -do_install:append:k3() { - if [ -f ${BUILD_DIR}/bl31.bin.unsigned ]; then - echo "Install bl31.bin.unsigned" - install -m 0644 ${BUILD_DIR}/bl31.bin.unsigned \ - ${D}/firmware/bl31.bin.unsigned - else - echo "Install bl31.bin.unsigned" - install -m 0644 ${BUILD_DIR}/bl31.bin \ - ${D}/firmware/bl31.bin.unsigned - fi -} +require ${TFA_TI} --=20 2.25.1 |
|
|
|
[master/kirkstone][PATCH 1/2] optee-os: only activate customizations for TI platforms
Denys Dmytriyenko
From: Denys Dmytriyenko <denys@...>
Avoid inheriting ti-secdev class and adding unconditional dependency on TI_SECURE_DEV_PKG and other variables, when meta-ti-bsp is in the bblayers.conf stack, but not building for TI platforms. This solves yocto-check-layer signature test for Yocto Project compliance. Signed-off-by: Denys Dmytriyenko <denys@...> --- .../{optee-os_%.bbappend =3D> optee-os-ti.inc} | 0 .../optee/optee-os_%.bbappend | 116 +----------------- 2 files changed, 3 insertions(+), 113 deletions(-) copy meta-ti-bsp/recipes-security/optee/{optee-os_%.bbappend =3D> optee-= os-ti.inc} (100%) diff --git a/meta-ti-bsp/recipes-security/optee/optee-os_%.bbappend b/met= a-ti-bsp/recipes-security/optee/optee-os-ti.inc similarity index 100% copy from meta-ti-bsp/recipes-security/optee/optee-os_%.bbappend copy to meta-ti-bsp/recipes-security/optee/optee-os-ti.inc diff --git a/meta-ti-bsp/recipes-security/optee/optee-os_%.bbappend b/met= a-ti-bsp/recipes-security/optee/optee-os_%.bbappend index 4f052996..0067cdc7 100644 --- a/meta-ti-bsp/recipes-security/optee/optee-os_%.bbappend +++ b/meta-ti-bsp/recipes-security/optee/optee-os_%.bbappend @@ -1,114 +1,4 @@ -# Use TI SECDEV for signing -inherit ti-secdev +OPTEE_TI =3D "" +OPTEE_TI:ti-soc =3D "optee-os-ti.inc" =20 -EXTRA_OEMAKE:append:k3 =3D "${@ ' CFG_CONSOLE_UART=3D'+ d.getVar('OPTEE_= K3_USART') if d.getVar('OPTEE_K3_USART') else ''}" - -EXTRA_OEMAKE:append:am62xx =3D " CFG_WITH_SOFTWARE_PRNG=3Dy CFG_TEE_CORE= _LOG_LEVEL=3D1" -EXTRA_OEMAKE:append:am62axx =3D " CFG_TEE_CORE_LOG_LEVEL=3D1" - -do_compile:append:k3() { - cp ${B}/core/tee-pager_v2.bin ${B}/bl32.bin - cp ${B}/core/tee-pager_v2.bin ${B}/bl32.bin.unsigned - cp ${B}/core/tee.elf ${B}/bl32.elf -} - -# Signing procedure for legacy HS devices -optee_sign_legacyhs() { - ( cd ${B}/core/; \ - ${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh tee.bin tee.= bin.signed; \ - normfl=3D`echo ${OPTEEFLAVOR} | tr "_" "-"` - mv tee.bin.signed ${B}/$normfl.optee; \ - ) - - if [ "${OPTEEPAGER}" =3D "y" ]; then - oe_runmake -C ${S} clean - oe_runmake -C ${S} all CFG_TEE_TA_LOG_LEVEL=3D0 CFG_WITH_PAGER=3D= y - ( cd ${B}/core/; \ - ${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh tee.bin = tee.bin.signed; \ - normfl=3D`echo ${OPTEEFLAVOR} | tr "_" "-"` - mv tee.bin.signed ${B}/$normfl-pager.optee; \ - ) - fi -} - -do_compile:append:ti43x() { - optee_sign_legacyhs -} - -do_compile:append:dra7xx() { - optee_sign_legacyhs -} - -# Signing procedure for K3 devices -optee_sign_k3hs() { - ${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh ${B}/core/tee-pa= ger_v2.bin ${B}/bl32.bin - cp ${B}/core/tee-pager_v2.bin ${B}/bl32.bin.unsigned - cp ${B}/core/tee.elf ${B}/bl32.elf -} - -do_compile:append:am65xx-hs-evm() { - optee_sign_k3hs -} - -do_compile:append:am64xx-evm() { - optee_sign_k3hs -} - -do_compile:append:am62xx-evm() { - optee_sign_k3hs -} - -do_compile:append:am62xx-lp-evm() { - optee_sign_k3hs -} - -do_compile:append:am62axx-evm() { - optee_sign_k3hs -} - -do_compile:append:j721e-hs-evm() { - optee_sign_k3hs -} - -do_compile:append:j7200-hs-evm() { - optee_sign_k3hs -} - -do_compile:append:j721s2-hs-evm() { - optee_sign_k3hs -} - -do_compile:append:j784s4-hs-evm() { - optee_sign_k3hs -} - -do_install:append:ti-soc() { - install -m 644 ${B}/*.optee ${D}${nonarch_base_libdir}/firmware/ || = true - install -m 644 ${B}/bl32.bin ${D}${nonarch_base_libdir}/firmware/ ||= true - install -m 644 ${B}/bl32.bin.unsigned ${D}${nonarch_base_libdir}/fir= mware/ || true - install -m 644 ${B}/bl32.elf ${D}${nonarch_base_libdir}/firmware/ ||= true -} - -optee_deploy_legacyhs() { - cd ${DEPLOYDIR}/ - for f in optee/*.optee; do - ln -sf $f ${DEPLOYDIR}/ - done -} - -do_deploy:append:ti43x() { - optee_deploy_legacyhs -} - -do_deploy:append:dra7xx() { - optee_deploy_legacyhs -} - -do_deploy:append:k3() { - ln -sf optee/bl32.bin ${DEPLOYDIR}/ - ln -sf optee/bl32.bin.unsigned ${DEPLOYDIR}/ - ln -sf optee/bl32.elf ${DEPLOYDIR}/ -} - -# This is needed for bl32.elf -INSANE_SKIP:${PN}:append:k3 =3D " textrel" +require ${OPTEE_TI} --=20 2.25.1 |
|
|
|
[master/kirkstone][PATCH] mesa-pvr: convert bbappend into standalone alternative provider
Denys Dmytriyenko
From: Denys Dmytriyenko <denys@...>
There are some unobvious issues with adding PVR support to Mesa via a bbappend: 1. We need to mark mesa package as machine-specific, due to differences in builds between SGX, Rogue and software-rendering 2. We also need to then mark mesa package as providing safe ABIs (EGL/GLES/GBM) in order for all generic dependent packages to not be treated as machine-specific, allowing their re-use across different machines of the same architecture But doing the above alters the upstream mesa package and changes its signatures even when not building for TI platforms, which is a Yocto Project compliance violation. In order to resolve this issue, convert Mesa bbappend, that adds PVR support, into its own standalone alternative provider, called mesa-pvr and allow selecting it with PREFERRED_PROVIDER settings. Signed-off-by: Denys Dmytriyenko <denys@...> --- meta-ti-bsp/conf/layer.conf | 2 +- meta-ti-bsp/conf/machine/beagleplay.conf | 1 + meta-ti-bsp/conf/machine/include/am62xx.inc | 1 + meta-ti-bsp/conf/machine/include/am65xx.inc | 1 + meta-ti-bsp/conf/machine/include/j721e.inc | 1 + meta-ti-bsp/conf/machine/include/j721s2.inc | 1 + meta-ti-bsp/conf/machine/include/j784s4.inc | 1 + meta-ti-bsp/conf/machine/include/mesa-pvr.inc | 8 ++++++++ meta-ti-bsp/conf/machine/include/omap-a15.inc | 1 + meta-ti-bsp/conf/machine/include/ti33x.inc | 1 + meta-ti-bsp/conf/machine/include/ti43x.inc | 1 + .../recipes-graphics/mesa/mesa-gl_23.%.bbappend | 1 - .../mesa/{pvr-mesa.inc =3D> mesa-pvr_22.3.5.bb} | 10 ++++++---- meta-ti-bsp/recipes-graphics/mesa/mesa_23.%.bbappend | 1 - 14 files changed, 24 insertions(+), 7 deletions(-) create mode 100644 meta-ti-bsp/conf/machine/include/mesa-pvr.inc delete mode 100644 meta-ti-bsp/recipes-graphics/mesa/mesa-gl_23.%.bbappe= nd rename meta-ti-bsp/recipes-graphics/mesa/{pvr-mesa.inc =3D> mesa-pvr_22.= 3.5.bb} (88%) delete mode 100644 meta-ti-bsp/recipes-graphics/mesa/mesa_23.%.bbappend diff --git a/meta-ti-bsp/conf/layer.conf b/meta-ti-bsp/conf/layer.conf index 5520c7c2..bb286c2b 100644 --- a/meta-ti-bsp/conf/layer.conf +++ b/meta-ti-bsp/conf/layer.conf @@ -19,7 +19,7 @@ LAYERDEPENDS_meta-ti-bsp =3D " \ " =20 SIGGEN_EXCLUDERECIPES_ABISAFE +=3D " \ - mesa \ + mesa-pvr \ " =20 HOSTTOOLS_NONFATAL +=3D "truncate xxd comm" diff --git a/meta-ti-bsp/conf/machine/beagleplay.conf b/meta-ti-bsp/conf/= machine/beagleplay.conf index e8d25cd9..c7b1414a 100644 --- a/meta-ti-bsp/conf/machine/beagleplay.conf +++ b/meta-ti-bsp/conf/machine/beagleplay.conf @@ -10,6 +10,7 @@ MACHINE_FEATURES +=3D "screen gpu" SERIAL_CONSOLES =3D "115200;ttyS2" SERIAL_CONSOLES_CHECK =3D "${SERIAL_CONSOLES}" =20 +require conf/machine/include/mesa-pvr.inc PREFERRED_PROVIDER_virtual/gpudriver ?=3D "ti-img-rogue-driver" =20 TFA_BOARD =3D "lite" diff --git a/meta-ti-bsp/conf/machine/include/am62xx.inc b/meta-ti-bsp/co= nf/machine/include/am62xx.inc index 623d90eb..c4582c13 100644 --- a/meta-ti-bsp/conf/machine/include/am62xx.inc +++ b/meta-ti-bsp/conf/machine/include/am62xx.inc @@ -3,6 +3,7 @@ SOC_FAMILY:append =3D ":am62xx" =20 MACHINE_FEATURES +=3D "screen gpu" =20 +require conf/machine/include/mesa-pvr.inc PREFERRED_PROVIDER_virtual/gpudriver ?=3D "ti-img-rogue-driver" =20 # Default tiboot3.bin on AM62x is for HS-FS diff --git a/meta-ti-bsp/conf/machine/include/am65xx.inc b/meta-ti-bsp/co= nf/machine/include/am65xx.inc index 9fe851f4..9cbce243 100644 --- a/meta-ti-bsp/conf/machine/include/am65xx.inc +++ b/meta-ti-bsp/conf/machine/include/am65xx.inc @@ -3,6 +3,7 @@ SOC_FAMILY:append =3D ":am65xx" =20 MACHINE_FEATURES +=3D "screen touchscreen gpu" =20 +require conf/machine/include/mesa-pvr.inc PREFERRED_PROVIDER_virtual/gpudriver ?=3D "" =20 KERNEL_DEVICETREE_PREFIX =3D "ti/k3-am654" diff --git a/meta-ti-bsp/conf/machine/include/j721e.inc b/meta-ti-bsp/con= f/machine/include/j721e.inc index 5e325ffe..f707cf26 100644 --- a/meta-ti-bsp/conf/machine/include/j721e.inc +++ b/meta-ti-bsp/conf/machine/include/j721e.inc @@ -3,6 +3,7 @@ SOC_FAMILY:append =3D ":j721e" =20 MACHINE_FEATURES +=3D "screen gpu" =20 +require conf/machine/include/mesa-pvr.inc PREFERRED_PROVIDER_virtual/gpudriver ?=3D "ti-img-rogue-driver" =20 # On J721e the file tiboot3.bin comes from the bootloader not ti-sci-fw diff --git a/meta-ti-bsp/conf/machine/include/j721s2.inc b/meta-ti-bsp/co= nf/machine/include/j721s2.inc index 70569a16..98cc611f 100644 --- a/meta-ti-bsp/conf/machine/include/j721s2.inc +++ b/meta-ti-bsp/conf/machine/include/j721s2.inc @@ -3,6 +3,7 @@ SOC_FAMILY:append =3D ":j721s2" =20 MACHINE_FEATURES +=3D "screen gpu" =20 +require conf/machine/include/mesa-pvr.inc PREFERRED_PROVIDER_virtual/gpudriver ?=3D "ti-img-rogue-driver" =20 TFA_BOARD =3D "generic" diff --git a/meta-ti-bsp/conf/machine/include/j784s4.inc b/meta-ti-bsp/co= nf/machine/include/j784s4.inc index d03ee4a4..de207687 100644 --- a/meta-ti-bsp/conf/machine/include/j784s4.inc +++ b/meta-ti-bsp/conf/machine/include/j784s4.inc @@ -3,6 +3,7 @@ SOC_FAMILY:append =3D ":j784s4" =20 MACHINE_FEATURES +=3D "screen gpu" =20 +require conf/machine/include/mesa-pvr.inc PREFERRED_PROVIDER_virtual/gpudriver ?=3D "ti-img-rogue-driver" =20 TFA_BOARD =3D "j784s4" diff --git a/meta-ti-bsp/conf/machine/include/mesa-pvr.inc b/meta-ti-bsp/= conf/machine/include/mesa-pvr.inc new file mode 100644 index 00000000..d5581315 --- /dev/null +++ b/meta-ti-bsp/conf/machine/include/mesa-pvr.inc @@ -0,0 +1,8 @@ +PREFERRED_PROVIDER_virtual/mesa ?=3D "mesa-pvr" +PREFERRED_PROVIDER_virtual/egl ?=3D "mesa-pvr" +PREFERRED_PROVIDER_virtual/libgles1 ?=3D "mesa-pvr" +PREFERRED_PROVIDER_virtual/libgles2 ?=3D "mesa-pvr" +PREFERRED_PROVIDER_virtual/libgles3 ?=3D "mesa-pvr" +PREFERRED_PROVIDER_virtual/libgbm ?=3D "mesa-pvr" +PREFERRED_PROVIDER_virtual/libglx ?=3D "mesa-pvr" +PREFERRED_PROVIDER_virtual/libgl ?=3D "mesa-pvr" diff --git a/meta-ti-bsp/conf/machine/include/omap-a15.inc b/meta-ti-bsp/= conf/machine/include/omap-a15.inc index 49db1cb6..700b1a11 100644 --- a/meta-ti-bsp/conf/machine/include/omap-a15.inc +++ b/meta-ti-bsp/conf/machine/include/omap-a15.inc @@ -12,6 +12,7 @@ PREFERRED_PROVIDER_virtual/bootloader ?=3D "u-boot-ti-s= taging" PREFERRED_PROVIDER_u-boot ?=3D "u-boot-ti-staging" =20 # Graphics providers and variables +require conf/machine/include/mesa-pvr.inc PREFERRED_PROVIDER_virtual/gpudriver ?=3D "" PVR_DISPLAY_CONTROLLER_ALIAS ?=3D "omapdrm" =20 diff --git a/meta-ti-bsp/conf/machine/include/ti33x.inc b/meta-ti-bsp/con= f/machine/include/ti33x.inc index 4f6d90bf..bce88309 100644 --- a/meta-ti-bsp/conf/machine/include/ti33x.inc +++ b/meta-ti-bsp/conf/machine/include/ti33x.inc @@ -13,6 +13,7 @@ PREFERRED_PROVIDER_virtual/bootloader ?=3D "u-boot-ti-s= taging" PREFERRED_PROVIDER_u-boot ?=3D "u-boot-ti-staging" =20 # Graphics providers and variables +require conf/machine/include/mesa-pvr.inc PREFERRED_PROVIDER_virtual/gpudriver ?=3D "" PVR_DISPLAY_CONTROLLER_ALIAS ?=3D "tilcdc" =20 diff --git a/meta-ti-bsp/conf/machine/include/ti43x.inc b/meta-ti-bsp/con= f/machine/include/ti43x.inc index 5b40925e..c1009dc6 100644 --- a/meta-ti-bsp/conf/machine/include/ti43x.inc +++ b/meta-ti-bsp/conf/machine/include/ti43x.inc @@ -13,6 +13,7 @@ PREFERRED_PROVIDER_virtual/bootloader ?=3D "u-boot-ti-s= taging" PREFERRED_PROVIDER_u-boot ?=3D "u-boot-ti-staging" =20 # Graphics providers and variables +require conf/machine/include/mesa-pvr.inc PREFERRED_PROVIDER_virtual/gpudriver ?=3D "" PVR_DISPLAY_CONTROLLER_ALIAS ?=3D "omapdrm" =20 diff --git a/meta-ti-bsp/recipes-graphics/mesa/mesa-gl_23.%.bbappend b/me= ta-ti-bsp/recipes-graphics/mesa/mesa-gl_23.%.bbappend deleted file mode 100644 index 912e9e9d..00000000 --- a/meta-ti-bsp/recipes-graphics/mesa/mesa-gl_23.%.bbappend +++ /dev/null @@ -1 +0,0 @@ -require ${@bb.utils.contains_any('PREFERRED_PROVIDER_virtual/gpudriver',= 'ti-img-rogue-driver ti-sgx-ddk-km', 'pvr-mesa.inc', '', d)} diff --git a/meta-ti-bsp/recipes-graphics/mesa/pvr-mesa.inc b/meta-ti-bsp= /recipes-graphics/mesa/mesa-pvr_22.3.5.bb similarity index 88% rename from meta-ti-bsp/recipes-graphics/mesa/pvr-mesa.inc rename to meta-ti-bsp/recipes-graphics/mesa/mesa-pvr_22.3.5.bb index caf94156..0de3cb94 100644 --- a/meta-ti-bsp/recipes-graphics/mesa/pvr-mesa.inc +++ b/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr_22.3.5.bb @@ -2,11 +2,13 @@ # upstream yet. This allows us to build the shims we need without comple= tely # clobbering mesa. =20 -FILESEXTRAPATHS:prepend :=3D "${THISDIR}/files:" +require recipes-graphics/mesa/mesa.inc + +SUMMARY +=3D " (with PowerVR support for TI platforms)" =20 LIC_FILES_CHKSUM =3D "file://docs/license.rst;md5=3D63779ec98d78d823a9dc= 533a0735ef10" =20 -BRANCH =3D "powervr/kirkstone/22.3.5" +BRANCH =3D "powervr/kirkstone/${PV}" =20 SRC_URI =3D " \ git://gitlab.freedesktop.org/StaticRocket/mesa.git;protocol=3Dhttps;= branch=3D${BRANCH} \ @@ -38,7 +40,6 @@ PACKAGECONFIG:remove =3D "xvmc" PACKAGECONFIG[xvmc] =3D "" =20 PACKAGE_ARCH =3D "${MACHINE_ARCH}" -PV =3D "22.3.5+pvr" =20 GALLIUMDRIVERS:append =3D "${@bb.utils.contains('PACKAGECONFIG', 'pvr', = ',pvr', '', d)}" GALLIUMDRIVERS:append =3D "${@bb.utils.contains('PACKAGECONFIG', 'sgx', = ',sgx', '', d)}" @@ -50,6 +51,7 @@ do_install:append () { rm -rf ${D}${datadir}/pkgconfig } =20 -FILES:mesa-vulkan-drivers +=3D " ${libdir}/libpvr_mesa_wsi.so" +FILES:${PN}-dev +=3D "${datadir}/mesa/wayland-drm.xml" +FILES:mesa-vulkan-drivers +=3D "${libdir}/libpvr_mesa_wsi.so" =20 RRECOMMENDS:mesa-megadriver:append:class-target =3D " ${@d.getVar('PREFE= RRED_PROVIDER_virtual/gpudriver')}" diff --git a/meta-ti-bsp/recipes-graphics/mesa/mesa_23.%.bbappend b/meta-= ti-bsp/recipes-graphics/mesa/mesa_23.%.bbappend deleted file mode 100644 index 912e9e9d..00000000 --- a/meta-ti-bsp/recipes-graphics/mesa/mesa_23.%.bbappend +++ /dev/null @@ -1 +0,0 @@ -require ${@bb.utils.contains_any('PREFERRED_PROVIDER_virtual/gpudriver',= 'ti-img-rogue-driver ti-sgx-ddk-km', 'pvr-mesa.inc', '', d)} --=20 2.25.1 |
|
|
|
Re: [master/kirkstone][RFC PATCH] conf: machine: include: k3 enable fit signing for uboot
Denys Dmytriyenko
On Thu, May 11, 2023 at 01:20:08PM -0300, Ricardo Salveti wrote:
On Thu, May 11, 2023 at 12:48 PM Denys Dmytriyenko <denis@...> wrote:I know, and that is fine for development, but not so much for production -FIT_GENERATE_KEYS set to 1 forces the key to be automatically that is why I asked for docs/instructions for someone to deploy their own keys and disable autogeneration. -- Denys |
|
|
|
Re: [master/kirkstone][RFC PATCH] conf: machine: include: k3 enable fit signing for uboot
Ricardo Salveti
On Thu, May 11, 2023 at 12:48 PM Denys Dmytriyenko <denis@...> wrote:
FIT_GENERATE_KEYS set to 1 forces the key to be automatically generated by openembedded-core/meta/classes/uboot-sign.bbclass, so they are created during build time. Cheers, -- Ricardo Salveti |
|
|
|
Re: [master/kirkstone][RFC PATCH] conf: machine: include: k3 enable fit signing for uboot
Ricardo Salveti
On Thu, May 11, 2023 at 3:24 AM Manorit Chawdhry via
lists.yoctoproject.org <m-chawdhry=ti.com@...> wrote: I think it is better to make this decision a bit more flexible by using ?= instead of a hard set, since distros might not want to use automatically generated keys (and keys with a different name as well). Cheers, -- Ricardo Salveti |
|
|
|
Re: [master/kirkstone][RFC PATCH] conf: machine: include: k3 enable fit signing for uboot
Denys Dmytriyenko
On Thu, May 11, 2023 at 11:54:00AM +0530, Manorit Chawdhry via lists.yoctoproject.org wrote:
Signed-off-by: Manorit Chawdhry <m-chawdhry@...>How are the keys get into there? Are there extra docs/instructions? +FIT_GENERATE_KEYS = "1" |
|
|
|
Re: [master/kirkstone][PATCH] ti-img-rogue-driver: enable bxs/8xe apm
Denys Dmytriyenko
On Thu, May 11, 2023 at 10:14:18AM -0500, Randolph Sapp wrote:
On 5/8/23 10:47, Bajjuri, Praneeth wrote:meta-ti and meta-arago patches are handled by the YP Patchwork, which isPoint me to a public mirror of our patchworks instance then. :) public: https://patchwork.yoctoproject.org/ But LPR is inherently internal, AFAIK... -- Denys |
|
|
|
Re: check-layer failures for meta-ti
Denys Dmytriyenko
On Thu, May 11, 2023 at 04:50:39PM +0200, Alexandre Belloni wrote:
Hello,Yes, I have necessary patches I'm about to send out. On 02/05/2023 15:47:43-0400, Denys Dmytriyenko wrote:On Tue, May 02, 2023 at 05:17:54PM +0200, Alexandre Belloni via lists.yoctoproject.org wrote:Hello,Yeah, I think I know what's going on and it's a bit more complicated... I'll |
|
|
|
Re: [master/kirkstone][PATCH] ti-img-rogue-driver: enable bxs/8xe apm
On 5/8/23 10:47, Bajjuri, Praneeth wrote:
On 5/8/2023 10:38 AM, Randolph Sapp via lists.yoctoproject.org wrote:Point me to a public mirror of our patchworks instance then. :)On 5/8/23 10:33, rs@... wrote:Internal link :)From: Randolph Sapp <rs@...>Please note, this will break kernel 5.10 support until the following patch set is merged:
|
|
|
|
Re: check-layer failures for meta-ti
Alexandre Belloni
Hello,
toggle quoted message
Show quoted text
Did you make any progress? The plan is to disable testing meta-ti next week if this isn't fixed by then. On 02/05/2023 15:47:43-0400, Denys Dmytriyenko wrote:
On Tue, May 02, 2023 at 05:17:54PM +0200, Alexandre Belloni via lists.yoctoproject.org wrote:Hello,Yeah, I think I know what's going on and it's a bit more complicated... I'll --
Alexandre Belloni, co-owner and COO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com |
|
|
|
[master/kirkstone][RFC PATCH] conf: machine: include: k3 enable fit signing for uboot
Manorit Chawdhry
Signed-off-by: Manorit Chawdhry <m-chawdhry@...>
--- To: Ryan Eatmon <reatmon@...> To: Denys Dmytriyenko <denys@...> Cc: meta-ti@... Cc: Vignesh Raghavendra <vigneshr@...> Cc: Praneeth Bajjuri <praneeth@...> Cc: Udit Kumar <u-kumar1@...> Cc: Andrew Davis <afd@...> Cc: Kamlesh Gurudasani <kamlesh@...> --- meta-ti-bsp/conf/machine/include/k3.inc | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/meta-ti-bsp/conf/machine/include/k3.inc b/meta-ti-bsp/conf/machine/include/k3.inc index fff1550564b3..ab7e45a8016f 100644 --- a/meta-ti-bsp/conf/machine/include/k3.inc +++ b/meta-ti-bsp/conf/machine/include/k3.inc @@ -31,6 +31,12 @@ SPL_BINARY = "tispl.bin" SPL_BINARYNAME = "tispl.bin" UBOOT_SUFFIX = "img" +UBOOT_SIGN_ENABLE = "1" +UBOOT_MKIMAGE_DTCOPTS = "-I dts -O dtb" +UBOOT_SIGN_KEYNAME = "uboot_signing_dev_key" +UBOOT_SIGN_KEYDIR = "${DEPLOY_DIR_IMAGE}/u-boot-keys" +FIT_GENERATE_KEYS = "1" + EXTRA_IMAGEDEPENDS += "virtual/bootloader" TFA_PLATFORM = "k3" --- base-commit: a9b35f1e7c3a7746fb4f6807166bcb27ba9ca5eb change-id: 20230509-b4-k3-fit-signing-316ca2af859c Best regards, -- Manorit Chawdhry <m-chawdhry@...> |
|
|
|
Re: [kirkstone-next][PATCH] meta-ti: conf: am62xx-lp-evm: Fix DT and DT prefixes
Aradhya Bhatia
Hi Denys
Thank you for reviewing the patch. On 06-May-23 07:10, Denys Dmytriyenko wrote: Couple minor comments regarding the subject tags:Yup, noted! 2. We want to keep master up-to-date and in most cases the change is quiteUnderstood! This patch was tested for kirkstone, but not for master branch. After your comment, I checked, and this patch does apply cleanly on master as well. However, I have not been able to find proper configs for oe-layer setup for the master branch, and manually changing the kirkstone config to point to master did not help either. Do you have any suggestions on how I could test the patch on master? Regards Aradhya
|
|
|