From 44eb6f819817069ed53de4d44f6ed042f3ae8957 Mon Sep 17 00:00:00 2001 From: Denys Dmytriyenko Date: Mon, 12 Feb 2024 22:33:24 -0500 Subject: 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 Signed-off-by: Ryan Eatmon --- meta-ti-bsp/conf/machine/beagle-x15.conf | 8 +-- meta-ti-bsp/conf/machine/beaglebone-ai64.conf | 4 +- meta-ti-bsp/conf/machine/beaglebone.conf | 57 +++++++++++++++++++--- meta-ti-bsp/conf/machine/beagleplay.conf | 6 ++- .../recipes-bsp/u-boot/u-boot-bb.org_git.bb | 12 ++--- .../recipes-kernel/linux/linux-bb.org_git.bb | 18 +++---- 6 files changed, 78 insertions(+), 27 deletions(-) diff --git a/meta-ti-bsp/conf/machine/beagle-x15.conf b/meta-ti-bsp/conf/machine/beagle-x15.conf index be27705c..d368fe1a 100644 --- 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" diff --git a/meta-ti-bsp/conf/machine/beaglebone-ai64.conf b/meta-ti-bsp/conf/machine/beaglebone-ai64.conf index e529f565..31fb4ac4 100644 --- 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" diff --git a/meta-ti-bsp/conf/machine/beaglebone.conf b/meta-ti-bsp/conf/machine/beaglebone.conf index d9353e9b..7f78b297 100644 --- 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" diff --git a/meta-ti-bsp/conf/machine/beagleplay.conf b/meta-ti-bsp/conf/machine/beagleplay.conf index 7778ba1e..cf86dae2 100644 --- a/meta-ti-bsp/conf/machine/beagleplay.conf +++ b/meta-ti-bsp/conf/machine/beagleplay.conf @@ -32,9 +32,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 \ @@ -42,7 +40,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" diff --git 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 index 5bb20213..13286564 100644 --- 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" diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-bb.org_git.bb b/meta-ti-bsp/recipes-kernel/linux/linux-bb.org_git.bb index 9d798b9f..d6c4b993 100644 --- 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.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 32-bit +SRCREV:armv7a = "a1f26a19581970f76220c68c438981796ce5b767" +PV:armv7a = "6.1.69+git${SRCPV}" +BRANCH:armv7a = "v6.1.69-ti-r22" + +# 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} \ -- cgit v1.2.3-54-g00ecf