CI/CD Auto-Merger: cicd.kirkstone.202402152125

Updated the value(s) for: ti-linux-fw: TI_DM_FW_VERSION,TI_LINUX_FW_SRCREV,TI_SYSFW_VERSION u-boot-ti-staging_2023.04: SRCREV k3conf: SRCREV linux-ti-staging-rt_6.1: SRCREV linux-ti-staging_6.1: SRCREV Signed-off-by: LCPD Automation Script <lcpdbld@list.ti.com>
meta-ti-bsp: update BeagleBoard.org BSP to the latest
2026-01-12 01:20:20 +00:00 · 2024-02-15 21:25:12 -06:00 · 2024-02-13 11:10:41 -06:00 · 2024-02-12 08:53:38 -06:00 · 2024-02-12 08:53:38 -06:00 · 2024-02-12 08:52:55 -06:00
18 changed files with 112 additions and 41 deletions
--- a/meta-ti-bsp/conf/machine/am62pxx-evm.conf
+++ b/meta-ti-bsp/conf/machine/am62pxx-evm.conf
@@ -16,3 +16,10 @@ KERNEL_DEVICETREE = " \
 "

 UBOOT_MACHINE = "am62px_evm_a53_defconfig"
+
+# UBOOT_CONFIG_FRAGMENTS holds the list of u-boot config fragments which has to be build
+# along with the base defconfig mentioned in UBOOT_MACHINE. Refer u-boot-mergeconfig.inc
+# under meta-ti-bsp/recipes-bsp/u-boot/ for more details.
+# For AM62P tisdk-display-cluster image, splash screen is handled by SBL.
+# Hence, disable the A53 based splash screen using the am62px_evm_prune_splashscreen.config fragment present in ti-u-boot tree
+UBOOT_CONFIG_FRAGMENTS = "${@oe.utils.conditional('DISPLAY_CLUSTER_ENABLE', '1', 'am62px_evm_prune_splashscreen.config', '', d)}"
--- a/meta-ti-bsp/conf/machine/beagle-x15.conf
+++ b/meta-ti-bsp/conf/machine/beagle-x15.conf
@@ -9,9 +9,11 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-bb.org"
 KERNEL_DEVICETREE_PREFIX = "am57xx-beagle-x15"

 KERNEL_DEVICETREE = " \
-    am57xx-beagle-x15.dtb \
-    am57xx-beagle-x15-revb1.dtb \
-    am57xx-beagle-x15-revc.dtb \
+am57xx-beagle-x15.dtb \
+am57xx-beagle-x15-revb1.dtb \
+am57xx-beagle-x15-revc.dtb \
+am57xx-idk-lcd-osd101t2045.dtbo \
+am57xx-idk-lcd-osd101t2587.dtbo \
 "

 MACHINE_GUI_CLASS = "bigscreen"
--- a/meta-ti-bsp/conf/machine/beaglebone-ai64.conf
+++ b/meta-ti-bsp/conf/machine/beaglebone-ai64.conf
@@ -11,16 +11,18 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-bb.org"
 KERNEL_DEVICETREE = " \
 ti/k3-j721e-beagleboneai64.dtb \
 ti/k3-j721e-common-proc-board.dtb \
+ti/k3-j721e-beagleboneai64-dsi-rpi-7inch-panel.dtbo \
 ti/k3-j721e-evm-csi2-ov5640.dtbo \
 ti/k3-j721e-evm-fusion.dtbo \
 ti/k3-j721e-evm-gesi-exp-board.dtbo \
+ti/k3-j721e-evm-pcie0-ep.dtbo \
 ti/k3-j721e-evm-quad-port-eth-exp.dtbo \
 ti/k3-j721e-evm-virt-mac-client.dtbo \
+ti/k3-j721e-sk.dtb \
 ti/k3-j721e-sk-csi2-ov5640.dtbo \
 ti/k3-j721e-sk-csi2-rpi-imx219.dtbo \
 ti/k3-j721e-sk-fusion.dtbo \
 ti/k3-j721e-sk-rpi-hdr-ehrpwm.dtbo \
-ti/k3-j721e-sk.dtb \
 "

 MACHINE_GUI_CLASS = "bigscreen"
--- a/meta-ti-bsp/conf/machine/beaglebone.conf
+++ b/meta-ti-bsp/conf/machine/beaglebone.conf
@@ -9,12 +9,57 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-bb.org"
 KERNEL_DEVICETREE_PREFIX = "am335x-bone"

 KERNEL_DEVICETREE = " \
-    am335x-bone.dtb \
-    am335x-boneblue.dtb \
-    am335x-boneblack.dtb \
-    am335x-boneblack-wireless.dtb \
-    am335x-bonegreen.dtb \
-    am335x-bonegreen-wireless.dtb \
+am335x-bone.dtb \
+am335x-boneblack.dtb \
+am335x-boneblack-pps.dtb \
+am335x-boneblack-uboot.dtb \
+am335x-boneblack-uboot-univ.dtb \
+am335x-boneblack-wireless.dtb \
+am335x-boneblue.dtb \
+am335x-bonegreen.dtb \
+am335x-bonegreen-gateway.dtb \
+am335x-bonegreen-wireless.dtb \
+am335x-bonegreen-wireless-uboot-univ.dtb \
+am335x-pocketbeagle.dtb \
+am335x-sancloud-bbe.dtb \
+am335x-sancloud-bbe-extended-wifi.dtb \
+am335x-sancloud-bbe-lite.dtb \
+"
+
+# Extra DT overlays/capes
+KERNEL_DEVICETREE += " \
+AM335X-PRU-UIO-00A0.dtbo \
+BB-ADC-00A0.dtbo \
+BB-BBBW-WL1835-00A0.dtbo \
+BB-BBGG-WL1835-00A0.dtbo \
+BB-BBGW-WL1835-00A0.dtbo \
+BB-BONE-4D5R-01-00A1.dtbo \
+BB-BONE-eMMC1-01-00A0.dtbo \
+BB-BONE-LCD4-01-00A1.dtbo \
+BB-BONE-NH7C-01-A0.dtbo \
+BB-CAPE-DISP-CT4-00A0.dtbo \
+BB-HDMI-TDA998x-00A0.dtbo \
+BB-I2C1-MCP7940X-00A0.dtbo \
+BB-I2C1-RTC-DS3231.dtbo \
+BB-I2C1-RTC-PCF8563.dtbo \
+BB-I2C2-BME680.dtbo \
+BB-I2C2-MPU6050.dtbo \
+BB-LCD-ADAFRUIT-24-SPI1-00A0.dtbo \
+BB-NHDMI-TDA998x-00A0.dtbo \
+BBORG_COMMS-00A2.dtbo \
+BBORG_FAN-A000.dtbo \
+BBORG_RELAY-00A2.dtbo \
+BB-SPIDEV0-00A0.dtbo \
+BB-SPIDEV1-00A0.dtbo \
+BB-UART1-00A0.dtbo \
+BB-UART2-00A0.dtbo \
+BB-UART4-00A0.dtbo \
+BB-W1-P9.12-00A0.dtbo \
+BONE-ADC.dtbo \
+M-BB-BBG-00A0.dtbo \
+M-BB-BBGG-00A0.dtbo \
+PB-MIKROBUS-0.dtbo \
+PB-MIKROBUS-1.dtbo \
 "

 MACHINE_GUI_CLASS = "bigscreen"
--- a/meta-ti-bsp/conf/machine/beagleplay.conf
+++ b/meta-ti-bsp/conf/machine/beagleplay.conf
@@ -33,9 +33,7 @@ ti/k3-am625-sk.dtb \
 ti/k3-am625-sk-dmtimer-pwm.dtbo \
 ti/k3-am625-sk-ecap-capture.dtbo \
 ti/k3-am625-sk-lincolntech-lcd185-panel.dtbo \
-ti/k3-am625-sk-mcan.dtbo \
 ti/k3-am625-sk-mcspi-loopback.dtbo \
-ti/k3-am625-sk-mcu-gpio-wakeup.dtbo \
 ti/k3-am625-sk-microtips-mf101hie-panel.dtbo \
 ti/k3-am625-sk-microtips-mf103hie-lcd2.dtbo \
 ti/k3-am625-sk-pwm.dtbo \
@@ -43,7 +41,11 @@ ti/k3-am625-sk-rpi-hdr-ehrpwm.dtbo \
 ti/k3-am62x-sk-csi2-imx219.dtbo \
 ti/k3-am62x-sk-csi2-ov5640.dtbo \
 ti/k3-am62x-sk-csi2-tevi-ov5640.dtbo \
+ti/k3-am62x-sk-csi2-v3link-fusion.dtbo \
+ti/k3-am62x-sk-eqep.dtbo \
 ti/k3-am62x-sk-hdmi-audio.dtbo \
+ti/k3-am62x-sk-lpm-wkup-sources.dtbo \
+ti/k3-am62x-sk-mcan.dtbo \
 "

 MACHINE_GUI_CLASS = "bigscreen"
--- a/meta-ti-bsp/conf/machine/include/am62pxx.inc
+++ b/meta-ti-bsp/conf/machine/include/am62pxx.inc
@@ -17,3 +17,6 @@ OPTEEMACHINE = "k3-am62x"
 MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "cnm-wave-fw"

 SERIAL_CONSOLES = "115200;ttyS2"
+
+# Bitmap image tarball for early splashscreen
+IMAGE_BOOT_FILES += "ti_logo_414x97_32bpp.bmp.gz"
--- a/meta-ti-bsp/recipes-bsp/ti-linux-fw/ti-linux-fw.inc
+++ b/meta-ti-bsp/recipes-bsp/ti-linux-fw/ti-linux-fw.inc
@@ -14,10 +14,10 @@ GOODIX_FW_VERSION = "1.0.0.0"
 CADENCE_MHDP_FW_VERSION = "2.1.0"
 IMG_DEC_FW_VERSION = "1.0"
 CNM_WAVE521_FW_VERSION = "1.0.3"
-TI_DM_FW_VERSION = "09.01.02"
-TI_SYSFW_VERSION = "09.01.08"
+TI_DM_FW_VERSION = "09.02.01"
+TI_SYSFW_VERSION = "09.02.01"

-TI_LINUX_FW_SRCREV ?= "0350c2edecabc4c828eb28dc993a3059f33b4262"
+TI_LINUX_FW_SRCREV ?= "2f2a82ba41dfb724ffd82104ca2bbb5afc756a25"
 SRCREV = "${TI_LINUX_FW_SRCREV}"

 BRANCH ?= "ti-linux-firmware"
--- a/meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-ti.inc
+++ b/meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-ti.inc
@@ -1,5 +1,5 @@
-PV:k3 = "2.9+git${SRCPV}"
-SRCREV_tfa:k3 = "d7a7135d32a8c7da004c0c19b75bd4e2813f9759"
+PV:k3 = "2.10+git${SRCPV}"
+SRCREV_tfa:k3 = "00f1ec6b8740ccd403e641131e294aabacf2a48b"
 SRC_URI:k3 = "git://git.trustedfirmware.org/TF-A/trusted-firmware-a.git;protocol=https;name=tfa;branch=master"
 COMPATIBLE_MACHINE:k3 = "k3"
 TFA_BUILD_TARGET:k3 = "all"
--- a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-bb.org_git.bb
+++ b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-bb.org_git.bb
@@ -8,10 +8,10 @@ PV = "2023.04"

 UBOOT_GIT_URI = "git://github.com/beagleboard/u-boot.git"
 UBOOT_GIT_PROTOCOL = "https"
-BRANCH = "v2023.04-ti-09.00.00.011"
-SRCREV = "4b8f8be8870f03d92a2b01d0d30ab912118adc82"
+BRANCH = "v2023.04-ti-09.01.00.008"
+SRCREV = "b0d717b732ee28e446baf94522b3491e590f7fbb"

-BRANCH:beagleplay = "v2023.04-ti-09.00.00.011-BeaglePlay"
-BRANCH:beagleplay-k3r5 = "v2023.04-ti-09.00.00.011-BeaglePlay"
-SRCREV:beagleplay = "10afea462ea1113701f6f0f8853fdff985aa275d"
-SRCREV:beagleplay-k3r5 = "10afea462ea1113701f6f0f8853fdff985aa275d"
+BRANCH:beagleplay = "v2023.04-ti-09.01.00.008-BeaglePlay"
+BRANCH:beagleplay-k3r5 = "v2023.04-ti-09.01.00.008-BeaglePlay"
+SRCREV:beagleplay = "43791d945f4e5c25bcc19b9c778e8f9d194dc16e"
+SRCREV:beagleplay-k3r5 = "43791d945f4e5c25bcc19b9c778e8f9d194dc16e"
--- a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2023.04.bb
+++ b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2023.04.bb
@@ -6,4 +6,4 @@ PR = "r0"

 BRANCH = "ti-u-boot-2023.04"

-SRCREV = "28eaa6eb15204cb3e3cc8ed938341392c62dc218"
+SRCREV = "7d050099177240f6cdf8992310f2cf4941e954af"
--- a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc
+++ b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc
@@ -341,4 +341,14 @@ do_deploy:append:am62xx() {
 	install -m 0644 ${S}/tools/logos/ti_logo_414x97_32bpp.bmp.gz ${DEPLOYDIR}
 }

+do_install:append:am62pxx() {
+	install -d ${D}/boot
+	install -m 0644 ${S}/tools/logos/ti_logo_414x97_32bpp.bmp.gz ${D}/boot
+}
+
+do_deploy:append:am62pxx() {
+	install -d ${DEPLOYDIR}
+	install -m 0644 ${S}/tools/logos/ti_logo_414x97_32bpp.bmp.gz ${DEPLOYDIR}
+}
+
 TOOLCHAIN = "gcc"
--- a/meta-ti-bsp/recipes-devtools/k3conf/k3conf_git.bb
+++ b/meta-ti-bsp/recipes-devtools/k3conf/k3conf_git.bb
@@ -10,7 +10,7 @@ PV = "0.3+git${SRCPV}"
 COMPATIBLE_MACHINE = "k3"

 BRANCH ?= "master"
-SRCREV = "f4dd78ab6d3372e6326f90639b5f8f57607369d0"
+SRCREV = "cadf72379c7eec7e69031cc939d5a85f209017d6"

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

--- a/meta-ti-bsp/recipes-kernel/linux/linux-bb.org_git.bb
+++ b/meta-ti-bsp/recipes-kernel/linux/linux-bb.org_git.bb
@@ -19,15 +19,15 @@ KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT} ${EXTRA_DTC_ARGS}"

 S = "${WORKDIR}/git"

-# 6.1.46 version for 32-bit
-SRCREV:armv7a = "0df74a0c083222077e8def3ec7e52c75f7eff2f0"
-PV:armv7a = "6.1.46+git${SRCPV}"
-BRANCH:armv7a = "v6.1.46-ti-r13"
+# 6.1.69 version for 32-bit
+SRCREV:armv7a = "a1f26a19581970f76220c68c438981796ce5b767"
+PV:armv7a = "6.1.69+git${SRCPV}"
+BRANCH:armv7a = "v6.1.69-ti-r22"

-# 6.1.46 version for 64-bit
-SRCREV:aarch64 = "f47f74d11b19d8ae2f146de92c258f40e0930d86"
-PV:aarch64 = "6.1.46+git${SRCPV}"
-BRANCH:aarch64 = "v6.1.46-ti-arm64-r13"
+# 6.1.69 version for 64-bit
+SRCREV:aarch64 = "bc76b5d278271f66a6faeb2d09cb09fc6c57dd3c"
+PV:aarch64 = "6.1.69+git${SRCPV}"
+BRANCH:aarch64 = "v6.1.69-ti-arm64-r24"

 SRC_URI = " \
    git://github.com/beagleboard/linux.git;protocol=https;branch=${BRANCH} \
--- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt_6.1.bb
+++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt_6.1.bb
@@ -6,7 +6,7 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-6.1:"

 BRANCH = "ti-rt-linux-6.1.y"

-SRCREV = "3dace366de06c5b1927ed082fbeac0b4bee29cbc"
+SRCREV = "bdebf4319d95b46edd39be72d937d1e0086865fe"

 include ${@ 'recipes-kernel/linux/ti-extras-rt.inc' if d.getVar('TI_EXTRAS') else ''}

--- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.1.bb
+++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.1.bb
@@ -23,7 +23,7 @@ S = "${WORKDIR}/git"

 BRANCH ?= "ti-linux-6.1.y"

-SRCREV ?= "2233af66faf7b81b6c286285e50cda5595dc410d"
+SRCREV ?= "77aa27cbdca359bf0735b36ada464ec65b520943"
 PV = "6.1.69+git${SRCPV}"

 # Append to the MACHINE_KERNEL_PR so that a new SRCREV will cause a rebuild
--- a/meta-ti-bsp/recipes-security/optee/optee-client-ti-version.inc
+++ b/meta-ti-bsp/recipes-security/optee/optee-client-ti-version.inc
@@ -1,2 +1,2 @@
-PV = "4.0.0+git${SRCPV}"
-SRCREV = "acb0885c117e73cb6c5c9b1dd9054cb3f93507ee"
+PV = "4.1.0+git${SRCPV}"
+SRCREV = "f7e4ced15d1fefd073bbfc484fe0e1f74afe96c2"
--- a/meta-ti-bsp/recipes-security/optee/optee-os-ti-version.inc
+++ b/meta-ti-bsp/recipes-security/optee/optee-os-ti-version.inc
@@ -1,2 +1,2 @@
-PV = "4.0.0+git${SRCPV}"
-SRCREV = "2a5b1d1232f582056184367fb58a425ac7478ec6"
+PV = "4.1.0+git${SRCPV}"
+SRCREV = "012cdca49db398693903e05c42a254a3a0c0d8f2"
--- a/meta-ti-bsp/recipes-security/optee/optee-test-ti-version.inc
+++ b/meta-ti-bsp/recipes-security/optee/optee-test-ti-version.inc
@@ -1,2 +1,2 @@
-PV = "4.0.0+git${SRCPV}"
-SRCREV = "1c3d6be5eaa6174e3dbabf60928d15628e39b994"
+PV = "4.1.0+git${SRCPV}"
+SRCREV = "2e1e7a9c9d659585566a75fc8802f4758c42bcb2"
Author	SHA1	Message	Date
LCPD Automation Script	8899ce3b9e	CI/CD Auto-Merger: cicd.kirkstone.202402152125 Updated the value(s) for: ti-linux-fw: TI_DM_FW_VERSION,TI_LINUX_FW_SRCREV,TI_SYSFW_VERSION u-boot-ti-staging_2023.04: SRCREV k3conf: SRCREV linux-ti-staging-rt_6.1: SRCREV linux-ti-staging_6.1: SRCREV Signed-off-by: LCPD Automation Script <lcpdbld@list.ti.com>	2024-02-15 21:25:12 -06:00
Denys Dmytriyenko	0b2084fe01	meta-ti-bsp: update BeagleBoard.org BSP to the latest * Update linux-bb.org to 6.1.69 for both 32 and 64 bit platforms * Update u-boot-bb.org to the latest 2023.04 based on SDK 9.1 release * Update DTB/DTBO lists to include latest renames and additions Note: all changes are in a single commit for bisectability Signed-off-by: Denys Dmytriyenko <denys@konsulko.com> Signed-off-by: Ryan Eatmon <reatmon@ti.com>	2024-02-13 11:10:41 -06:00
Manorit Chawdhry	c581978fb0	meta-ti-bsp: trusted-firmware-arm: Update to master The current master has the support for power off functionality, update to that. Signed-off-by: Manorit Chawdhry <m-chawdhry@ti.com> Signed-off-by: Ryan Eatmon <reatmon@ti.com>	2024-02-12 08:53:38 -06:00
Manorit Chawdhry	da756d0af2	meta-ti-bsp: optee: Upgrade to 4.1 Update all OP-TEE components to 4.1 tag. OP-TEE examples are already in 4.1 tag. Signed-off-by: Manorit Chawdhry <m-chawdhry@ti.com> Signed-off-by: Ryan Eatmon <reatmon@ti.com>	2024-02-12 08:53:38 -06:00
Chirag Shilwant	c19e78af50	conf: machine: Apply U-boot fragment configs for AM62P Display Cluster Image - For AM62P tisdk-display-cluster image[1], Splash Screen is handled by SBL[2]. Hence, disable the A53 based U-boot Splash Screen using the am62px_evm_prune_splashscreen.config fragment present in ti-u-boot tree. - Apply a check on DISPLAY_CLUSTER_ENABLE variable[3] to ensure we apply am62px_evm_prune_splashscreen.config only incase of tisdk-display-cluster image as tisdk-default-image will still have the A53 based U-boot Splash Screen. References ---------- [1] https://git.ti.com/cgit/ti-sdk-linux/meta-tisdk/tree/recipes-core/images/tisdk-display-cluster-image.bb?h=kirkstone [2] https://software-dl.ti.com/mcu-plus-sdk/esd/AM62PX/09_01_00_39/exports/docs/api_guide_am62px/EXAMPLES_DRIVERS_DSS_DISPLAY_SHARE.html [3] https://software-dl.ti.com/processor-sdk-linux/esd/AM62PX/09_01_00_08/exports/docs/linux/Overview_Building_the_SDK.html#build-steps Signed-off-by: Chirag Shilwant <c-shilwant@ti.com> Signed-off-by: Ryan Eatmon <reatmon@ti.com>	2024-02-12 08:52:55 -06:00
Devarsh Thakkar	75cb95609f	meta-ti-bsp: Add bootsplash image file for AM62P Add TI logo image as bootsplash image file for AM62P and install it in boot directory from where u-boot can read from and display during boot-up time. Signed-off-by: Devarsh Thakkar <devarsht@ti.com> Acked-by: Chirag Shilwant <c-shilwant@ti.com> Signed-off-by: Ryan Eatmon <reatmon@ti.com>	2024-02-08 13:22:16 -06:00