linux-ti-staging-rt: Bump to 08.04.00.005 release

Updated the linux rt version for 08.04.00.005 Signed-off-by: Ryan Eatmon <reatmon@ti.com>
linux-ti-staging: Bump to 08.04.00.005 release
2026-01-12 01:20:20 +00:00 · 2022-07-26 07:38:29 -05:00 · 2022-07-26 07:38:28 -05:00 · 2022-07-26 07:38:28 -05:00 · 2022-07-25 14:58:22 -05:00 · 2022-07-25 14:57:41 -05:00
15 changed files with 23 additions and 16 deletions
--- a/conf/machine/am57xx-evm.conf
+++ b/conf/machine/am57xx-evm.conf
@@ -13,9 +13,9 @@ KERNEL_DEVICETREE = " \
    am57xx-beagle-x15-revb1.dtb \
    am57xx-beagle-x15-revc.dtb \
    am5729-beagleboneai.dtb \
-    am57xx-evm.dtb \
+    ${@oe.utils.conditional('ARAGO_BRAND', 'mainline', '', 'am57xx-evm.dtb', d)} \
    ti/am57xx-evm-common.dtbo \
-    am57xx-evm-reva3.dtb \
+    ${@oe.utils.conditional('ARAGO_BRAND', 'mainline', '', 'am57xx-evm-reva3.dtb', d)} \
    ti/am57xx-evm-reva3.dtbo \
    am571x-idk.dtb \
    ti/am571x-idk-touchscreen.dtbo \
@@ -25,7 +25,7 @@ KERNEL_DEVICETREE = " \
    ti/am572x-idk-touchscreen.dtbo \
    ti/lcd-osd101t2587.dtbo \
    ti/lcd-osd101t2045.dtbo \
-    ti/ov10635.dtbo \
+    ${@oe.utils.conditional('ARAGO_BRAND', 'mainline', '', 'ti/ov10635.dtbo', d)} \
 "

 KERNEL_DEVICETREE += "${@oe.utils.conditional('ENABLE_TI_UIO_DEVICES', '1', 'am574x-idk-pru-excl-uio.dtb am572x-idk-pru-excl-uio.dtb am571x-idk-pru-excl-uio.dtb', '', d)}"
--- a/conf/machine/dra7xx-evm.conf
+++ b/conf/machine/dra7xx-evm.conf
@@ -12,7 +12,7 @@ KERNEL_DEVICETREE = " \
    dra7-evm.dtb \
    ti/dra7x-evm-osd-lcd-common.dtbo \
    dra71-evm.dtb \
-    dra71-evm-nand.dtb \
+    ${@oe.utils.conditional('ARAGO_BRAND', 'mainline', '', 'dra71-evm-nand.dtb', d)} \
    ti/dra71-evm-lcd-auo-g101evn01.0.dtbo \
    dra72-evm.dtb \
    dra72-evm-revc.dtb \
--- a/conf/machine/include/ti43x.inc
+++ b/conf/machine/include/ti43x.inc
@@ -27,9 +27,11 @@ PREFERRED_PROVIDER_u-boot = "u-boot-ti-staging"
 KERNEL_IMAGETYPE = "zImage"

 KERNEL_DEVICETREE = " \
-    am437x-gp-evm.dtb am437x-gp-evm-hdmi.dtb \
+    am437x-gp-evm.dtb \
+    ${@oe.utils.conditional('ARAGO_BRAND', 'mainline', '', 'am437x-gp-evm-hdmi.dtb', d)} \
    am437x-sk-evm.dtb am437x-idk-evm.dtb \
-    am43x-epos-evm.dtb am43x-epos-evm-hdmi.dtb \
+    am43x-epos-evm.dtb \
+    ${@oe.utils.conditional('ARAGO_BRAND', 'mainline', '', 'am43x-epos-evm-hdmi.dtb', d)} \
 "

 KERNEL_DEVICETREE += "${@oe.utils.conditional('ENABLE_TI_UIO_DEVICES', '1', 'am437x-idk-pru-excl-uio.dtb', '', d)}"
--- a/conf/machine/j7-hs-evm-k3r5.conf
+++ b/conf/machine/j7-hs-evm-k3r5.conf
@@ -7,6 +7,7 @@ require conf/machine/include/k3r5.inc
 SYSFW_SOC = "j721e"
 SYSFW_CONFIG = "evm"
 SYSFW_SUFFIX = "hs"
+SYSFW_SYMLINK = ""

 UBOOT_MACHINE = "j721e_hs_evm_r5_defconfig"

--- a/conf/machine/j7200-hs-evm-k3r5.conf
+++ b/conf/machine/j7200-hs-evm-k3r5.conf
@@ -4,7 +4,7 @@

 require conf/machine/include/k3r5.inc

-SYSFW_SOC = "j7200"
+SYSFW_SOC = "j7200_sr2"
 SYSFW_CONFIG = "evm"
 SYSFW_SUFFIX = "hs"

--- a/recipes-bsp/ti-img-encode-decode/viddec-test-app_1.0.0.bb
+++ b/recipes-bsp/ti-img-encode-decode/viddec-test-app_1.0.0.bb
@@ -6,6 +6,8 @@ DEPENDS = "libdrm ffmpeg"

 inherit autotools pkgconfig

+COMPATIBLE_MACHINE = "j7-evm|j7-hs-evm"
+
 PR = "r1"
 SRCREV = "94a80c8c090dbfdc7fafd4e5bb78c2091e715af2"

--- a/recipes-bsp/ti-img-encode-decode/videnc-test-app_1.0.0.bb
+++ b/recipes-bsp/ti-img-encode-decode/videnc-test-app_1.0.0.bb
@@ -6,6 +6,8 @@ DEPENDS = "libdrm"

 inherit autotools pkgconfig

+COMPATIBLE_MACHINE = "j7-evm|j7-hs-evm"
+
 PR = "r0"
 SRCREV = "a5e7d820bea1be24f25a8369d4d4521c784f869a"

--- a/recipes-bsp/ti-linux-fw/ti-linux-fw.inc
+++ b/recipes-bsp/ti-linux-fw/ti-linux-fw.inc
@@ -25,7 +25,7 @@ SRCREV = "${TI_LINUX_FW_SRCREV}"

 BRANCH ?= "ti-linux-firmware"

-K3_IMAGE_GEN_SRCREV ?= "f67a3696bb8d9efd052f40b6c67b742d63f6545c"
+K3_IMAGE_GEN_SRCREV ?= "85a70059fc24242ea03653a5014b98100e4da2d6"
 SRCREV_imggen = "${K3_IMAGE_GEN_SRCREV}"
 SRCREV_FORMAT = "imggen"

--- 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 = "r31"
+PR = "r32"

 BRANCH = "ti-u-boot-2021.01"

-SRCREV = "24bb75ba60e716a606bb90150348bfe3a21a5120"
+SRCREV = "a169f4261024397dd3ddb944decc1601a623df2a"
--- a/recipes-bsp/u-boot/u-boot-ti.inc
+++ b/recipes-bsp/u-boot/u-boot-ti.inc
@@ -1,6 +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
-UBOOT_LOCALVERSION = "-g${@d.getVar('SRCPV', True).split('+')[1]}"
+UBOOT_LOCALVERSION = "-g${@d.getVar('SRCPV', True).replace('AUTOINC+','')[:10]}"

 UBOOT_SUFFIX ?= "img"
 SPL_BINARY ?= "MLO"
--- a/recipes-bsp/x-load/x-load_1.46-psp.bb
+++ b/recipes-bsp/x-load/x-load_1.46-psp.bb
@@ -12,7 +12,7 @@ PE = "1"

 # TI PSP v1.46_OMAPPSP_03.00.01.06 (Tag is one commit different)
 SRCREV_pn-${PN} = "fc6d5be15c703d21aef0ae0b8c02177721f0445f"
-SRC_URI = "git://arago-project.org/git/projects/x-load-omap3.git;protocol=git"
+SRC_URI = "git://git.ti.com/git/arago-project-org/x-load-omap3.git;protocol=https"

 S = "${WORKDIR}/git"

--- a/recipes-devtools/k3conf/k3conf_git.bb
+++ b/recipes-devtools/k3conf/k3conf_git.bb
@@ -8,7 +8,7 @@ PV = "0.2+git${SRCPV}"
 COMPATIBLE_MACHINE = "k3"

 BRANCH ?= "master"
-SRCREV = "4ca1c3d330bc1de779909e733483b09a1fc4fe44"
+SRCREV = "48cb8e8d7dc962229a9f318cd512b4ddeec5cdc5"

 SRC_URI = "git://git.ti.com/k3conf/k3conf.git;protocol=git;branch=${BRANCH}"

--- 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 = "1872082f52dc08d10c9db367dd3530fb9b4e5a9c"
+SRCREV = "adb96c641cb03198db729962eb348ca1a16978e2"
 PV = "5.10.120+git${SRCPV}"
--- a/recipes-kernel/linux/linux-ti-staging_5.10.bb
+++ b/recipes-kernel/linux/linux-ti-staging_5.10.bb
@@ -25,7 +25,7 @@ S = "${WORKDIR}/git"

 BRANCH = "ti-linux-5.10.y"

-SRCREV = "b56b1fd4a1c0e331114d15f7030bc8397a7e7b9b"
+SRCREV = "95b90aa828165df6c45d6bb0e1cce905e83a66a7"
 PV = "5.10.120+git${SRCPV}"

 # Append to the MACHINE_KERNEL_PR so that a new SRCREV will cause a rebuild
--- a/recipes-kernel/linux/setup-defconfig.inc
+++ b/recipes-kernel/linux/setup-defconfig.inc
@@ -1,6 +1,6 @@
 # KERNEL_LOCALVERSION can be set to add a tag to the end of the
 # kernel version string.  such as the commit id
-KERNEL_LOCALVERSION = "-g${@d.getVar('SRCPV', True).split('+')[1]}"
+KERNEL_LOCALVERSION = "-g${@d.getVar('SRCPV', True).replace('AUTOINC+','')[:10]}"

 # Check the defconfig file and see if it points to an in kernel
 # defconfig that should be used, or if it is a complete config file
Author	SHA1	Message	Date
Ryan Eatmon	762f490818	linux-ti-staging-rt: Bump to 08.04.00.005 release Updated the linux rt version for 08.04.00.005 Signed-off-by: Ryan Eatmon <reatmon@ti.com>	2022-07-26 07:38:29 -05:00
Ryan Eatmon	658725115b	linux-ti-staging: Bump to 08.04.00.005 release Updated the linux version for 08.04.00.005 Signed-off-by: Ryan Eatmon <reatmon@ti.com>	2022-07-26 07:38:28 -05:00
Ryan Eatmon	4ff67e900c	u-boot-ti-staging: Bump to 08.04.00.005 release Updated the u-boot version for 08.04.00.005 Signed-off-by: Ryan Eatmon <reatmon@ti.com>	2022-07-26 07:38:28 -05:00
Ryan Eatmon	1e23cfaf6e	kernel u-boot: Fix formulation of LOCALVERSION devtool does not work with the current formulation of the LOCALVERSION variables. We need to use SRCPV to avoid AUTOREV on bleeding builds, but there will be no + in the string, so we cannot split on that. Just use SRCPV directly. Signed-off-by: Ryan Eatmon <reatmon@ti.com>	2022-07-25 14:58:22 -05:00
Jonathan Humphreys	a45a3d5786	j7200-hs-evm-k3r5: Move J7200 HS evm support to PG2.0 With J7200 PG1.0 being deprecated, use PG2.0 sysfw when building images for j7200-hs-evm. Also update k3-image-gen version to support this change. Signed-off-by: Jonathan Humphreys <j-humphreys@ti.com> Signed-off-by: Ryan Eatmon <reatmon@ti.com>	2022-07-25 14:57:41 -05:00
Ryan Eatmon	b3ad2944a5	x-load: Remove reference to arago-project.org arago-project.org is being shut down in August. This commit changes the last recipes that point to that old site to point to git.ti.com, or just rmeove the reference entirely. Signed-off-by: Ryan Eatmon <reatmon@ti.com>	2022-07-20 15:31:11 -05:00
Bryan Brattlof	de917485fa	k3conf: update SRCREV to add j721S2 fixes update the SHA for k3conf to pickup the j721s2 fixes Signed-off-by: Bryan Brattlof <bb@ti.com> Signed-off-by: Ryan Eatmon <reatmon@ti.com>	2022-07-20 15:00:43 -05:00
Denys Dmytriyenko	ca89c6ec0f	j7-hs-evm-k3r5: do not create generic sysfw.itb symlink Commit `bdceaa05ac` added SR1.1 support for J721e HS with the idea that the default sysfw.itb will point to SR1.1. For that to work, the config for SR1 has to explicitly disable creating such symlink. Signed-off-by: Denys Dmytriyenko <denys@konsulko.com> Signed-off-by: Ryan Eatmon <reatmon@ti.com>	2022-07-20 14:58:34 -05:00
Ryan Eatmon	2bab786b59	ti-img-encode-decode: Lock test app to j7-evm The test app is not compatible with later versions of j7, so add COMPATIBLE_MACHINE to lock these recipes down to just j7-evm and j7-hs-evm. Signed-off-by: Ryan Eatmon <reatmon@ti.com>	2022-07-14 07:22:56 -05:00
Drew Fustini	00b859dbf7	conf: am43: avoid missing dtb files when ARAGO_BRAND=mainline For ARAGO_BRAND=mainline with the am43xx machines, avoid the inclusion of device tree files that do not exist upstream. Signed-off-by: Drew Fustini <dfustini@baylibre.com> Signed-off-by: Ryan Eatmon <reatmon@ti.com>	2022-07-12 11:42:17 -05:00
Drew Fustini	4b490a2e89	conf: dra7xx-evm: avoid missing dtb files when ARAGO_BRAND=mainline For ARAGO_BRAND=mainline with the dra7xx-evm MACHINE, avoid the inclusion of device tree files that do not exist upstream. Signed-off-by: Drew Fustini <dfustini@baylibre.com> Signed-off-by: Ryan Eatmon <reatmon@ti.com>	2022-07-12 11:42:17 -05:00
Drew Fustini	460c3f0fbd	conf: am57xx-evm: avoid missing dtb files when ARAGO_BRAND=mainline For ARAGO_BRAND=mainline with the am57xx-evm MACHINE, avoid the inclusion of device tree files that do not exist upstream. Signed-off-by: Drew Fustini <dfustini@baylibre.com> Signed-off-by: Ryan Eatmon <reatmon@ti.com>	2022-07-12 11:42:17 -05:00