|
Re: [master][PATCH 1/4] meta-ti: rename j7-evm to j721e-evm
Andrew Davis
On 3/25/22 2:23 PM, Denys Dmytriyenko wrote:
On Fri, Mar 25, 2022 at 01:41:48PM -0500, Andrew F. Davis via lists.yoctoproject.org wrote:In many places we use "j7" the family when we should be using aHeh, I was actually thinking of finally making such change myself lately! :) There are also some external docs on this that need updated but I can take a lead on that. Signed-off-by: Andrew Davis <afd@...>I looked over the changes in both patchsets and they seem fine. Thanks, that would be good, I have to admit my setup is not all the way back together yet so my testing here was very limited.. Andrew ---
|
|
|
|
Re: [master][PATCH 1/4] meta-ti: rename j7-evm to j721e-evm
Denys Dmytriyenko
On Fri, Mar 25, 2022 at 01:41:48PM -0500, Andrew F. Davis via lists.yoctoproject.org wrote:
In many places we use "j7" the family when we should be using aHeh, I was actually thinking of finally making such change myself lately! :) My main concern was about breaking downstream users of meta-ti who builds on top of j7-evm platform. But it is probably a good time to get it into master now, as recent layer restructuring already required downstream changes and adjustments. Signed-off-by: Andrew Davis <afd@...>I looked over the changes in both patchsets and they seem fine. I'm going to do a quick test locally though. ----- Regards, Denys Dmytriyenko <denis@...> PGP: 0x420902729A92C964 - https://denix.org/0x420902729A92C964 Fingerprint: 25FC E4A5 8A72 2F69 1186 6D76 4209 0272 9A92 C964
|
|
|
|
[master][PATCH 3/4] ti-img-rogue-umlibs: only the j721e SoC is currently supported
Andrew Davis
There are now three SoCs in the J7 family, but only the j721e variant
is currently supported. Be specific here. Signed-off-by: Andrew Davis <afd@...> --- .../libgles/ti-img-rogue-umlibs_1.13.5776728.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-ti-bsp/recipes-graphics/libgles/ti-img-rogue-umlibs_1.13.5776728.bb b/meta-ti-bsp/recipes-graphics/libgles/ti-img-rogue-umlibs_1.13.5776728.bb index f54c3ee9..18b36fbb 100644 --- a/meta-ti-bsp/recipes-graphics/libgles/ti-img-rogue-umlibs_1.13.5776728.bb +++ b/meta-ti-bsp/recipes-graphics/libgles/ti-img-rogue-umlibs_1.13.5776728.bb @@ -8,7 +8,7 @@ inherit features_check REQUIRED_MACHINE_FEATURES = "gpu" PACKAGE_ARCH = "${MACHINE_ARCH}" -COMPATIBLE_MACHINE = "j7" +COMPATIBLE_MACHINE = "j721e" PR = "r3" -- 2.17.1
|
|
|
|
[master][PATCH 4/4] ti-sgx-ddk-um: only the am65xx member of the k3 family is supported
Andrew Davis
The AM65xx is the only member of the K3 family with an SGX GPU.
Be specific here to avoid confusion. Signed-off-by: Andrew Davis <afd@...> --- .../recipes-graphics/libgles/ti-sgx-ddk-um_1.17.4948957.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-ti-bsp/recipes-graphics/libgles/ti-sgx-ddk-um_1.17.4948957.bb b/meta-ti-bsp/recipes-graphics/libgles/ti-sgx-ddk-um_1.17.4948957.bb index d4b7a1a6..f4c71d25 100644 --- a/meta-ti-bsp/recipes-graphics/libgles/ti-sgx-ddk-um_1.17.4948957.bb +++ b/meta-ti-bsp/recipes-graphics/libgles/ti-sgx-ddk-um_1.17.4948957.bb @@ -8,7 +8,7 @@ inherit features_check REQUIRED_MACHINE_FEATURES = "gpu" PACKAGE_ARCH = "${MACHINE_ARCH}" -COMPATIBLE_MACHINE = "ti33x|ti43x|omap-a15|k3" +COMPATIBLE_MACHINE = "ti33x|ti43x|omap-a15|am65xx" PR = "r37" @@ -20,7 +20,7 @@ SRCREV = "742cf38aba13e1ba1a910cf1f036a1a212c263b6" TARGET_PRODUCT:omap-a15 = "jacinto6evm" TARGET_PRODUCT:ti33x = "ti335x" TARGET_PRODUCT:ti43x = "ti437x" -TARGET_PRODUCT:k3 = "ti654x" +TARGET_PRODUCT:am65xx = "ti654x" INITSCRIPT_NAME = "rc.pvr" INITSCRIPT_PARAMS = "defaults 8" -- 2.17.1
|
|
|
|
[master][PATCH 1/4] meta-ti: rename j7-evm to j721e-evm
Andrew Davis
In many places we use "j7" the family when we should be using a
specific SoC or EVM and vice-versa. For instance when including graphics drivers we add for all "j7" family, but what we really want is only for some specific j7 SoC. First step in untangling this is to make it clear that there is no SoC called j7. There is a SoC called j721e with a j721e-evm. Fix up this naming here. Signed-off-by: Andrew Davis <afd@...> --- .../machine/{j7-evm-k3r5.conf => j721e-evm-k3r5.conf} | 4 ++-- meta-ti-bsp/conf/machine/{j7-evm.conf => j721e-evm.conf} | 4 ++-- ...s-evm-k3r5-sr1-1.conf => j721e-hs-evm-k3r5-sr1-1.conf} | 6 +++--- .../{j7-hs-evm-k3r5.conf => j721e-hs-evm-k3r5.conf} | 4 ++-- .../conf/machine/{j7-hs-evm.conf => j721e-hs-evm.conf} | 8 ++++---- meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb | 6 +++--- .../trusted-firmware-a/trusted-firmware-a_%.bbappend | 2 +- meta-ti-bsp/recipes-security/optee/optee-os_%.bbappend | 2 +- meta-ti-bsp/recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb | 2 +- 9 files changed, 19 insertions(+), 19 deletions(-) rename meta-ti-bsp/conf/machine/{j7-evm-k3r5.conf => j721e-evm-k3r5.conf} (63%) rename meta-ti-bsp/conf/machine/{j7-evm.conf => j721e-evm.conf} (82%) rename meta-ti-bsp/conf/machine/{j7-hs-evm-k3r5-sr1-1.conf => j721e-hs-evm-k3r5-sr1-1.conf} (53%) rename meta-ti-bsp/conf/machine/{j7-hs-evm-k3r5.conf => j721e-hs-evm-k3r5.conf} (67%) rename meta-ti-bsp/conf/machine/{j7-hs-evm.conf => j721e-hs-evm.conf} (79%) diff --git a/meta-ti-bsp/conf/machine/j7-evm-k3r5.conf b/meta-ti-bsp/conf/machine/j721e-evm-k3r5.conf similarity index 63% rename from meta-ti-bsp/conf/machine/j7-evm-k3r5.conf rename to meta-ti-bsp/conf/machine/j721e-evm-k3r5.conf index b9e8cc01..070bf7aa 100644 --- a/meta-ti-bsp/conf/machine/j7-evm-k3r5.conf +++ b/meta-ti-bsp/conf/machine/j721e-evm-k3r5.conf @@ -1,6 +1,6 @@ #@TYPE: Machine -#@NAME: J7 EVM (R5F) -#@DESCRIPTION: Machine configuration for the TI J7 EVM (R5F core) +#@NAME: J721e EVM (R5F) +#@DESCRIPTION: Machine configuration for the TI J721e EVM (R5F core) require conf/machine/include/k3r5.inc diff --git a/meta-ti-bsp/conf/machine/j7-evm.conf b/meta-ti-bsp/conf/machine/j721e-evm.conf similarity index 82% rename from meta-ti-bsp/conf/machine/j7-evm.conf rename to meta-ti-bsp/conf/machine/j721e-evm.conf index 267a5e14..12d4fecb 100644 --- a/meta-ti-bsp/conf/machine/j7-evm.conf +++ b/meta-ti-bsp/conf/machine/j721e-evm.conf @@ -1,6 +1,6 @@ #@TYPE: Machine -#@NAME: J7 EVM -#@DESCRIPTION: Machine configuration for the TI J7 EVM +#@NAME: J721e EVM +#@DESCRIPTION: Machine configuration for the TI J721e EVM require conf/machine/include/j7.inc diff --git a/meta-ti-bsp/conf/machine/j7-hs-evm-k3r5-sr1-1.conf b/meta-ti-bsp/conf/machine/j721e-hs-evm-k3r5-sr1-1.conf similarity index 53% rename from meta-ti-bsp/conf/machine/j7-hs-evm-k3r5-sr1-1.conf rename to meta-ti-bsp/conf/machine/j721e-hs-evm-k3r5-sr1-1.conf index 73f5afd6..6e809f46 100644 --- a/meta-ti-bsp/conf/machine/j7-hs-evm-k3r5-sr1-1.conf +++ b/meta-ti-bsp/conf/machine/j721e-hs-evm-k3r5-sr1-1.conf @@ -1,10 +1,10 @@ #@TYPE: Machine -#@NAME: J7 SR1.1 HS EVM (R5F) -#@DESCRIPTION: Machine configuration for the TI J7 SR1.1 HS EVM (R5F core) +#@NAME: J721e SR1.1 HS EVM (R5F) +#@DESCRIPTION: Machine configuration for the TI J721e SR1.1 HS EVM (R5F core) # Booting SR1.1 requires different SYSFW, the rest is handled at runtime -require conf/machine/j7-hs-evm-k3r5.conf +require conf/machine/j721e-hs-evm-k3r5.conf SOC_FAMILY:append = ":k3r5-sr1-1" SYSFW_SOC = "j721e_sr1_1" diff --git a/meta-ti-bsp/conf/machine/j7-hs-evm-k3r5.conf b/meta-ti-bsp/conf/machine/j721e-hs-evm-k3r5.conf similarity index 67% rename from meta-ti-bsp/conf/machine/j7-hs-evm-k3r5.conf rename to meta-ti-bsp/conf/machine/j721e-hs-evm-k3r5.conf index 53a7016f..80f3b969 100644 --- a/meta-ti-bsp/conf/machine/j7-hs-evm-k3r5.conf +++ b/meta-ti-bsp/conf/machine/j721e-hs-evm-k3r5.conf @@ -1,6 +1,6 @@ #@TYPE: Machine -#@NAME: J7 HS EVM (R5F) -#@DESCRIPTION: Machine configuration for the TI J7 HS EVM (R5F core) +#@NAME: J721e HS EVM (R5F) +#@DESCRIPTION: Machine configuration for the TI J721e HS EVM (R5F core) require conf/machine/include/k3r5.inc diff --git a/meta-ti-bsp/conf/machine/j7-hs-evm.conf b/meta-ti-bsp/conf/machine/j721e-hs-evm.conf similarity index 79% rename from meta-ti-bsp/conf/machine/j7-hs-evm.conf rename to meta-ti-bsp/conf/machine/j721e-hs-evm.conf index f2e3ccf5..433863dd 100644 --- a/meta-ti-bsp/conf/machine/j7-hs-evm.conf +++ b/meta-ti-bsp/conf/machine/j721e-hs-evm.conf @@ -1,8 +1,8 @@ #@TYPE: Machine -#@NAME: J7 HS EVM -#@DESCRIPTION: Machine configuration for the TI J7 HS EVM +#@NAME: J721e HS EVM +#@DESCRIPTION: Machine configuration for the TI J721e HS EVM -require conf/machine/j7-evm.conf +require conf/machine/j721e-evm.conf UBOOT_MACHINE = "j721e_hs_evm_a72_defconfig" @@ -22,7 +22,7 @@ IMAGE_BOOT_FILES = "${UBOOT_BINARY}" BBMULTICONFIG += "k3r5-sr1-1" # Use default IMAGE_BOOT_FILES_LEGACY files -# Since default sysfw.itb on J7 is for SR1.1, add a version for SR1.0 +# Since default sysfw.itb on J721e is for SR1.1, add a version for SR1.0 IMAGE_BOOT_FILES += "sysfw-j721e-evm.itb" do_image_wic[mcdepends] += "mc::k3r5-sr1-1:ti-sci-fw:do_deploy" do_image_tar[mcdepends] += "mc::k3r5-sr1-1:ti-sci-fw:do_deploy" diff --git a/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb b/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb index 3d50b112..33333e3c 100644 --- a/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb +++ b/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb @@ -23,9 +23,9 @@ SYSFW_SOC ?= "unknown" SYSFW_CONFIG ?= "unknown" SYSFW_PREFIX = "ti-sci-firmware" -SYSFW_PREFIX:j7-evm-k3r5 = "ti-fs-firmware" -SYSFW_PREFIX:j7-hs-evm-k3r5 = "ti-fs-firmware" -SYSFW_PREFIX:j7-hs-evm-k3r5-sr1-1 = "ti-fs-firmware" +SYSFW_PREFIX:j721e-evm-k3r5 = "ti-fs-firmware" +SYSFW_PREFIX:j721e-hs-evm-k3r5 = "ti-fs-firmware" +SYSFW_PREFIX:j721e-hs-evm-k3r5-sr1-1 = "ti-fs-firmware" SYSFW_PREFIX:j7200-evm-k3r5 = "ti-fs-firmware" SYSFW_PREFIX:j7200-hs-evm-k3r5 = "ti-fs-firmware" SYSFW_PREFIX:j721s2-evm-k3r5 = "ti-fs-firmware" 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-firmware-a_%.bbappend index 581f7454..35cb9c95 100644 --- a/meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend +++ b/meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend @@ -26,7 +26,7 @@ do_compile:append:am64xx-hs-evm() { ) } -do_compile:append:j7-hs-evm() { +do_compile:append:j721e-hs-evm() { export TI_SECURE_DEV_PKG=${TI_SECURE_DEV_PKG} ( cd ${BUILD_DIR}; \ mv bl31.bin bl31.bin.unsigned; \ diff --git a/meta-ti-bsp/recipes-security/optee/optee-os_%.bbappend b/meta-ti-bsp/recipes-security/optee/optee-os_%.bbappend index f1d7fc9a..f9660bfe 100644 --- a/meta-ti-bsp/recipes-security/optee/optee-os_%.bbappend +++ b/meta-ti-bsp/recipes-security/optee/optee-os_%.bbappend @@ -55,7 +55,7 @@ do_compile:append:am64xx-hs-evm() { optee_sign_k3hs } -do_compile:append:j7-hs-evm() { +do_compile:append:j721e-hs-evm() { optee_sign_k3hs } diff --git a/meta-ti-bsp/recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb b/meta-ti-bsp/recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb index 8aa823cc..03408528 100644 --- a/meta-ti-bsp/recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb +++ b/meta-ti-bsp/recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb @@ -49,7 +49,7 @@ LEGACY_DM_FW_DIR = "${D}${nonarch_base_libdir}/firmware/pdk-ipc/" DM_FIRMWARE = "ipc_echo_testb_mcu1_0_release_strip.xer5f" # J7 HS support -do_install:prepend:j7-hs-evm() { +do_install:prepend:j721e-hs-evm() { export TI_SECURE_DEV_PKG=${TI_SECURE_DEV_PKG} ( cd ${RTOS_DM_FW_DIR}; \ mv ${DM_FIRMWARE} ${DM_FIRMWARE}.unsigned; \ -- 2.17.1
|
|
|
|
[master][PATCH 2/4] meta-ti-bsp: add SoC families for the J7 SoCs
Andrew Davis
This allows us to be more specific around what SoCs we support and
lets us add features based on the SoC family not just at the EVM or whole J7family level. Signed-off-by: Andrew Davis <afd@...> --- meta-ti-bsp/conf/machine/include/j7200.inc | 2 ++ meta-ti-bsp/conf/machine/include/j721e.inc | 4 ++++ meta-ti-bsp/conf/machine/include/j721s2.inc | 2 ++ meta-ti-bsp/conf/machine/j7200-evm.conf | 2 +- meta-ti-bsp/conf/machine/j721e-evm.conf | 4 +--- meta-ti-bsp/conf/machine/j721s2-evm.conf | 2 +- 6 files changed, 11 insertions(+), 5 deletions(-) create mode 100644 meta-ti-bsp/conf/machine/include/j7200.inc create mode 100644 meta-ti-bsp/conf/machine/include/j721e.inc create mode 100644 meta-ti-bsp/conf/machine/include/j721s2.inc diff --git a/meta-ti-bsp/conf/machine/include/j7200.inc b/meta-ti-bsp/conf/machine/include/j7200.inc new file mode 100644 index 00000000..ce88567c --- /dev/null +++ b/meta-ti-bsp/conf/machine/include/j7200.inc @@ -0,0 +1,2 @@ +require conf/machine/include/j7.inc +SOC_FAMILY:append = ":j7200" diff --git a/meta-ti-bsp/conf/machine/include/j721e.inc b/meta-ti-bsp/conf/machine/include/j721e.inc new file mode 100644 index 00000000..d965327c --- /dev/null +++ b/meta-ti-bsp/conf/machine/include/j721e.inc @@ -0,0 +1,4 @@ +require conf/machine/include/j7.inc +SOC_FAMILY:append = ":j721e" + +MACHINE_FEATURES += "gpu" diff --git a/meta-ti-bsp/conf/machine/include/j721s2.inc b/meta-ti-bsp/conf/machine/include/j721s2.inc new file mode 100644 index 00000000..113f86c4 --- /dev/null +++ b/meta-ti-bsp/conf/machine/include/j721s2.inc @@ -0,0 +1,2 @@ +require conf/machine/include/j7.inc +SOC_FAMILY:append = ":j721s2" diff --git a/meta-ti-bsp/conf/machine/j7200-evm.conf b/meta-ti-bsp/conf/machine/j7200-evm.conf index 2565c90c..175d30f8 100644 --- a/meta-ti-bsp/conf/machine/j7200-evm.conf +++ b/meta-ti-bsp/conf/machine/j7200-evm.conf @@ -2,7 +2,7 @@ #@NAME: J7200 EVM #@DESCRIPTION: Machine configuration for the TI J7200 EVM -require conf/machine/include/j7.inc +require conf/machine/include/j7200.inc SERIAL_CONSOLES = "115200;ttyS2 115200;ttyS3" SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" diff --git a/meta-ti-bsp/conf/machine/j721e-evm.conf b/meta-ti-bsp/conf/machine/j721e-evm.conf index 12d4fecb..fe28e6f5 100644 --- a/meta-ti-bsp/conf/machine/j721e-evm.conf +++ b/meta-ti-bsp/conf/machine/j721e-evm.conf @@ -2,9 +2,7 @@ #@NAME: J721e EVM #@DESCRIPTION: Machine configuration for the TI J721e EVM -require conf/machine/include/j7.inc - -MACHINE_FEATURES += "gpu" +require conf/machine/include/j721e.inc SERIAL_CONSOLES = "115200;ttyS2 115200;ttyS3" SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" diff --git a/meta-ti-bsp/conf/machine/j721s2-evm.conf b/meta-ti-bsp/conf/machine/j721s2-evm.conf index 82fd33da..a2c15f74 100644 --- a/meta-ti-bsp/conf/machine/j721s2-evm.conf +++ b/meta-ti-bsp/conf/machine/j721s2-evm.conf @@ -2,7 +2,7 @@ #@NAME: J721S2 EVM #@DESCRIPTION: Machine configuration for the TI J721S2 EVM -require conf/machine/include/j7.inc +require conf/machine/include/j721s2.inc SERIAL_CONSOLES = "115200;ttyS10" SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" -- 2.17.1
|
|
|
|
Re: [dunfell][PATCH v3] machine: Add am62xx evm configuration
Andrew Davis
On 3/24/22 5:21 PM, Ryan Eatmon via lists.yoctoproject.org wrote:
@@ -167,6 +182,10 @@ ALTERNATIVE_${PN}_am64xx = "\ ^^ Looks like some tabs found there way in here.. Why do we have these indented so far anyway, this whole file has wacky indenting, needs normalized. Andrew + "
|
|
|
|
[dunfell][PATCH v3] machine: Add am62xx evm configuration
Ryan Eatmon
From: Nishanth Menon <nm@...>
Lets add the basic AM62xx-evm configuration. Signed-off-by: Nishanth Menon <nm@...> Signed-off-by: Hari Nagalla <hnagalla@...> Signed-off-by: Ryan Eatmon <reatmon@...> --- v2: Removed ti-graphics patch, and removed lpm-demo patches. v3: Squashed and cleaned up the previous patches. conf/machine/am62xx-evm-k3r5.conf | 11 +++++++++ conf/machine/am62xx-evm.conf | 13 ++++++++++ conf/machine/include/am62xx.inc | 17 +++++++++++++ recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb | 18 ++++++++++++++ recipes-bsp/u-boot/u-boot-ti.inc | 7 ++++++ recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb | 28 ++++++++++++++++++++++ 6 files changed, 94 insertions(+) create mode 100644 conf/machine/am62xx-evm-k3r5.conf create mode 100644 conf/machine/am62xx-evm.conf create mode 100644 conf/machine/include/am62xx.inc diff --git a/conf/machine/am62xx-evm-k3r5.conf b/conf/machine/am62xx-evm-k3r5.conf new file mode 100644 index 00000000..724a8d4a --- /dev/null +++ b/conf/machine/am62xx-evm-k3r5.conf @@ -0,0 +1,11 @@ +#@TYPE: Machine +#@NAME: AM62XX EVM (R5F) +#@DESCRIPTION: Machine configuration for the TI AM62xx EVM (R5F core) + +require conf/machine/include/k3r5.inc + +SYSFW_SOC = "am62x" +SYSFW_CONFIG = "evm" +SYSFW_SUFFIX = "gp" + +UBOOT_MACHINE = "am62x_evm_r5_defconfig" diff --git a/conf/machine/am62xx-evm.conf b/conf/machine/am62xx-evm.conf new file mode 100644 index 00000000..600abb58 --- /dev/null +++ b/conf/machine/am62xx-evm.conf @@ -0,0 +1,13 @@ +#@TYPE: Machine +#@NAME: AM62XX EVM +#@DESCRIPTION: Machine configuration for the TI AM62XX EVM + +require conf/machine/include/am62xx.inc + +KERNEL_DEVICETREE = " \ + ti/k3-am625-sk.dtb \ + ti/k3-am625-sk-lpmdemo.dtb \ + ti/k3-am625-minimal.dtb \ +" + +UBOOT_MACHINE = "am62x_evm_a53_defconfig" diff --git a/conf/machine/include/am62xx.inc b/conf/machine/include/am62xx.inc new file mode 100644 index 00000000..e8823dd2 --- /dev/null +++ b/conf/machine/include/am62xx.inc @@ -0,0 +1,17 @@ +require conf/machine/include/k3.inc +SOC_FAMILY_append = ":am62xx" + +MACHINE_FEATURES += "screen touchscreen" + +SERIAL_CONSOLES = "115200;ttyS2" +SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" + +# AM62 supports multi-certificate images, use the same +IMAGE_BOOT_FILES = "${IMAGE_BOOT_FILES_MULTI_CERT}" + +do_image_wic[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy" +do_image_tar[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy" + +TFA_BOARD = "lite" +OPTEEMACHINE = "k3-am65x" +OPTEEOUTPUTMACHINE = "k3" 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 646833a7..099473b4 100644 --- a/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb +++ b/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb @@ -6,6 +6,7 @@ DEPENDS_append_j7200-hs-evm-k3r5 = " virtual/bootloader" DEPENDS_append_j721s2-evm-k3r5 = " virtual/bootloader" DEPENDS_append_am64xx-evm-k3r5 = " virtual/bootloader" DEPENDS_append_am64xx-hs-evm-k3r5 = " virtual/bootloader" +DEPENDS_append_am62xx-evm-k3r5 = " virtual/bootloader" CLEANBROKEN = "1" PR = "${INC_PR}.2" @@ -29,6 +30,7 @@ SYSFW_PREFIX_j7-hs-evm-k3r5-sr1-1 = "ti-fs-firmware" SYSFW_PREFIX_j7200-evm-k3r5 = "ti-fs-firmware" SYSFW_PREFIX_j7200-hs-evm-k3r5 = "ti-fs-firmware" SYSFW_PREFIX_j721s2-evm-k3r5 = "ti-fs-firmware" +SYSFW_PREFIX_am62xx-evm-k3r5 = "ti-fs-firmware" SYSFW_SUFFIX ?= "unknown" @@ -63,6 +65,7 @@ EXTRA_OEMAKE_append_j7200-hs-evm-k3r5 = " SBL="${STAGING_DIR_HOST}/boot/u-boot-s EXTRA_OEMAKE_append_j721s2-evm-k3r5 = " SBL="${STAGING_DIR_HOST}/boot/u-boot-spl.bin"" EXTRA_OEMAKE_append_am64xx-evm-k3r5 = " SBL="${STAGING_DIR_HOST}/boot/u-boot-spl.bin"" EXTRA_OEMAKE_append_am64xx-hs-evm-k3r5 = " SBL="${STAGING_DIR_HOST}/boot/u-boot-spl.bin"" +EXTRA_OEMAKE_append_am62xx-evm-k3r5 = " SBL="${STAGING_DIR_HOST}/boot/u-boot-spl.bin"" do_compile() { cd ${WORKDIR}/imggen/ @@ -170,4 +173,19 @@ do_deploy_am64xx-hs-evm-k3r5() { install -m 644 ${SYSFW_TISCI} ${DEPLOYDIR}/ } +do_install_am62xx-evm-k3r5() { + install -d ${D}/boot + install -m 644 ${WORKDIR}/imggen/${UBOOT_BINARY} ${D}/boot/${UBOOT_IMAGE} + ln -sf ${UBOOT_IMAGE} ${D}/boot/${UBOOT_SYMLINK} + ln -sf ${UBOOT_IMAGE} ${D}/boot/${UBOOT_BINARY} +} + +do_deploy_am62xx-evm-k3r5() { + install -d ${DEPLOYDIR} + install -m 644 ${WORKDIR}/imggen/${UBOOT_BINARY} ${DEPLOYDIR}/${UBOOT_IMAGE} + ln -sf ${UBOOT_IMAGE} ${DEPLOYDIR}/${UBOOT_SYMLINK} + ln -sf ${UBOOT_IMAGE} ${DEPLOYDIR}/${UBOOT_BINARY} + install -m 644 ${SYSFW_TISCI} ${DEPLOYDIR}/ +} + addtask deploy before do_build after do_compile diff --git a/recipes-bsp/u-boot/u-boot-ti.inc b/recipes-bsp/u-boot/u-boot-ti.inc index 7ed6c5b4..231b7647 100644 --- a/recipes-bsp/u-boot/u-boot-ti.inc +++ b/recipes-bsp/u-boot/u-boot-ti.inc @@ -41,6 +41,7 @@ PACKAGECONFIG[dm] = "DM=${STAGING_DIR_HOST}${nonarch_base_libdir}/firmware/pdk-i PACKAGECONFIG_append_aarch64 = " atf optee" PACKAGECONFIG_append_j7 = " dm" +PACKAGECONFIG_append_am62xx = " dm" COMPATIBLE_MACHINE = "(ti-soc)" @@ -69,6 +70,7 @@ SPL_UART_BINARY_j7200-hs-evm-k3r5 = "u-boot-spl.bin" SPL_UART_BINARY_j721s2-evm-k3r5 = "u-boot-spl.bin" SPL_UART_BINARY_am64xx-evm-k3r5 = "u-boot-spl.bin" SPL_UART_BINARY_am64xx-hs-evm-k3r5 = "u-boot-spl.bin" +SPL_UART_BINARY_am62xx-evm-k3r5 = "u-boot-spl.bin" SPL_UART_IMAGE ?= "${SPL_UART_BINARY}-${MACHINE}-${PV}-${PR}" SPL_UART_SYMLINK ?= "${SPL_UART_BINARY}-${MACHINE}" @@ -419,4 +421,9 @@ do_deploy_append_am64xx-hs-evm-k3r5 () { mv ${DEPLOYDIR}/u-boot-spl.bin ${DEPLOYDIR}/u-boot-spl-r5spl.bin || true } +do_deploy_append_am62xx-evm-k3r5 () { + mv ${DEPLOYDIR}/tiboot3.bin ${DEPLOYDIR}/tiboot3-r5spl.bin || true + mv ${DEPLOYDIR}/u-boot-spl.bin ${DEPLOYDIR}/u-boot-spl-r5spl.bin || true +} + TOOLCHAIN = "gcc" diff --git a/recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb b/recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb index c5852dbd..d219d4f0 100644 --- a/recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb +++ b/recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb @@ -19,6 +19,7 @@ PLAT_SFX_j7200-hs-evm = "j7200" PLAT_SFX_j721s2-evm = "j721s2" PLAT_SFX_am65xx = "am65xx" PLAT_SFX_am64xx = "am64xx" +PLAT_SFX_am62xx = "am62x" FILESEXTRAPATHS_prepend := "${METATIBASE}/recipes-bsp/ti-sci-fw/files/:" require recipes-bsp/ti-linux-fw/ti-linux-fw.inc @@ -77,6 +78,13 @@ do_install_prepend_am64xx() { ) } +# Update the am62xx ipc binaries to be consistent with other platforms +do_install_prepend_am62xx() { + ( cd ${RTOS_IPC_FW_DIR}; \ + mv am62-mcu-m4f0_0-fw ipc_echo_baremetal_test_mcu2_0_release_strip.xer5f; \ + ) +} + #Install all R5 & DSP ipc echo test binaries in lib/firmware/pdk-ipc, with softlinks up a level do_install() { @@ -154,6 +162,13 @@ do_install_am64xx() { install -m 0644 ${RTOS_IPC_FW_DIR}/ipc_echo_baremetal_test_mcu3_0_release_strip.xer5f ${LEGACY_IPC_FW_DIR} } +do_install_am62xx() { + install -d ${LEGACY_IPC_FW_DIR} + install -m 0644 ${RTOS_IPC_FW_DIR}/ipc_echo_baremetal_test_mcu2_0_release_strip.xer5f ${LEGACY_IPC_FW_DIR} + # DM Firmware + install -m 0644 ${RTOS_DM_FW_DIR}/ipc_echo_testb_mcu1_0_release_strip.xer5f ${LEGACY_DM_FW_DIR} +} + # Set up names for the firmwares ALTERNATIVE_${PN}_am65xx = "\ am65x-mcu-r5f0_0-fw \ @@ -167,6 +182,10 @@ ALTERNATIVE_${PN}_am64xx = "\ am64-main-r5f1_1-fw \ am64-mcu-m4f0_0-fw \ " +ALTERNATIVE_${PN}_am62xx = "\ + am62-mcu-m4f0_0-fw \ + am62-main-r5f0_0-fw \ + " ALTERNATIVE_${PN}_j7 = "\ j7-mcu-r5f0_0-fw \ @@ -216,6 +235,9 @@ TARGET_MAIN_R5FSS1_0_am64xx = "am64-main-r5f1_0-fw" TARGET_MAIN_R5FSS1_1_am64xx = "am64-main-r5f1_1-fw" TARGET_MCU_M4FSS0_0_am64xx = "am64-mcu-m4f0_0-fw" +TARGET_MAIN_R5FSS0_0_am62xx = "am62-main-r5f0_0-fw" +TARGET_MCU_M4FSS0_0_am62xx = "am62-mcu-m4f0_0-fw" + TARGET_MCU_R5FSS0_0_j7 = "j7-mcu-r5f0_0-fw" TARGET_MCU_R5FSS0_1_j7 = "j7-mcu-r5f0_1-fw" TARGET_MAIN_R5FSS0_0_j7 = "j7-main-r5f0_0-fw" @@ -254,6 +276,9 @@ ALTERNATIVE_LINK_NAME[am64-main-r5f1_0-fw] = "${base_libdir}/firmware/${TARGET_M ALTERNATIVE_LINK_NAME[am64-main-r5f1_1-fw] = "${base_libdir}/firmware/${TARGET_MAIN_R5FSS1_1}" ALTERNATIVE_LINK_NAME[am64-mcu-m4f0_0-fw] = "${base_libdir}/firmware/${TARGET_MCU_M4FSS0_0}" +ALTERNATIVE_LINK_NAME[am62-main-r5f0_0-fw] = "${base_libdir}/firmware/${TARGET_MAIN_R5FSS0_0}" +ALTERNATIVE_LINK_NAME[am62-mcu-m4f0_0-fw] = "${base_libdir}/firmware/${TARGET_MCU_M4FSS0_0}" + ALTERNATIVE_LINK_NAME[j7-mcu-r5f0_0-fw] = "${base_libdir}/firmware/${TARGET_MCU_R5FSS0_0}" ALTERNATIVE_LINK_NAME[j7-mcu-r5f0_1-fw] = "${base_libdir}/firmware/${TARGET_MCU_R5FSS0_1}" ALTERNATIVE_LINK_NAME[j7-main-r5f0_0-fw] = "${base_libdir}/firmware/${TARGET_MAIN_R5FSS0_0}" @@ -289,6 +314,9 @@ ALTERNATIVE_TARGET[am64-main-r5f1_0-fw] = "${base_libdir}/firmware/pdk-ipc/ipc_e ALTERNATIVE_TARGET[am64-main-r5f1_1-fw] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_baremetal_test_mcu2_1_release_strip.xer5f" ALTERNATIVE_TARGET[am64-mcu-m4f0_0-fw] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_baremetal_test_mcu3_0_release_strip.xer5f" +ALTERNATIVE_TARGET[am62-main-r5f0_0-fw] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_testb_mcu1_0_release_strip.xer5f" +ALTERNATIVE_TARGET[am62-mcu-m4f0_0-fw] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_baremetal_test_mcu2_0_release_strip.xer5f" + ALTERNATIVE_TARGET[j7-mcu-r5f0_0-fw] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_testb_mcu1_0_release_strip.xer5f" ALTERNATIVE_TARGET[j7-mcu-r5f0_1-fw] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_test_mcu1_1_release_strip.xer5f" ALTERNATIVE_TARGET[j7-main-r5f0_0-fw] = "${base_libdir}/firmware/ethfw/app_remoteswitchcfg_server_strip.xer5f" -- 2.17.1
|
|
|
|
[dunfell][PATCH v2] ti-graphics: gpu enable and move all platforms to ddk 1.15
Etheridge, Darren
Enable the GPU for am62xx and j721s2 and use IMG DDK 1.15
Migrate Imagination DDK 1.13 to DDK 1.15 for J721e Signed-off-by: Darren Etheridge <detheridge@...> --- No changes in the content of the patch, however I regenerated it with the similarity threshold reduced as requested by Denys. conf/machine/am62xx-evm.conf | 2 ++ conf/machine/j721s2-evm.conf | 2 ++ ...bb => ti-img-rogue-driver_1.15.6133109.bb} | 20 +++++++++++-------- ...bb => ti-img-rogue-umlibs_1.15.6133109.bb} | 13 ++++++------ 4 files changed, 23 insertions(+), 14 deletions(-) rename recipes-bsp/powervr-drivers/{ti-img-rogue-driver_1.13.5776728.bb => ti-img-rogue-driver_1.15.6133109.bb} (48%) rename recipes-graphics/libgles/{ti-img-rogue-umlibs_1.13.5776728.bb => ti-img-rogue-umlibs_1.15.6133109.bb} (84%) diff --git a/conf/machine/am62xx-evm.conf b/conf/machine/am62xx-evm.conf index 600abb58..086e40e4 100644 --- a/conf/machine/am62xx-evm.conf +++ b/conf/machine/am62xx-evm.conf @@ -4,6 +4,8 @@ require conf/machine/include/am62xx.inc +MACHINE_FEATURES += "gpu" + KERNEL_DEVICETREE = " \ ti/k3-am625-sk.dtb \ ti/k3-am625-sk-lpmdemo.dtb \ diff --git a/conf/machine/j721s2-evm.conf b/conf/machine/j721s2-evm.conf index 82fd33da..e5ed0b73 100644 --- a/conf/machine/j721s2-evm.conf +++ b/conf/machine/j721s2-evm.conf @@ -4,6 +4,8 @@ require conf/machine/include/j7.inc +MACHINE_FEATURES += "gpu" + SERIAL_CONSOLES = "115200;ttyS10" SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" TFA_K3_USART = "0x8" diff --git a/recipes-bsp/powervr-drivers/ti-img-rogue-driver_1.13.5776728.bb b/recipes-bsp/powervr-drivers/ti-img-rogue-driver_1.15.6133109.bb similarity index 48% rename from recipes-bsp/powervr-drivers/ti-img-rogue-driver_1.13.5776728.bb rename to recipes-bsp/powervr-drivers/ti-img-rogue-driver_1.15.6133109.bb index a05de0f2..fbff6c51 100644 --- a/recipes-bsp/powervr-drivers/ti-img-rogue-driver_1.13.5776728.bb +++ b/recipes-bsp/powervr-drivers/ti-img-rogue-driver_1.15.6133109.bb @@ -7,17 +7,17 @@ inherit module features_check REQUIRED_MACHINE_FEATURES = "gpu" -MACHINE_KERNEL_PR_append = "b" +MACHINE_KERNEL_PR_append = "a" PR = "${MACHINE_KERNEL_PR}" PACKAGE_ARCH = "${MACHINE_ARCH}" -COMPATIBLE_MACHINE = "j7" +COMPATIBLE_MACHINE = "j7-evm|j721s2-evm|am62xx" DEPENDS = "virtual/kernel" PROVIDES = "virtual/gpudriver" -BRANCH = "1.13-5776728/linux-k5.10" +BRANCH = "linuxws/dunfell/k5.10/${PV}" SRC_URI = " \ git://git.ti.com/graphics/ti-img-rogue-driver.git;branch=${BRANCH} \ @@ -26,15 +26,19 @@ SRC_URI = " \ S = "${WORKDIR}/git" -SRCREV = "35a25875ae8738f82c7cabc6b077ef992b0cca84" +SRCREV = "ee0674adccac16f5b2f7cb8d5d05948706080cb5" -PVR_SOC = "j721e_linux" -PVR_BVNC = "22.104.208.318" +TARGET_PRODUCT_j7-evm = "j721e_linux" +TARGET_PRODUCT_j721s2-evm = "j721s2_linux" +TARGET_PRODUCT_am62xx = "am62_linux" +TARGET_BVNC_j7-evm = "22.104.208.318" +TARGET_BVNC_j721s2-evm = "36.53.104.796" +TARGET_BVNC_am62xx = "33.15.11.3" PVR_BUILD = "release" PVR_WS = "wayland" -EXTRA_OEMAKE += 'KERNELDIR="${STAGING_KERNEL_DIR}" RGX_BVNC=${PVR_BVNC} BUILD=${PVR_BUILD} PVR_BUILD_DIR=${PVR_SOC} WINDOW_SYSTEM=${PVR_WS}' +EXTRA_OEMAKE += 'KERNELDIR="${STAGING_KERNEL_DIR}" RGX_BVNC=${TARGET_BVNC} BUILD=${PVR_BUILD} PVR_BUILD_DIR=${TARGET_PRODUCT} WINDOW_SYSTEM=${PVR_WS}' do_install() { - make -C ${STAGING_KERNEL_DIR} M=${B}/binary_${PVR_SOC}_${PVR_WS}_${PVR_BUILD}/target_aarch64/kbuild INSTALL_MOD_PATH=${D}${root_prefix} PREFIX=${STAGING_DIR_HOST} modules_install + make -C ${STAGING_KERNEL_DIR} M=${B}/binary_${TARGET_PRODUCT}_${PVR_WS}_${PVR_BUILD}/target_aarch64/kbuild INSTALL_MOD_PATH=${D}${root_prefix} PREFIX=${STAGING_DIR_HOST} modules_install } diff --git a/recipes-graphics/libgles/ti-img-rogue-umlibs_1.13.5776728.bb b/recipes-graphics/libgles/ti-img-rogue-umlibs_1.15.6133109.bb similarity index 84% rename from recipes-graphics/libgles/ti-img-rogue-umlibs_1.13.5776728.bb rename to recipes-graphics/libgles/ti-img-rogue-umlibs_1.15.6133109.bb index 5194015e..e00dce99 100644 --- a/recipes-graphics/libgles/ti-img-rogue-umlibs_1.13.5776728.bb +++ b/recipes-graphics/libgles/ti-img-rogue-umlibs_1.15.6133109.bb @@ -8,17 +8,18 @@ inherit features_check REQUIRED_MACHINE_FEATURES = "gpu" PACKAGE_ARCH = "${MACHINE_ARCH}" -COMPATIBLE_MACHINE = "j7" +COMPATIBLE_MACHINE = "j7-evm|j721s2-evm|am62xx" -PR = "r3" +PR = "r1" BRANCH = "linuxws/dunfell/k5.10/${PV}" SRC_URI = "git://git.ti.com/graphics/ti-img-rogue-umlibs.git;branch=${BRANCH}" +SRCREV = "47c3ffc44f2881397d45c8a2b5dfa7d6c58b79fb" -SRCREV = "5ef38353c38d921a65ea6df75c7b6ce710b66034" - -PVR_SOC ?= "j721e_linux" +TARGET_PRODUCT_j7-evm = "j721e_linux" +TARGET_PRODUCT_j721s2-evm = "j721s2_linux" +TARGET_PRODUCT_am62xx = "am62_linux" PVR_BUILD ?= "release" PVR_WS = "wayland" @@ -50,7 +51,7 @@ RRECOMMENDS_${PN} += "ti-img-rogue-driver" S = "${WORKDIR}/git" do_install () { - oe_runmake install DESTDIR=${D} TARGET_PRODUCT=${PVR_SOC} BUILD=${PVR_BUILD} WINDOW_SYSTEM=${PVR_WS} + oe_runmake install DESTDIR=${D} TARGET_PRODUCT=${TARGET_PRODUCT} BUILD=${PVR_BUILD} WINDOW_SYSTEM=${PVR_WS} chown -R root:root ${D} } -- 2.17.1
|
|
|
|
Re: [dunfell][PATCH] ti-graphics: gpu enable and move all platforms to ddk 1.15
Denys Dmytriyenko
On Tue, Mar 22, 2022 at 03:29:30PM -0500, Etheridge, Darren via lists.yoctoproject.org wrote:
Enable the GPU for am62xx and j721s2 and use IMG DDK 1.15Please lower the similarity threshold to produce a diff of this recipe for review, instead of separate remove/add. ...bb => ti-img-rogue-umlibs_1.15.6133109.bb} | 13 +++----- Regards, Denys Dmytriyenko <denis@...> PGP: 0x420902729A92C964 - https://denix.org/0x420902729A92C964 Fingerprint: 25FC E4A5 8A72 2F69 1186 6D76 4209 0272 9A92 C964
|
|
|
|
Re: [dunfell][PATCH v2 7/7] ti-rtos: Fix AM62x Fix MCU core numbers
Denys Dmytriyenko
On Tue, Mar 22, 2022 at 01:15:58PM -0500, Ryan Eatmon via lists.yoctoproject.org wrote:
From: Hari Nagalla <hnagalla@...>Fixes like this should probably be squashed. Signed-off-by: Hari Nagalla <hnagalla@...>-- Regards, Denys Dmytriyenko <denis@...> PGP: 0x420902729A92C964 - https://denix.org/0x420902729A92C964 Fingerprint: 25FC E4A5 8A72 2F69 1186 6D76 4209 0272 9A92 C964
|
|
|
|
Re: [dunfell][PATCH v2 5/7] ti-rtos: Add support for AM62x M4F
Denys Dmytriyenko
On Tue, Mar 22, 2022 at 01:15:56PM -0500, Ryan Eatmon via lists.yoctoproject.org wrote:
From: Hari Nagalla <hnagalla@...>Ah, I see it's being fixed later here (in patch #5)... I know this patch series has been developed internally over time and comes with a history. I wonder if this needs cleaning up during upstreaming stage. As we just discussed this outside of the list, let's figure out the process. FILESEXTRAPATHS_prepend := "${METATIBASE}/recipes-bsp/ti-sci-fw/files/:"Same fix here. install -d ${LEGACY_IPC_FW_DIR}-- Regards, Denys Dmytriyenko <denis@...> PGP: 0x420902729A92C964 - https://denix.org/0x420902729A92C964 Fingerprint: 25FC E4A5 8A72 2F69 1186 6D76 4209 0272 9A92 C964
|
|
|
|
Re: [dunfell][PATCH 00/11] Adding support for am62xx
On 11:25-20220322, Ryan Eatmon via lists.yoctoproject.org wrote:
These patches add initial recipe support for am62xx. NAK to the series. a) patches need to be cleaned up - squashed etc. b) lpm-demo binary should probably belong to meta-arago instead of meta-ti. meta-ti should be a bsp layer, not a distro. -- Regards, Nishanth Menon Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3 1A34 DDB5 849D 1736 249D
|
|
|
|
Re: [dunfell][PATCH 04/11] HACK: recipes-ti: ti-rtos-metadata: Make am62x point to am64x
On 11:25-20220322, Ryan Eatmon via lists.yoctoproject.org wrote:
From: Nishanth Menon <nm@...> NAK -> I know I authored these initial patches during silicon bringup, but please do squash and cleanup the patches prior to posting upstream. -- Regards, Nishanth Menon Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3 1A34 DDB5 849D 1736 249D
|
|
|
|
[dunfell][PATCH] ti-graphics: gpu enable and move all platforms to ddk 1.15
Etheridge, Darren
Enable the GPU for am62xx and j721s2 and use IMG DDK 1.15
Migrate Imagination DDK 1.13 to DDK 1.15 for J721e Signed-off-by: Darren Etheridge <detheridge@...> --- conf/machine/am62xx-evm.conf | 2 + conf/machine/j721s2-evm.conf | 2 + .../ti-img-rogue-driver_1.13.5776728.bb | 40 ----------------- .../ti-img-rogue-driver_1.15.6133109.bb | 44 +++++++++++++++++++ ...bb => ti-img-rogue-umlibs_1.15.6133109.bb} | 13 +++--- 5 files changed, 55 insertions(+), 46 deletions(-) delete mode 100644 recipes-bsp/powervr-drivers/ti-img-rogue-driver_1.13.5776728.bb create mode 100644 recipes-bsp/powervr-drivers/ti-img-rogue-driver_1.15.6133109.bb rename recipes-graphics/libgles/{ti-img-rogue-umlibs_1.13.5776728.bb => ti-img-rogue-umlibs_1.15.6133109.bb} (84%) diff --git a/conf/machine/am62xx-evm.conf b/conf/machine/am62xx-evm.conf index 600abb58..086e40e4 100644 --- a/conf/machine/am62xx-evm.conf +++ b/conf/machine/am62xx-evm.conf @@ -4,6 +4,8 @@ require conf/machine/include/am62xx.inc +MACHINE_FEATURES += "gpu" + KERNEL_DEVICETREE = " \ ti/k3-am625-sk.dtb \ ti/k3-am625-sk-lpmdemo.dtb \ diff --git a/conf/machine/j721s2-evm.conf b/conf/machine/j721s2-evm.conf index 82fd33da..e5ed0b73 100644 --- a/conf/machine/j721s2-evm.conf +++ b/conf/machine/j721s2-evm.conf @@ -4,6 +4,8 @@ require conf/machine/include/j7.inc +MACHINE_FEATURES += "gpu" + SERIAL_CONSOLES = "115200;ttyS10" SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" TFA_K3_USART = "0x8" diff --git a/recipes-bsp/powervr-drivers/ti-img-rogue-driver_1.13.5776728.bb b/recipes-bsp/powervr-drivers/ti-img-rogue-driver_1.13.5776728.bb deleted file mode 100644 index a05de0f2..00000000 --- a/recipes-bsp/powervr-drivers/ti-img-rogue-driver_1.13.5776728.bb +++ /dev/null @@ -1,40 +0,0 @@ -DESCRIPTION = "Kernel drivers for the PowerVR Rogue GPU found in the TI SoCs" -HOMEPAGE = "http://git.ti.com/graphics/ti-img-rogue-driver" -LICENSE = "MIT | GPLv2" -LIC_FILES_CHKSUM = "file://README;beginline=14;endline=19;md5=0403c7dea01a2b8232261e805325fac2" - -inherit module features_check - -REQUIRED_MACHINE_FEATURES = "gpu" - -MACHINE_KERNEL_PR_append = "b" -PR = "${MACHINE_KERNEL_PR}" - -PACKAGE_ARCH = "${MACHINE_ARCH}" -COMPATIBLE_MACHINE = "j7" - -DEPENDS = "virtual/kernel" - -PROVIDES = "virtual/gpudriver" - -BRANCH = "1.13-5776728/linux-k5.10" - -SRC_URI = " \ - git://git.ti.com/graphics/ti-img-rogue-driver.git;branch=${BRANCH} \ - file://0001-compiler-support-OpenEmbedded-nodistro-internal-aarc.patch \ -" - -S = "${WORKDIR}/git" - -SRCREV = "35a25875ae8738f82c7cabc6b077ef992b0cca84" - -PVR_SOC = "j721e_linux" -PVR_BVNC = "22.104.208.318" -PVR_BUILD = "release" -PVR_WS = "wayland" - -EXTRA_OEMAKE += 'KERNELDIR="${STAGING_KERNEL_DIR}" RGX_BVNC=${PVR_BVNC} BUILD=${PVR_BUILD} PVR_BUILD_DIR=${PVR_SOC} WINDOW_SYSTEM=${PVR_WS}' - -do_install() { - make -C ${STAGING_KERNEL_DIR} M=${B}/binary_${PVR_SOC}_${PVR_WS}_${PVR_BUILD}/target_aarch64/kbuild INSTALL_MOD_PATH=${D}${root_prefix} PREFIX=${STAGING_DIR_HOST} modules_install -} diff --git a/recipes-bsp/powervr-drivers/ti-img-rogue-driver_1.15.6133109.bb b/recipes-bsp/powervr-drivers/ti-img-rogue-driver_1.15.6133109.bb new file mode 100644 index 00000000..fbff6c51 --- /dev/null +++ b/recipes-bsp/powervr-drivers/ti-img-rogue-driver_1.15.6133109.bb @@ -0,0 +1,44 @@ +DESCRIPTION = "Kernel drivers for the PowerVR Rogue GPU found in the TI SoCs" +HOMEPAGE = "http://git.ti.com/graphics/ti-img-rogue-driver" +LICENSE = "MIT | GPLv2" +LIC_FILES_CHKSUM = "file://README;beginline=14;endline=19;md5=0403c7dea01a2b8232261e805325fac2" + +inherit module features_check + +REQUIRED_MACHINE_FEATURES = "gpu" + +MACHINE_KERNEL_PR_append = "a" +PR = "${MACHINE_KERNEL_PR}" + +PACKAGE_ARCH = "${MACHINE_ARCH}" +COMPATIBLE_MACHINE = "j7-evm|j721s2-evm|am62xx" + +DEPENDS = "virtual/kernel" + +PROVIDES = "virtual/gpudriver" + +BRANCH = "linuxws/dunfell/k5.10/${PV}" + +SRC_URI = " \ + git://git.ti.com/graphics/ti-img-rogue-driver.git;branch=${BRANCH} \ + file://0001-compiler-support-OpenEmbedded-nodistro-internal-aarc.patch \ +" + +S = "${WORKDIR}/git" + +SRCREV = "ee0674adccac16f5b2f7cb8d5d05948706080cb5" + +TARGET_PRODUCT_j7-evm = "j721e_linux" +TARGET_PRODUCT_j721s2-evm = "j721s2_linux" +TARGET_PRODUCT_am62xx = "am62_linux" +TARGET_BVNC_j7-evm = "22.104.208.318" +TARGET_BVNC_j721s2-evm = "36.53.104.796" +TARGET_BVNC_am62xx = "33.15.11.3" +PVR_BUILD = "release" +PVR_WS = "wayland" + +EXTRA_OEMAKE += 'KERNELDIR="${STAGING_KERNEL_DIR}" RGX_BVNC=${TARGET_BVNC} BUILD=${PVR_BUILD} PVR_BUILD_DIR=${TARGET_PRODUCT} WINDOW_SYSTEM=${PVR_WS}' + +do_install() { + make -C ${STAGING_KERNEL_DIR} M=${B}/binary_${TARGET_PRODUCT}_${PVR_WS}_${PVR_BUILD}/target_aarch64/kbuild INSTALL_MOD_PATH=${D}${root_prefix} PREFIX=${STAGING_DIR_HOST} modules_install +} diff --git a/recipes-graphics/libgles/ti-img-rogue-umlibs_1.13.5776728.bb b/recipes-graphics/libgles/ti-img-rogue-umlibs_1.15.6133109.bb similarity index 84% rename from recipes-graphics/libgles/ti-img-rogue-umlibs_1.13.5776728.bb rename to recipes-graphics/libgles/ti-img-rogue-umlibs_1.15.6133109.bb index 5194015e..e00dce99 100644 --- a/recipes-graphics/libgles/ti-img-rogue-umlibs_1.13.5776728.bb +++ b/recipes-graphics/libgles/ti-img-rogue-umlibs_1.15.6133109.bb @@ -8,17 +8,18 @@ inherit features_check REQUIRED_MACHINE_FEATURES = "gpu" PACKAGE_ARCH = "${MACHINE_ARCH}" -COMPATIBLE_MACHINE = "j7" +COMPATIBLE_MACHINE = "j7-evm|j721s2-evm|am62xx" -PR = "r3" +PR = "r1" BRANCH = "linuxws/dunfell/k5.10/${PV}" SRC_URI = "git://git.ti.com/graphics/ti-img-rogue-umlibs.git;branch=${BRANCH}" +SRCREV = "47c3ffc44f2881397d45c8a2b5dfa7d6c58b79fb" -SRCREV = "5ef38353c38d921a65ea6df75c7b6ce710b66034" - -PVR_SOC ?= "j721e_linux" +TARGET_PRODUCT_j7-evm = "j721e_linux" +TARGET_PRODUCT_j721s2-evm = "j721s2_linux" +TARGET_PRODUCT_am62xx = "am62_linux" PVR_BUILD ?= "release" PVR_WS = "wayland" @@ -50,7 +51,7 @@ RRECOMMENDS_${PN} += "ti-img-rogue-driver" S = "${WORKDIR}/git" do_install () { - oe_runmake install DESTDIR=${D} TARGET_PRODUCT=${PVR_SOC} BUILD=${PVR_BUILD} WINDOW_SYSTEM=${PVR_WS} + oe_runmake install DESTDIR=${D} TARGET_PRODUCT=${TARGET_PRODUCT} BUILD=${PVR_BUILD} WINDOW_SYSTEM=${PVR_WS} chown -R root:root ${D} } -- 2.17.1
|
|
|
|
Re: [dunfell][PATCH v2 3/7] recipes: Pick up correct image and build DM to boot images
Denys Dmytriyenko
On Tue, Mar 22, 2022 at 01:15:54PM -0500, Ryan Eatmon via lists.yoctoproject.org wrote:
From: Nishanth Menon <nm@...>First of all, can this be squashed with the previous patch? Signed-off-by: Nishanth Menon <nm@...>am62xx SOC_FAMILY in the override? FILESEXTRAPATHS_prepend := "${METATIBASE}/recipes-bsp/ti-sci-fw/files/:"-- Regards, Denys Dmytriyenko <denis@...> PGP: 0x420902729A92C964 - https://denix.org/0x420902729A92C964 Fingerprint: 25FC E4A5 8A72 2F69 1186 6D76 4209 0272 9A92 C964
|
|
|
|
Re: [dunfell][PATCH v2 2/7] recipes-ti: ti-rtos-bin: Add AM62x binaries
Denys Dmytriyenko
On Tue, Mar 22, 2022 at 01:15:53PM -0500, Ryan Eatmon via lists.yoctoproject.org wrote:
From: Nishanth Menon <nm@...>Wny not use more generic am62xx SOC_FAMILY here, instead of specific "evm", to be more generic and cover any future am62-derivatives? FILESEXTRAPATHS_prepend := "${METATIBASE}/recipes-bsp/ti-sci-fw/files/:"Same comment. + install -d ${LEGACY_IPC_FW_DIR}And here + am62xx-main-r5f0_0-fw \One more +-- Regards, Denys Dmytriyenko <denis@...> PGP: 0x420902729A92C964 - https://denix.org/0x420902729A92C964 Fingerprint: 25FC E4A5 8A72 2F69 1186 6D76 4209 0272 9A92 C964
|
|
|
|
Re: [dunfell][PATCH v2 1/7] machine: Add am62xx evm configuration
Denys Dmytriyenko
On Tue, Mar 22, 2022 at 01:15:52PM -0500, Ryan Eatmon via lists.yoctoproject.org wrote:
From: Nishanth Menon <nm@...>Typo in the comment? +IMAGE_BOOT_FILES = "${IMAGE_BOOT_FILES_MULTI_CERT}"Is it still correct? Are there specific am64 and am62 machine names in optee-os? +OPTEEOUTPUTMACHINE = "k3"-- Regards, Denys Dmytriyenko <denis@...> PGP: 0x420902729A92C964 - https://denix.org/0x420902729A92C964 Fingerprint: 25FC E4A5 8A72 2F69 1186 6D76 4209 0272 9A92 C964
|
|
|
|
[dunfell][PATCH v2 6/7] ti-rtos: Fix AM62x R5F DM FW paths
Ryan Eatmon
From: Hari Nagalla <hnagalla@...>
Signed-off-by: Hari Nagalla <hnagalla@...> Signed-off-by: Ryan Eatmon <reatmon@...> --- recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb b/recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb index 43119f03..ecf54123 100644 --- a/recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb +++ b/recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb @@ -165,6 +165,8 @@ do_install_am64xx() { do_install_am62xx() { install -d ${LEGACY_IPC_FW_DIR} install -m 0644 ${RTOS_IPC_FW_DIR}/ipc_echo_baremetal_test_mcu1_0_release_strip.xer5f ${LEGACY_IPC_FW_DIR} + # DM Firmware + install -m 0644 ${RTOS_DM_FW_DIR}/ipc_echo_testb_mcu1_0_release_strip.xer5f ${LEGACY_DM_FW_DIR} } # Set up names for the firmwares @@ -182,6 +184,7 @@ ALTERNATIVE_${PN}_am64xx = "\ " ALTERNATIVE_${PN}_am62xx = "\ am62-mcu-m4f0_0-fw \ + am62xx-main-r5f0_0-fw \ " ALTERNATIVE_${PN}_j7 = "\ @@ -236,6 +239,7 @@ TARGET_MAIN_R5FSS1_0_am64xx = "am64-main-r5f1_0-fw" TARGET_MAIN_R5FSS1_1_am64xx = "am64-main-r5f1_1-fw" TARGET_MCU_M4FSS0_0_am64xx = "am64-mcu-m4f0_0-fw" TARGET_MCU_M4FSS0_0_am62xx = "am62-mcu-m4f0_0-fw" +TARGET_MAIN_R5FSS0_0_am62xx = "am62xx-main-r5f0_0-fw" TARGET_MCU_R5FSS0_0_j7 = "j7-mcu-r5f0_0-fw" TARGET_MCU_R5FSS0_1_j7 = "j7-mcu-r5f0_1-fw" @@ -278,6 +282,7 @@ ALTERNATIVE_LINK_NAME[am64-main-r5f1_1-fw] = "${base_libdir}/firmware/${TARGET_M ALTERNATIVE_LINK_NAME[am64-mcu-m4f0_0-fw] = "${base_libdir}/firmware/${TARGET_MCU_M4FSS0_0}" ALTERNATIVE_LINK_NAME[am62-mcu-m4f0_0-fw] = "${base_libdir}/firmware/${TARGET_MCU_M4FSS0_0}" +ALTERNATIVE_LINK_NAME[am62xx-main-r5f0_0-fw] = "${base_libdir}/firmware/${TARGET_MAIN_R5FSS0_0}" ALTERNATIVE_LINK_NAME[j7-mcu-r5f0_0-fw] = "${base_libdir}/firmware/${TARGET_MCU_R5FSS0_0}" ALTERNATIVE_LINK_NAME[j7-mcu-r5f0_1-fw] = "${base_libdir}/firmware/${TARGET_MCU_R5FSS0_1}" @@ -317,6 +322,7 @@ ALTERNATIVE_TARGET[am64-main-r5f1_1-fw] = "${base_libdir}/firmware/pdk-ipc/ipc_e ALTERNATIVE_TARGET[am64-mcu-m4f0_0-fw] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_baremetal_test_mcu3_0_release_strip.xer5f" ALTERNATIVE_TARGET[am62-mcu-m4f0_0-fw] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_baremetal_test_mcu1_0_release_strip.xer5f" +ALTERNATIVE_TARGET[am62xx-main-r5f0_0-fw] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_testb_mcu1_0_release_strip.xer5f" ALTERNATIVE_TARGET[j7-mcu-r5f0_0-fw] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_testb_mcu1_0_release_strip.xer5f" ALTERNATIVE_TARGET[j7-mcu-r5f0_1-fw] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_test_mcu1_1_release_strip.xer5f" -- 2.17.1
|
|
|
|
[dunfell][PATCH v2 4/7] HACK: recipes-ti: ti-rtos-metadata: Make am62x point to am64x
Ryan Eatmon
From: Nishanth Menon <nm@...>
Signed-off-by: Nishanth Menon <nm@...> Signed-off-by: Ryan Eatmon <reatmon@...> --- recipes-ti/ti-rtos-bin/ti-rtos-metadata.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/recipes-ti/ti-rtos-bin/ti-rtos-metadata.bb b/recipes-ti/ti-rtos-bin/ti-rtos-metadata.bb index e435676f..4f320e4c 100644 --- a/recipes-ti/ti-rtos-bin/ti-rtos-metadata.bb +++ b/recipes-ti/ti-rtos-bin/ti-rtos-metadata.bb @@ -14,6 +14,7 @@ PLAT_SFX_j7 = "/j721e" PLAT_SFX_j7200-evm = "/j7200" PLAT_SFX_am65xx = "/am65xx" PLAT_SFX_am64xx = "/am64x" +PLAT_SFX_am62xx = "/am64x" # Use weak assignment to set defaults to TI_RTOS_METADATA_* variables TI_RTOS_METADATA_URI ?= "git://git.ti.com/processor-sdk/coresdk_rtos_releases.git" -- 2.17.1
|
|
|