Date   

[dunfell][PATCH 3/3] linux-ti-staging-rt: Bump to 08.03.00.001 release

Ryan Eatmon
 

Updated the linux rt version for 08.03.00.001

Signed-off-by: Ryan Eatmon <reatmon@...>
---
recipes-kernel/linux/linux-ti-staging-rt_5.10.bb | 4 ++--
1 file 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 05fe4d12..ef4709df 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 = "204ec708dc86f4334f585f04835527570be1c4eb"
-PV = "5.10.100+git${SRCPV}"
+SRCREV = "84474b392bd8f1a8ebbabfa6ec685297fa3d51b7"
+PV = "5.10.109+git${SRCPV}"
--
2.17.1


[dunfell][PATCH 0/3] Update to 08.03.00.001

Ryan Eatmon
 

Update u-boot, linux and linux rt to 08.03.00.001 tag

Ryan Eatmon (3):
u-boot-ti-staging: Bump to 08.03.00.001 release
linux-ti-staging: Bump to 08.03.00.001 release
linux-ti-staging-rt: Bump to 08.03.00.001 release

recipes-bsp/u-boot/u-boot-ti-staging_2021.01.bb | 4 ++--
recipes-kernel/linux/linux-ti-staging-rt_5.10.bb | 4 ++--
recipes-kernel/linux/linux-ti-staging_5.10.bb | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)

--
2.17.1


[dunfell][PATCH 1/3] u-boot-ti-staging: Bump to 08.03.00.001 release

Ryan Eatmon
 

Updated the u-boot version for 08.03.00.001

Signed-off-by: Ryan Eatmon <reatmon@...>
---
recipes-bsp/u-boot/u-boot-ti-staging_2021.01.bb | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/recipes-bsp/u-boot/u-boot-ti-staging_2021.01.bb b/recipes-bsp/u-boot/u-boot-ti-staging_2021.01.bb
index 5b13329f..d7592b27 100644
--- a/recipes-bsp/u-boot/u-boot-ti-staging_2021.01.bb
+++ b/recipes-bsp/u-boot/u-boot-ti-staging_2021.01.bb
@@ -2,8 +2,8 @@ require u-boot-ti.inc

LIC_FILES_CHKSUM = "file://Licenses/README;md5=5a7450c57ffe5ae63fd732446b988025"

-PR = "r22"
+PR = "r23"

BRANCH = "ti-u-boot-2021.01"

-SRCREV = "44a87e3ab85c6d64044f0b5ad677008316baad70"
+SRCREV = "6355ef8b170bfea9390ca17ec11c0c9f3a7872eb"
--
2.17.1


[dunfell/master PATCH] ipc: ti-rpmsg-char: Update library to 0.4.1

praneeth
 

Update the ti-rpmsg-char library to 0.4.1 version that enables the
support for AM62x SoC family remote processors.

Signed-off-by: Praneeth Bajjuri <praneeth@...>
---
recipes-ti/ipc/ti-rpmsg-char.inc | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/recipes-ti/ipc/ti-rpmsg-char.inc b/recipes-ti/ipc/ti-rpmsg-char.inc
index dc98fbb5..b499647a 100644
--- a/recipes-ti/ipc/ti-rpmsg-char.inc
+++ b/recipes-ti/ipc/ti-rpmsg-char.inc
@@ -7,10 +7,10 @@ PROTOCOL = "git"
BRANCH = "master"
SRC_URI = "git://git.ti.com/rpmsg/ti-rpmsg-char.git;protocol=${PROTOCOL};branch=${BRANCH};"

-# Initial 0.4.0 release
-SRCREV = "92b464f1e7477f77e44ae18d87b3d369576d662e"
+# Initial 0.4.1 release
+SRCREV = "355d2b0bcde5eb5c895a270d1835102d2bc39fbd"

-PV = "0.4.0+git${SRCPV}"
+PV = "0.4.1+git${SRCPV}"

S = "${WORKDIR}/git"

--
2.17.1


Re: [master/dunfell][PATCH] ti-graphics: Add j7-hs-evm as a compatible machine.

Denys Dmytriyenko
 

On Tue, Apr 19, 2022 at 10:14:16PM -0500, Andrew F. Davis via lists.yoctoproject.org wrote:
On 4/18/22 5:20 PM, Ryan Eatmon via lists.yoctoproject.org wrote:
The recent change to explicitly list the compatible machines is missing the j7-hs-evm.

Signed-off-by: Ryan Eatmon <reatmon@...>
---
.../powervr-drivers/ti-img-rogue-driver_1.15.6133109.bb | 4 +++-
recipes-graphics/libgles/ti-img-rogue-umlibs_1.15.6133109.bb | 3 ++-
2 files changed, 5 insertions(+), 2 deletions(-)

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
index fbff6c51..6d2d68cd 100644
--- 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
@@ -11,7 +11,7 @@ MACHINE_KERNEL_PR_append = "a"
PR = "${MACHINE_KERNEL_PR}"
PACKAGE_ARCH = "${MACHINE_ARCH}"
-COMPATIBLE_MACHINE = "j7-evm|j721s2-evm|am62xx"
+COMPATIBLE_MACHINE = "j7-evm|j7-hs-evm|j721s2-evm|am62xx"

Doesn't seem right, we haven't needed to specify the HS version before..
https://git.yoctoproject.org/meta-ti/commit/?h=dunfell&id=ed94c75b436f2f8c5c3a8a6ebed45d7276cc35e4


Seems we are mixing SoC and board, the GPU driver depends on the SoC
not the board, we match correctly for am62xx on SoC, but J7 on
specific board name. Suggest

+COMPATIBLE_MACHINE = "j7|j721s2|am62xx"
There's no j721s2 SoC family in Dunfell.

I'm guessing "j7-evm|j7-hs-evm|j721s2-evm" was done because j7 SoC family in
Dunfell is too broad and also covers headless j7200, which lacks "gpu" machine
feature... Could be just "j7|am62xx" in Dunfell and more specific SoC families
in master/kirkstone.

--
Denys

DEPENDS = "virtual/kernel"
@@ -29,9 +29,11 @@ S = "${WORKDIR}/git"
SRCREV = "ee0674adccac16f5b2f7cb8d5d05948706080cb5"
TARGET_PRODUCT_j7-evm = "j721e_linux"
+TARGET_PRODUCT_j7-hs-evm = "j721e_linux"
TARGET_PRODUCT_j721s2-evm = "j721s2_linux"
TARGET_PRODUCT_am62xx = "am62_linux"
TARGET_BVNC_j7-evm = "22.104.208.318"
+TARGET_BVNC_j7-hs-evm = "22.104.208.318"
TARGET_BVNC_j721s2-evm = "36.53.104.796"
TARGET_BVNC_am62xx = "33.15.11.3"
PVR_BUILD = "release"
diff --git a/recipes-graphics/libgles/ti-img-rogue-umlibs_1.15.6133109.bb b/recipes-graphics/libgles/ti-img-rogue-umlibs_1.15.6133109.bb
index e00dce99..0f3f9192 100644
--- a/recipes-graphics/libgles/ti-img-rogue-umlibs_1.15.6133109.bb
+++ b/recipes-graphics/libgles/ti-img-rogue-umlibs_1.15.6133109.bb
@@ -8,7 +8,7 @@ inherit features_check
REQUIRED_MACHINE_FEATURES = "gpu"
PACKAGE_ARCH = "${MACHINE_ARCH}"
-COMPATIBLE_MACHINE = "j7-evm|j721s2-evm|am62xx"
+COMPATIBLE_MACHINE = "j7-evm|j7-hs-evm|j721s2-evm|am62xx"
PR = "r1"
@@ -18,6 +18,7 @@ SRC_URI = "git://git.ti.com/graphics/ti-img-rogue-umlibs.git;branch=${BRANCH}"
SRCREV = "47c3ffc44f2881397d45c8a2b5dfa7d6c58b79fb"
TARGET_PRODUCT_j7-evm = "j721e_linux"
+TARGET_PRODUCT_j7-hs-evm = "j721e_linux"
TARGET_PRODUCT_j721s2-evm = "j721s2_linux"
TARGET_PRODUCT_am62xx = "am62_linux"
PVR_BUILD ?= "release"


Re: [master/dunfell][PATCH] ti-graphics: Add j7-hs-evm as a compatible machine.

Andrew Davis
 

On 4/18/22 5:20 PM, Ryan Eatmon via lists.yoctoproject.org wrote:
The recent change to explicitly list the compatible machines is missing the j7-hs-evm.
Signed-off-by: Ryan Eatmon <reatmon@...>
---
.../powervr-drivers/ti-img-rogue-driver_1.15.6133109.bb | 4 +++-
recipes-graphics/libgles/ti-img-rogue-umlibs_1.15.6133109.bb | 3 ++-
2 files changed, 5 insertions(+), 2 deletions(-)
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
index fbff6c51..6d2d68cd 100644
--- 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
@@ -11,7 +11,7 @@ MACHINE_KERNEL_PR_append = "a"
PR = "${MACHINE_KERNEL_PR}"
PACKAGE_ARCH = "${MACHINE_ARCH}"
-COMPATIBLE_MACHINE = "j7-evm|j721s2-evm|am62xx"
+COMPATIBLE_MACHINE = "j7-evm|j7-hs-evm|j721s2-evm|am62xx"

Doesn't seem right, we haven't needed to specify the HS version before..

Seems we are mixing SoC and board, the GPU driver depends on the SoC
not the board, we match correctly for am62xx on SoC, but J7 on
specific board name. Suggest

+COMPATIBLE_MACHINE = "j7|j721s2|am62xx"

Andrew


DEPENDS = "virtual/kernel"
@@ -29,9 +29,11 @@ S = "${WORKDIR}/git"
SRCREV = "ee0674adccac16f5b2f7cb8d5d05948706080cb5"
TARGET_PRODUCT_j7-evm = "j721e_linux"
+TARGET_PRODUCT_j7-hs-evm = "j721e_linux"
TARGET_PRODUCT_j721s2-evm = "j721s2_linux"
TARGET_PRODUCT_am62xx = "am62_linux"
TARGET_BVNC_j7-evm = "22.104.208.318"
+TARGET_BVNC_j7-hs-evm = "22.104.208.318"
TARGET_BVNC_j721s2-evm = "36.53.104.796"
TARGET_BVNC_am62xx = "33.15.11.3"
PVR_BUILD = "release"
diff --git a/recipes-graphics/libgles/ti-img-rogue-umlibs_1.15.6133109.bb b/recipes-graphics/libgles/ti-img-rogue-umlibs_1.15.6133109.bb
index e00dce99..0f3f9192 100644
--- a/recipes-graphics/libgles/ti-img-rogue-umlibs_1.15.6133109.bb
+++ b/recipes-graphics/libgles/ti-img-rogue-umlibs_1.15.6133109.bb
@@ -8,7 +8,7 @@ inherit features_check
REQUIRED_MACHINE_FEATURES = "gpu"
PACKAGE_ARCH = "${MACHINE_ARCH}"
-COMPATIBLE_MACHINE = "j7-evm|j721s2-evm|am62xx"
+COMPATIBLE_MACHINE = "j7-evm|j7-hs-evm|j721s2-evm|am62xx"
PR = "r1"
@@ -18,6 +18,7 @@ SRC_URI = "git://git.ti.com/graphics/ti-img-rogue-umlibs.git;branch=${BRANCH}"
SRCREV = "47c3ffc44f2881397d45c8a2b5dfa7d6c58b79fb"
TARGET_PRODUCT_j7-evm = "j721e_linux"
+TARGET_PRODUCT_j7-hs-evm = "j721e_linux"
TARGET_PRODUCT_j721s2-evm = "j721s2_linux"
TARGET_PRODUCT_am62xx = "am62_linux"
PVR_BUILD ?= "release"


Re: [dunfell][PATCH] u-boot-ti: Use SRCREV to get short commit ID

Nishanth Menon
 

On 21:17-20220419, Devarsh Thakkar wrote:
Due to recent security update in git, we are
not able to fetch revision currently using existing method:
https://github.blog/2022-04-12-git-security-vulnerability-announced/

So instead, use the SRCREV to parse the short commit ID
and set the UBOOT_LOCALVERSION variable.

Signed-off-by: Devarsh Thakkar <devarsht@...>
---
recipes-bsp/u-boot/u-boot-ti.inc | 10 +---------
1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/recipes-bsp/u-boot/u-boot-ti.inc b/recipes-bsp/u-boot/u-boot-ti.inc
index 231b7647..cc775e2e 100644
--- a/recipes-bsp/u-boot/u-boot-ti.inc
+++ b/recipes-bsp/u-boot/u-boot-ti.inc
@@ -1,14 +1,6 @@
# UBOOT_LOCALVERSION can be set to add a tag to the end of the
# U-boot version string. such as the commit id
-def get_git_revision(p):
- import subprocess
-
- try:
- return subprocess.Popen("git rev-parse HEAD 2>/dev/null ", cwd=p, shell=True, stdout=subprocess.PIPE, universal_newlines=True).communicate()[0].rstrip()

I see a similar logic in
recipes-kernel/linux/setup-defconfig.inc as well.

Considering similar problem

https://lore.kernel.org/all/20220413155249.3458236-2-raj.khem@gmail.com/

was wondering as to what might be a better way to solve this?

There is also git rev-parse HEAD instances in oe-core as well and
bitbake(lib/layerindexlib/cooker.py) as well.

I wonder since we know cwd=p, could we use that to set
https://git-scm.com/docs/git/2.35.2#Documentation/git.txt-codeGITCEILINGDIRECTORIEScode
(which if my understanding is right, came in around v1.5.5.1-319-g0454dd93bfb2)

OR maybe just set it to the base conf similar to what was done on
master oe-core/meta/conf/bitbake.conf (commit
02ecf3e2a98a614805f6f2574c2bf14162192d01 "bitbake.conf: Prevent git from
detecting parent repo in recipe")?

I am not sure if we should considering just side stepping this issue via
just not using the git to get the version string.. just my 2 cents.
- except OSError:
- return None
-
-UBOOT_LOCALVERSION = "-g${@get_git_revision('${S}').__str__()[:10]}"
+UBOOT_LOCALVERSION = "-g${@d.getVar("SRCREV", False).__str__()[:10]}"

UBOOT_SUFFIX ?= "img"
SPL_BINARY ?= "MLO"
--
2.17.1
--
Regards,
Nishanth Menon
Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3 1A34 DDB5 849D 1736 249D


Re: [dunfell][PATCH] linux-ti-staging/mainline: depend on libmpc-native and gmp-native

Nishanth Menon
 

On 15:57-20220419, Denys Dmytriyenko wrote:
From: Denys Dmytriyenko <denys@...>

Similar to OE-Core changes:
https://git.openembedded.org/openembedded-core/commit/?id=128abf5eb76dd0d2680c93f043bf7cac0a3552b8

5.10.85 changed how the GCC plugins are built, which means they now
depend on both GMP and MPC to be built.

Also add MPC dependency to linux-ti-mainline, as it already depends
on GMP since:
https://git.yoctoproject.org/meta-ti/commit/?id=0376ebcd4333ea2915b3113945ff6a818f7cb442

Signed-off-by: Denys Dmytriyenko <denys@...>
---
recipes-kernel/linux/linux-ti-mainline_git.bb | 2 +-
recipes-kernel/linux/linux-ti-staging_5.10.bb | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/recipes-kernel/linux/linux-ti-mainline_git.bb b/recipes-kernel/linux/linux-ti-mainline_git.bb
index 7491dae..4a5034f 100644
--- a/recipes-kernel/linux/linux-ti-mainline_git.bb
+++ b/recipes-kernel/linux/linux-ti-mainline_git.bb
@@ -10,7 +10,7 @@ require recipes-kernel/linux/setup-defconfig.inc
require recipes-kernel/linux/kernel-rdepends.inc
require recipes-kernel/linux/ti-kernel.inc

-DEPENDS += "gmp-native"
+DEPENDS += "gmp-native libmpc-native"

KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT} \
${EXTRA_DTC_ARGS}"
diff --git a/recipes-kernel/linux/linux-ti-staging_5.10.bb b/recipes-kernel/linux/linux-ti-staging_5.10.bb
index 9eb5a30..a0ba18e 100644
--- a/recipes-kernel/linux/linux-ti-staging_5.10.bb
+++ b/recipes-kernel/linux/linux-ti-staging_5.10.bb
@@ -13,6 +13,8 @@ require recipes-kernel/linux/bundle-devicetree.inc
require recipes-kernel/linux/kernel-rdepends.inc
require recipes-kernel/linux/ti-kernel.inc

+DEPENDS += "gmp-native libmpc-native"
+
# Look in the generic major.minor directory for files
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-5.10:"

Thank you.

Reviewed-by: Nishanth Menon <nm@...>

--
Regards,
Nishanth Menon
Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3 1A34 DDB5 849D 1736 249D


[dunfell][PATCH] linux-ti-staging/mainline: depend on libmpc-native and gmp-native

Denys Dmytriyenko
 

From: Denys Dmytriyenko <denys@...>

Similar to OE-Core changes:
https://git.openembedded.org/openembedded-core/commit/?id=128abf5eb76dd0d2680c93f043bf7cac0a3552b8

5.10.85 changed how the GCC plugins are built, which means they now
depend on both GMP and MPC to be built.

Also add MPC dependency to linux-ti-mainline, as it already depends
on GMP since:
https://git.yoctoproject.org/meta-ti/commit/?id=0376ebcd4333ea2915b3113945ff6a818f7cb442

Signed-off-by: Denys Dmytriyenko <denys@...>
---
recipes-kernel/linux/linux-ti-mainline_git.bb | 2 +-
recipes-kernel/linux/linux-ti-staging_5.10.bb | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/recipes-kernel/linux/linux-ti-mainline_git.bb b/recipes-kernel/linux/linux-ti-mainline_git.bb
index 7491dae..4a5034f 100644
--- a/recipes-kernel/linux/linux-ti-mainline_git.bb
+++ b/recipes-kernel/linux/linux-ti-mainline_git.bb
@@ -10,7 +10,7 @@ require recipes-kernel/linux/setup-defconfig.inc
require recipes-kernel/linux/kernel-rdepends.inc
require recipes-kernel/linux/ti-kernel.inc

-DEPENDS += "gmp-native"
+DEPENDS += "gmp-native libmpc-native"

KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT} \
${EXTRA_DTC_ARGS}"
diff --git a/recipes-kernel/linux/linux-ti-staging_5.10.bb b/recipes-kernel/linux/linux-ti-staging_5.10.bb
index 9eb5a30..a0ba18e 100644
--- a/recipes-kernel/linux/linux-ti-staging_5.10.bb
+++ b/recipes-kernel/linux/linux-ti-staging_5.10.bb
@@ -13,6 +13,8 @@ require recipes-kernel/linux/bundle-devicetree.inc
require recipes-kernel/linux/kernel-rdepends.inc
require recipes-kernel/linux/ti-kernel.inc

+DEPENDS += "gmp-native libmpc-native"
+
# Look in the generic major.minor directory for files
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-5.10:"

--
2.7.4


[dunfell][PATCH] u-boot-ti: Use SRCREV to get short commit ID

Devarsh Thakkar
 

Due to recent security update in git, we are
not able to fetch revision currently using existing method:
https://github.blog/2022-04-12-git-security-vulnerability-announced/

So instead, use the SRCREV to parse the short commit ID
and set the UBOOT_LOCALVERSION variable.

Signed-off-by: Devarsh Thakkar <devarsht@...>
---
recipes-bsp/u-boot/u-boot-ti.inc | 10 +---------
1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/recipes-bsp/u-boot/u-boot-ti.inc b/recipes-bsp/u-boot/u-boot-ti.inc
index 231b7647..cc775e2e 100644
--- a/recipes-bsp/u-boot/u-boot-ti.inc
+++ b/recipes-bsp/u-boot/u-boot-ti.inc
@@ -1,14 +1,6 @@
# UBOOT_LOCALVERSION can be set to add a tag to the end of the
# U-boot version string. such as the commit id
-def get_git_revision(p):
- import subprocess
-
- try:
- return subprocess.Popen("git rev-parse HEAD 2>/dev/null ", cwd=p, shell=True, stdout=subprocess.PIPE, universal_newlines=True).communicate()[0].rstrip()
- except OSError:
- return None
-
-UBOOT_LOCALVERSION = "-g${@get_git_revision('${S}').__str__()[:10]}"
+UBOOT_LOCALVERSION = "-g${@d.getVar("SRCREV", False).__str__()[:10]}"

UBOOT_SUFFIX ?= "img"
SPL_BINARY ?= "MLO"
--
2.17.1


[master/dunfell][PATCH] ti-graphics: Add j7-hs-evm as a compatible machine.

Ryan Eatmon
 

The recent change to explicitly list the compatible machines is missing the j7-hs-evm.

Signed-off-by: Ryan Eatmon <reatmon@...>
---
.../powervr-drivers/ti-img-rogue-driver_1.15.6133109.bb | 4 +++-
recipes-graphics/libgles/ti-img-rogue-umlibs_1.15.6133109.bb | 3 ++-
2 files changed, 5 insertions(+), 2 deletions(-)

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
index fbff6c51..6d2d68cd 100644
--- 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
@@ -11,7 +11,7 @@ MACHINE_KERNEL_PR_append = "a"
PR = "${MACHINE_KERNEL_PR}"

PACKAGE_ARCH = "${MACHINE_ARCH}"
-COMPATIBLE_MACHINE = "j7-evm|j721s2-evm|am62xx"
+COMPATIBLE_MACHINE = "j7-evm|j7-hs-evm|j721s2-evm|am62xx"

DEPENDS = "virtual/kernel"

@@ -29,9 +29,11 @@ S = "${WORKDIR}/git"
SRCREV = "ee0674adccac16f5b2f7cb8d5d05948706080cb5"

TARGET_PRODUCT_j7-evm = "j721e_linux"
+TARGET_PRODUCT_j7-hs-evm = "j721e_linux"
TARGET_PRODUCT_j721s2-evm = "j721s2_linux"
TARGET_PRODUCT_am62xx = "am62_linux"
TARGET_BVNC_j7-evm = "22.104.208.318"
+TARGET_BVNC_j7-hs-evm = "22.104.208.318"
TARGET_BVNC_j721s2-evm = "36.53.104.796"
TARGET_BVNC_am62xx = "33.15.11.3"
PVR_BUILD = "release"
diff --git a/recipes-graphics/libgles/ti-img-rogue-umlibs_1.15.6133109.bb b/recipes-graphics/libgles/ti-img-rogue-umlibs_1.15.6133109.bb
index e00dce99..0f3f9192 100644
--- a/recipes-graphics/libgles/ti-img-rogue-umlibs_1.15.6133109.bb
+++ b/recipes-graphics/libgles/ti-img-rogue-umlibs_1.15.6133109.bb
@@ -8,7 +8,7 @@ inherit features_check
REQUIRED_MACHINE_FEATURES = "gpu"

PACKAGE_ARCH = "${MACHINE_ARCH}"
-COMPATIBLE_MACHINE = "j7-evm|j721s2-evm|am62xx"
+COMPATIBLE_MACHINE = "j7-evm|j7-hs-evm|j721s2-evm|am62xx"

PR = "r1"

@@ -18,6 +18,7 @@ SRC_URI = "git://git.ti.com/graphics/ti-img-rogue-umlibs.git;branch=${BRANCH}"
SRCREV = "47c3ffc44f2881397d45c8a2b5dfa7d6c58b79fb"

TARGET_PRODUCT_j7-evm = "j721e_linux"
+TARGET_PRODUCT_j7-hs-evm = "j721e_linux"
TARGET_PRODUCT_j721s2-evm = "j721s2_linux"
TARGET_PRODUCT_am62xx = "am62_linux"
PVR_BUILD ?= "release"
--
2.17.1


[PATCH] optee-os: fix build with OPTEEPAGER=y

Matthias Schiffer
 

meta-arm commit e03b824d7824 ("arm/optee-os: cleanup recipe") changed the
recipe's do_compile(), which broke the build of the am57xx-hs-evm and
dra7xx-hs-evm machines. Adjust the .bbappend accordingly.

Signed-off-by: Matthias Schiffer <matthias.schiffer@...>
---
meta-ti-bsp/recipes-security/optee/optee-os_%.bbappend | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta-ti-bsp/recipes-security/optee/optee-os_%.bbappend b/meta-ti-bsp/recipes-security/optee/optee-os_%.bbappend
index f9660bfe..5af57e16 100644
--- a/meta-ti-bsp/recipes-security/optee/optee-os_%.bbappend
+++ b/meta-ti-bsp/recipes-security/optee/optee-os_%.bbappend
@@ -20,8 +20,8 @@ optee_sign_legacyhs() {
)

if [ "${OPTEEPAGER}" = "y" ]; then
- oe_runmake clean
- oe_runmake all CFG_TEE_TA_LOG_LEVEL=0 CFG_WITH_PAGER=y
+ oe_runmake -C ${S} clean
+ oe_runmake -C ${S} all CFG_TEE_TA_LOG_LEVEL=0 CFG_WITH_PAGER=y
( cd ${B}/core/; \
${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh tee.bin tee.bin.signed; \
normfl=`echo ${OPTEEFLAVOR} | tr "_" "-"`
--
2.25.1


[PATCH v2] ti-sgx-ddk-um: avoid unnecessary dependency on -dev package

Matthias Schiffer
 

ti-sgx-ddk-um's do_install creates a symlink libGLESv2.so.1 to
libGLESv2.so. As this symlink will be installed to ti-sgx-ddk-um, but
its target libGLESv2.so is in ti-sgx-ddk-um-dev, the automated
dependency analysis will add ti-sgx-ddk-um-dev to ti-sgx-ddk-um's
RDEPENDS. This will pull in a large number of other -dev packages
through RDEPENDS and RRECOMMENDS in turn.

Avoid this by having libGLESv2.so.1 point to libGLESv2.so.2 instead of
libGLESv2.so, so the symlink's target is in ti-sgx-ddk-um as well.

Signed-off-by: Matthias Schiffer <matthias.schiffer@...>
Reviewed-by: Denys Dmytriyenko <denys@...>
---

v2: rebased to adjust recipe path


.../recipes-graphics/libgles/ti-sgx-ddk-um_1.17.4948957.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

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 f4c71d25..d0edf1fe 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
@@ -54,7 +54,7 @@ S = "${WORKDIR}/git"

do_install () {
oe_runmake install DESTDIR=${D} TARGET_PRODUCT=${TARGET_PRODUCT}
- ln -sf libGLESv2.so ${D}${libdir}/libGLESv2.so.1
+ ln -sf libGLESv2.so.2 ${D}${libdir}/libGLESv2.so.1

chown -R root:root ${D}
}
--
2.25.1


Re: [master/dunfell PATCH v1 2/2] pru-icss_git.bb: add AM62x

Ryan Eatmon
 

Applied patch to dunfell-next.

On 4/11/2022 8:35 PM, Nick Saulnier wrote:
This commit adds the PRU Software Support Package (PSSP) to the AM62x Linux
Processor SDK under example-applications/pru-icss-x.x.x. It also adds prebuilt
PRU firmware to the default AM62x filesystem image under the /lib/firmware
folder.
Signed-off-by: Nick Saulnier <nsaulnier@...>
---
recipes-bsp/pru/pru-icss_git.bb | 21 +++++++++++++++++++++
1 file changed, 21 insertions(+)
diff --git a/recipes-bsp/pru/pru-icss_git.bb b/recipes-bsp/pru/pru-icss_git.bb
index ac75103d31d6..1ceba0573af0 100644
--- a/recipes-bsp/pru/pru-icss_git.bb
+++ b/recipes-bsp/pru/pru-icss_git.bb
@@ -41,6 +41,7 @@ PLATFORM_ti33x = "am335x"
PLATFORM_ti43x = "am437x"
PLATFORM_omap-a15 = "am572x"
PLATFORM_k2g = "k2g"
+PLATFORM_am62xx = "am62x"
PLATFORM_am64xx = "am64x"
PLATFORM_am65xx = "am65x"
PLATFORM_j7 = "j721e"
@@ -113,6 +114,16 @@ do_install_append_k2g() {
done
}
+do_install_append_am62xx() {
+ install -m 644 ${S}/examples/${PLATFORM}/PRU_Halt/gen/PRU_Halt.out \
+ ${D}${base_libdir}/firmware/pru
+ for i in 0 1
+ do
+ install -m 0644 ${S}/examples/${PLATFORM}/PRU_RPMsg_Echo_Interrupt${i}/gen/PRU_RPMsg_Echo_Interrupt${i}.out \
+ ${D}${base_libdir}/firmware/pru
+ done
+}
+
do_install_append_am64xx(){
for i in 0 1
do
@@ -190,6 +201,7 @@ PRU_ICSS_ALTERNATIVES_ti33x = "am335x-pru0-fw am335x-pru1-fw"
PRU_ICSS_ALTERNATIVES_ti43x = "am437x-pru0_0-fw am437x-pru0_1-fw am437x-pru1_0-fw am437x-pru1_1-fw"
PRU_ICSS_ALTERNATIVES_omap-a15 = "am57xx-pru1_0-fw am57xx-pru1_1-fw am57xx-pru2_0-fw am57xx-pru2_1-fw"
PRU_ICSS_ALTERNATIVES_k2g = "k2g-pru0_0-fw k2g-pru0_1-fw k2g-pru1_0-fw k2g-pru1_1-fw"
+PRU_ICSS_ALTERNATIVES_am62xx = "am62x-pru0-fw am62x-pru1-fw"
PRU_ICSS_ALTERNATIVES_am64xx = "am64x-pru0_0-fw am64x-pru0_1-fw am64x-pru1_0-fw am64x-pru1_1-fw am64x-rtu0_0-fw am64x-rtu0_1-fw am64x-rtu1_0-fw am64x-rtu1_1-fw"
PRU_ICSS_ALTERNATIVES_am65xx = "am65x-pru0_0-fw am65x-pru0_1-fw am65x-pru1_0-fw am65x-pru1_1-fw am65x-pru2_0-fw am65x-pru2_1-fw am65x-rtu0_0-fw am65x-rtu0_1-fw am65x-rtu1_0-fw am65x-rtu1_1-fw am65x-rtu2_0-fw am65x-rtu2_1-fw"
PRU_ICSS_ALTERNATIVES_j7 = "j7-pru0_0-fw j7-pru0_1-fw j7-pru1_0-fw j7-pru1_1-fw j7-rtu0_0-fw j7-rtu0_1-fw j7-rtu1_0-fw j7-rtu1_1-fw"
@@ -213,6 +225,9 @@ ALTERNATIVE_LINK_NAME[k2g-pru0_1-fw] = "${base_libdir}/firmware/k2g-pru0_1-fw"
ALTERNATIVE_LINK_NAME[k2g-pru1_0-fw] = "${base_libdir}/firmware/k2g-pru1_0-fw"
ALTERNATIVE_LINK_NAME[k2g-pru1_1-fw] = "${base_libdir}/firmware/k2g-pru1_1-fw"
+ALTERNATIVE_LINK_NAME[am62x-pru0-fw] = "${base_libdir}/firmware/am62x-pru0-fw"
+ALTERNATIVE_LINK_NAME[am62x-pru1-fw] = "${base_libdir}/firmware/am62x-pru1-fw"
+
ALTERNATIVE_LINK_NAME[am64x-pru0_0-fw] = "${base_libdir}/firmware/am64x-pru0_0-fw"
ALTERNATIVE_LINK_NAME[am64x-pru0_1-fw] = "${base_libdir}/firmware/am64x-pru0_1-fw"
ALTERNATIVE_LINK_NAME[am64x-pru1_0-fw] = "${base_libdir}/firmware/am64x-pru1_0-fw"
@@ -284,6 +299,9 @@ ALTERNATIVE_TARGET_pru-icss-halt[k2g-pru0_1-fw] = "${base_libdir}/firmware/pru/P
ALTERNATIVE_TARGET_pru-icss-halt[k2g-pru1_0-fw] = "${base_libdir}/firmware/pru/PRU_Halt.out"
ALTERNATIVE_TARGET_pru-icss-halt[k2g-pru1_1-fw] = "${base_libdir}/firmware/pru/PRU_Halt.out"
+ALTERNATIVE_TARGET_pru-icss-halt[am62x-pru0-fw] = "${base_libdir}/firmware/pru/PRU_Halt.out"
+ALTERNATIVE_TARGET_pru-icss-halt[am62x-pru1-fw] = "${base_libdir}/firmware/pru/PRU_Halt.out"
+
ALTERNATIVE_TARGET_pru-icss-halt[am64x-pru0_0-fw] = "${base_libdir}/firmware/pru/PRU_Halt_0.out"
ALTERNATIVE_TARGET_pru-icss-halt[am64x-pru0_1-fw] = "${base_libdir}/firmware/pru/PRU_Halt_1.out"
ALTERNATIVE_TARGET_pru-icss-halt[am64x-pru1_0-fw] = "${base_libdir}/firmware/pru/PRU_Halt_0.out"
@@ -353,6 +371,9 @@ ALTERNATIVE_TARGET_pru-icss-rpmsg-echo[k2g-pru0_1-fw] = "${base_libdir}/firmware
ALTERNATIVE_TARGET_pru-icss-rpmsg-echo[k2g-pru1_0-fw] = "${base_libdir}/firmware/pru/PRU_RPMsg_Echo_Interrupt1_0.out"
ALTERNATIVE_TARGET_pru-icss-rpmsg-echo[k2g-pru1_1-fw] = "${base_libdir}/firmware/pru/PRU_RPMsg_Echo_Interrupt1_1.out"
+ALTERNATIVE_TARGET_pru-icss-rpmsg-echo[am62x-pru0-fw] = "${base_libdir}/firmware/pru/PRU_RPMsg_Echo_Interrupt0.out"
+ALTERNATIVE_TARGET_pru-icss-rpmsg-echo[am62x-pru1-fw] = "${base_libdir}/firmware/pru/PRU_RPMsg_Echo_Interrupt1.out"
+
ALTERNATIVE_TARGET_pru-icss-rpmsg-echo[am64x-pru0_0-fw] = "${base_libdir}/firmware/pru/PRU_RPMsg_Echo_Interrupt0_0.out"
ALTERNATIVE_TARGET_pru-icss-rpmsg-echo[am64x-pru0_1-fw] = "${base_libdir}/firmware/pru/PRU_RPMsg_Echo_Interrupt0_1.out"
ALTERNATIVE_TARGET_pru-icss-rpmsg-echo[am64x-pru1_0-fw] = "${base_libdir}/firmware/pru/PRU_RPMsg_Echo_Interrupt1_0.out"
--
Ryan Eatmon reatmon@...
-----------------------------------------
Texas Instruments, Inc. - LCPD - MGTS


Re: [master/dunfell PATCH v1 1/2] pru-icss_git.bb: update to PSSP v6.1.0

Ryan Eatmon
 

Applied patch to dunfell-next.

On 4/11/2022 8:35 PM, Nick Saulnier wrote:
Update the SDK folder example-applications/pru-icss-x.x.x to install the latest
version of the PRU Software Support Package (PSSP).
This also uses PSSP v6.1.0 to generate the PRU Halt and RPMsg binaries in the
Linux SDK default filesystem image under /lib/firmware.
Signed-off-by: Nick Saulnier <nsaulnier@...>
---
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 bc085c24b5fb..ac75103d31d6 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 = "8eee431384b6a1a9c96ae91a8e99485176b4d2b3"
+SRCREV = "ae1decf0b494b2904e6157e1379691ffc468f0cf"
-PV = "6.0.1"
+PV = "6.1.0"
PR = "r0"
require recipes-ti/includes/ti-paths.inc
--
Ryan Eatmon reatmon@...
-----------------------------------------
Texas Instruments, Inc. - LCPD - MGTS


[master/dunfell PATCH v1 2/2] pru-icss_git.bb: add AM62x

Nick Saulnier
 

This commit adds the PRU Software Support Package (PSSP) to the AM62x Linux
Processor SDK under example-applications/pru-icss-x.x.x. It also adds prebuilt
PRU firmware to the default AM62x filesystem image under the /lib/firmware
folder.

Signed-off-by: Nick Saulnier <nsaulnier@...>
---
recipes-bsp/pru/pru-icss_git.bb | 21 +++++++++++++++++++++
1 file changed, 21 insertions(+)

diff --git a/recipes-bsp/pru/pru-icss_git.bb b/recipes-bsp/pru/pru-icss_git.bb
index ac75103d31d6..1ceba0573af0 100644
--- a/recipes-bsp/pru/pru-icss_git.bb
+++ b/recipes-bsp/pru/pru-icss_git.bb
@@ -41,6 +41,7 @@ PLATFORM_ti33x = "am335x"
PLATFORM_ti43x = "am437x"
PLATFORM_omap-a15 = "am572x"
PLATFORM_k2g = "k2g"
+PLATFORM_am62xx = "am62x"
PLATFORM_am64xx = "am64x"
PLATFORM_am65xx = "am65x"
PLATFORM_j7 = "j721e"
@@ -113,6 +114,16 @@ do_install_append_k2g() {
done
}

+do_install_append_am62xx() {
+ install -m 644 ${S}/examples/${PLATFORM}/PRU_Halt/gen/PRU_Halt.out \
+ ${D}${base_libdir}/firmware/pru
+ for i in 0 1
+ do
+ install -m 0644 ${S}/examples/${PLATFORM}/PRU_RPMsg_Echo_Interrupt${i}/gen/PRU_RPMsg_Echo_Interrupt${i}.out \
+ ${D}${base_libdir}/firmware/pru
+ done
+}
+
do_install_append_am64xx(){
for i in 0 1
do
@@ -190,6 +201,7 @@ PRU_ICSS_ALTERNATIVES_ti33x = "am335x-pru0-fw am335x-pru1-fw"
PRU_ICSS_ALTERNATIVES_ti43x = "am437x-pru0_0-fw am437x-pru0_1-fw am437x-pru1_0-fw am437x-pru1_1-fw"
PRU_ICSS_ALTERNATIVES_omap-a15 = "am57xx-pru1_0-fw am57xx-pru1_1-fw am57xx-pru2_0-fw am57xx-pru2_1-fw"
PRU_ICSS_ALTERNATIVES_k2g = "k2g-pru0_0-fw k2g-pru0_1-fw k2g-pru1_0-fw k2g-pru1_1-fw"
+PRU_ICSS_ALTERNATIVES_am62xx = "am62x-pru0-fw am62x-pru1-fw"
PRU_ICSS_ALTERNATIVES_am64xx = "am64x-pru0_0-fw am64x-pru0_1-fw am64x-pru1_0-fw am64x-pru1_1-fw am64x-rtu0_0-fw am64x-rtu0_1-fw am64x-rtu1_0-fw am64x-rtu1_1-fw"
PRU_ICSS_ALTERNATIVES_am65xx = "am65x-pru0_0-fw am65x-pru0_1-fw am65x-pru1_0-fw am65x-pru1_1-fw am65x-pru2_0-fw am65x-pru2_1-fw am65x-rtu0_0-fw am65x-rtu0_1-fw am65x-rtu1_0-fw am65x-rtu1_1-fw am65x-rtu2_0-fw am65x-rtu2_1-fw"
PRU_ICSS_ALTERNATIVES_j7 = "j7-pru0_0-fw j7-pru0_1-fw j7-pru1_0-fw j7-pru1_1-fw j7-rtu0_0-fw j7-rtu0_1-fw j7-rtu1_0-fw j7-rtu1_1-fw"
@@ -213,6 +225,9 @@ ALTERNATIVE_LINK_NAME[k2g-pru0_1-fw] = "${base_libdir}/firmware/k2g-pru0_1-fw"
ALTERNATIVE_LINK_NAME[k2g-pru1_0-fw] = "${base_libdir}/firmware/k2g-pru1_0-fw"
ALTERNATIVE_LINK_NAME[k2g-pru1_1-fw] = "${base_libdir}/firmware/k2g-pru1_1-fw"

+ALTERNATIVE_LINK_NAME[am62x-pru0-fw] = "${base_libdir}/firmware/am62x-pru0-fw"
+ALTERNATIVE_LINK_NAME[am62x-pru1-fw] = "${base_libdir}/firmware/am62x-pru1-fw"
+
ALTERNATIVE_LINK_NAME[am64x-pru0_0-fw] = "${base_libdir}/firmware/am64x-pru0_0-fw"
ALTERNATIVE_LINK_NAME[am64x-pru0_1-fw] = "${base_libdir}/firmware/am64x-pru0_1-fw"
ALTERNATIVE_LINK_NAME[am64x-pru1_0-fw] = "${base_libdir}/firmware/am64x-pru1_0-fw"
@@ -284,6 +299,9 @@ ALTERNATIVE_TARGET_pru-icss-halt[k2g-pru0_1-fw] = "${base_libdir}/firmware/pru/P
ALTERNATIVE_TARGET_pru-icss-halt[k2g-pru1_0-fw] = "${base_libdir}/firmware/pru/PRU_Halt.out"
ALTERNATIVE_TARGET_pru-icss-halt[k2g-pru1_1-fw] = "${base_libdir}/firmware/pru/PRU_Halt.out"

+ALTERNATIVE_TARGET_pru-icss-halt[am62x-pru0-fw] = "${base_libdir}/firmware/pru/PRU_Halt.out"
+ALTERNATIVE_TARGET_pru-icss-halt[am62x-pru1-fw] = "${base_libdir}/firmware/pru/PRU_Halt.out"
+
ALTERNATIVE_TARGET_pru-icss-halt[am64x-pru0_0-fw] = "${base_libdir}/firmware/pru/PRU_Halt_0.out"
ALTERNATIVE_TARGET_pru-icss-halt[am64x-pru0_1-fw] = "${base_libdir}/firmware/pru/PRU_Halt_1.out"
ALTERNATIVE_TARGET_pru-icss-halt[am64x-pru1_0-fw] = "${base_libdir}/firmware/pru/PRU_Halt_0.out"
@@ -353,6 +371,9 @@ ALTERNATIVE_TARGET_pru-icss-rpmsg-echo[k2g-pru0_1-fw] = "${base_libdir}/firmware
ALTERNATIVE_TARGET_pru-icss-rpmsg-echo[k2g-pru1_0-fw] = "${base_libdir}/firmware/pru/PRU_RPMsg_Echo_Interrupt1_0.out"
ALTERNATIVE_TARGET_pru-icss-rpmsg-echo[k2g-pru1_1-fw] = "${base_libdir}/firmware/pru/PRU_RPMsg_Echo_Interrupt1_1.out"

+ALTERNATIVE_TARGET_pru-icss-rpmsg-echo[am62x-pru0-fw] = "${base_libdir}/firmware/pru/PRU_RPMsg_Echo_Interrupt0.out"
+ALTERNATIVE_TARGET_pru-icss-rpmsg-echo[am62x-pru1-fw] = "${base_libdir}/firmware/pru/PRU_RPMsg_Echo_Interrupt1.out"
+
ALTERNATIVE_TARGET_pru-icss-rpmsg-echo[am64x-pru0_0-fw] = "${base_libdir}/firmware/pru/PRU_RPMsg_Echo_Interrupt0_0.out"
ALTERNATIVE_TARGET_pru-icss-rpmsg-echo[am64x-pru0_1-fw] = "${base_libdir}/firmware/pru/PRU_RPMsg_Echo_Interrupt0_1.out"
ALTERNATIVE_TARGET_pru-icss-rpmsg-echo[am64x-pru1_0-fw] = "${base_libdir}/firmware/pru/PRU_RPMsg_Echo_Interrupt1_0.out"
--
2.17.1


[master/dunfell PATCH v1 1/2] pru-icss_git.bb: update to PSSP v6.1.0

Nick Saulnier
 

Update the SDK folder example-applications/pru-icss-x.x.x to install the latest
version of the PRU Software Support Package (PSSP).

This also uses PSSP v6.1.0 to generate the PRU Halt and RPMsg binaries in the
Linux SDK default filesystem image under /lib/firmware.

Signed-off-by: Nick Saulnier <nsaulnier@...>
---
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 bc085c24b5fb..ac75103d31d6 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 = "8eee431384b6a1a9c96ae91a8e99485176b4d2b3"
+SRCREV = "ae1decf0b494b2904e6157e1379691ffc468f0cf"

-PV = "6.0.1"
+PV = "6.1.0"
PR = "r0"

require recipes-ti/includes/ti-paths.inc
--
2.17.1


[dunfell][PATCH v5] machine: Add am62xx evm configuration

Ryan Eatmon
 

From: Nishanth Menon <nm@...>

Lets add the basic AM62xx-evm configuration.
- Add configurations.
- Add firmware overrides.
- Add u-boot overrides.
- Update TI_LINUX_FW_SRCREV and K3_IMAGE_GEN_SRCREV to appropriate SHAs.

Signed-off-by: Nishanth Menon <nm@...>
Signed-off-by: Hari Nagalla <hnagalla@...>
Signed-off-by: Praneeth Bajjuri <praneeth@...>
Signed-off-by: Ryan Eatmon <reatmon@...>
---
v5: Further cleanup from testing in prep for initial support.
v4: Removed tabs that made their way into some of the files, and added
more to the commit message.
v3: Squashed and cleaned up the previous patches.
v2: Removed ti-graphics patch, and removed lpm-demo patches.

conf/machine/am62xx-evm-k3r5.conf | 11 +++++++
conf/machine/am62xx-evm.conf | 11 +++++++
conf/machine/include/am62xx.inc | 17 ++++++++++
recipes-bsp/ti-linux-fw/ti-linux-fw.inc | 4 +--
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 | 38 +++++++++++++++++++---
7 files changed, 99 insertions(+), 7 deletions(-)
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..0588d34c
--- /dev/null
+++ b/conf/machine/am62xx-evm.conf
@@ -0,0 +1,11 @@
+#@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 \
+"
+
+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-linux-fw/ti-linux-fw.inc b/recipes-bsp/ti-linux-fw/ti-linux-fw.inc
index faf998dd..a00df108 100644
--- a/recipes-bsp/ti-linux-fw/ti-linux-fw.inc
+++ b/recipes-bsp/ti-linux-fw/ti-linux-fw.inc
@@ -19,12 +19,12 @@ CADENCE_MHDP_FW_VERSION = "1.2.17"
IMG_DEC_FW_VERSION = "1.0"
CNM_WAVE521_FW_VERSION = "1.0.00"

-TI_LINUX_FW_SRCREV ?= "0f4905088d24e474063f33777559149e11538be5"
+TI_LINUX_FW_SRCREV ?= "e13611ff1da6448d80279cc8c43b81cb2275cb0d"
SRCREV = "${TI_LINUX_FW_SRCREV}"

BRANCH ?= "ti-linux-firmware"

-K3_IMAGE_GEN_SRCREV ?= "f1db75bdc506287a9d04b0afbbb3d853a0948179"
+K3_IMAGE_GEN_SRCREV ?= "b0386fe221fc9124fda0cd2efb03d62710b1d90f"
SRCREV_imggen = "${K3_IMAGE_GEN_SRCREV}"
SRCREV_FORMAT = "imggen"

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..56a74899 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 = "am62xx"

FILESEXTRAPATHS_prepend := "${METATIBASE}/recipes-bsp/ti-sci-fw/files/:"
require recipes-bsp/ti-linux-fw/ti-linux-fw.inc
@@ -50,11 +51,11 @@ DM_FIRMWARE = "ipc_echo_testb_mcu1_0_release_strip.xer5f"

# J7 HS support
do_install_prepend_j7-hs-evm() {
- export TI_SECURE_DEV_PKG=${TI_SECURE_DEV_PKG}
- ( cd ${RTOS_DM_FW_DIR}; \
- mv ${DM_FIRMWARE} ${DM_FIRMWARE}.unsigned; \
- ${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh ${DM_FIRMWARE}.unsigned ${DM_FIRMWARE}; \
- )
+ export TI_SECURE_DEV_PKG=${TI_SECURE_DEV_PKG}
+ ( cd ${RTOS_DM_FW_DIR}; \
+ mv ${DM_FIRMWARE} ${DM_FIRMWARE}.unsigned; \
+ ${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh ${DM_FIRMWARE}.unsigned ${DM_FIRMWARE}; \
+ )
}

# J7 HS support
@@ -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


Re: [dunfell][PATCH] Rename the am62xx-evm platform to am62xx-sk

Denys Dmytriyenko
 

On Tue, Apr 05, 2022 at 12:36:28PM -0500, Nishanth Menon via lists.yoctoproject.org wrote:
On 12:04-20220405, Ryan Eatmon via lists.yoctoproject.org wrote:
Signed-off-by: Ryan Eatmon <reatmon@...>

Could we please add a commit message explaining reasoning?

This is overall, IMHO a bad idea. sk is ONE of the boards we will
support with the same build. See am335x, 437x etc.. if we start spawning
off per board builds, there is never an end to the confusion this will
create.

So two choices:
a) stick with evm as default (all encompasing builds) and exceptions as
specific boards
OR
b) start building ever board as a separate yocto machine.

I strongly discourage (b), it just creates confusion!
I agree here. Historically, we've had SK (Starter Kit) boards in other SoC
families in the past. But we tried to have a super-set platform in meta-ti to
support as many of the board variants, as possible, usually named EVMs. I
don't remember exactly, but I do believe there were one or two instances where
SK or IDK or even a community board came before the EVM, but we still tried
to keep the super-set under the EVM umbrella.

--
Regards,
Denys Dmytriyenko <denis@...>
PGP: 0x420902729A92C964 - https://denix.org/0x420902729A92C964
Fingerprint: 25FC E4A5 8A72 2F69 1186 6D76 4209 0272 9A92 C964


Re: [dunfell][PATCH] Rename the am62xx-evm platform to am62xx-sk

Nishanth Menon
 

On 12:04-20220405, Ryan Eatmon via lists.yoctoproject.org wrote:
Signed-off-by: Ryan Eatmon <reatmon@...>

Could we please add a commit message explaining reasoning?

This is overall, IMHO a bad idea. sk is ONE of the boards we will
support with the same build. See am335x, 437x etc.. if we start spawning
off per board builds, there is never an end to the confusion this will
create.

So two choices:
a) stick with evm as default (all encompasing builds) and exceptions as
specific boards
OR
b) start building ever board as a separate yocto machine.

I strongly discourage (b), it just creates confusion!

--
Regards,
Nishanth Menon
Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3 1A34 DDB5 849D 1736 249D

261 - 280 of 14873