diff mbox series

[meta-ti,kirkstone,1/1] linux-bb.org: update to 6.1.46 for aarch64 targets

Message ID 20231019113938.1657179-2-p-mantena@ti.com
State Rejected
Delegated to: Ryan Eatmon
Headers show
Series Update BBAI64 aarch64 target version | expand

Commit Message

Prasanth Mantena Oct. 19, 2023, 11:39 a.m. UTC 
Updates SRCREV, PV, and BRANCH for aarch64 targets. This fixes the
kernel boot issue. Update the machine conf file, aligning to the changes
made in the naming of devicetree files from 5.10 to 6.1.

Tested by running MACHINE=beaglebone-ai64 bitbake tisdk-default-image
and booting the beagleboneai64 with the images.

Signed-off-by: Prasanth Babu Mantena <p-mantena@ti.com>
---
 meta-ti-bsp/conf/machine/beaglebone-ai64.conf | 72 ++++++-------------
 .../recipes-kernel/linux/linux-bb.org_git.bb  |  8 +--
 2 files changed, 24 insertions(+), 56 deletions(-)
diff mbox series

Patch

diff --git a/meta-ti-bsp/conf/machine/beaglebone-ai64.conf b/meta-ti-bsp/conf/machine/beaglebone-ai64.conf
index bd5f541f..9de15266 100644
--- a/meta-ti-bsp/conf/machine/beaglebone-ai64.conf
+++ b/meta-ti-bsp/conf/machine/beaglebone-ai64.conf
@@ -10,62 +10,30 @@  PREFERRED_PROVIDER_virtual/kernel = "linux-bb.org"
 
 KERNEL_DEVICETREE = " \
 ti/k3-j721e-beagleboneai64.dtb \
-ti/k3-j721e-beagleboneai64-no-shared-mem.dtb \
 ti/k3-j721e-common-proc-board.dtb \
-ti/k3-j721e-common-proc-board-infotainment.dtbo \
-ti/k3-j721e-common-proc-board-uarts.dtbo \
-ti/k3-j721e-cpb-csi2-ov5640.dtbo \
-ti/k3-j721e-fpdlink-cpb-fusion.dtbo \
-ti/k3-j721e-fpdlink-imx390-cm-0-0.dtbo \
-ti/k3-j721e-fpdlink-imx390-cm-0-1.dtbo \
-ti/k3-j721e-fpdlink-imx390-cm-0-2.dtbo \
-ti/k3-j721e-fpdlink-imx390-cm-0-3.dtbo \
-ti/k3-j721e-fpdlink-imx390-cm-1-0.dtbo \
-ti/k3-j721e-fpdlink-imx390-cm-1-1.dtbo \
-ti/k3-j721e-fpdlink-imx390-cm-1-2.dtbo \
-ti/k3-j721e-fpdlink-imx390-cm-1-3.dtbo \
-ti/k3-j721e-fpdlink-imx390-rcm-0-0.dtbo \
-ti/k3-j721e-fpdlink-imx390-rcm-0-1.dtbo \
-ti/k3-j721e-fpdlink-imx390-rcm-0-2.dtbo \
-ti/k3-j721e-fpdlink-imx390-rcm-0-3.dtbo \
-ti/k3-j721e-fpdlink-imx390-rcm-1-0.dtbo \
-ti/k3-j721e-fpdlink-imx390-rcm-1-1.dtbo \
-ti/k3-j721e-fpdlink-imx390-rcm-1-2.dtbo \
-ti/k3-j721e-fpdlink-imx390-rcm-1-3.dtbo \
-ti/k3-j721e-fpdlink-sk-fusion.dtbo \
-ti/k3-j721e-gesi-exp-board.dtbo \
-ti/k3-j721e-proc-board-tps65917.dtb \
-ti/k3-j721e-quad-port-eth-exp.dtbo \
+ti/k3-j721e-evm-csi2-ov5640.dtbo \
+ti/k3-j721e-evm.dtb \
+ti/k3-j721e-evm-fusion.dtbo \
+ti/k3-j721e-evm-gesi-exp-board.dtbo \
+ti/k3-j721e-evm-quad-port-eth-exp.dtbo \
+ti/k3-j721e-evm-virt-mac-client.dtbo \
 ti/k3-j721e-sk-csi2-ov5640.dtbo \
+ti/k3-j721e-sk-csi2-rpi-imx219.dtbo \
 ti/k3-j721e-sk.dtb \
-ti/k3-j721e-sk-rpi-cam-imx219.dtbo \
+ti/k3-j721e-sk-fusion.dtbo \
 ti/k3-j721e-sk-rpi-hdr-ehrpwm.dtbo \
-ti/overlays/BBAI64-CSI0-imx219.dtbo \
-ti/overlays/BBAI64-CSI1-imx219.dtbo \
-ti/overlays/BBAI64-DSI-RPi-7inch-panel.dtbo \
-ti/overlays/BBAI64-P8_37-ehrpwm5_a.dtbo \
-ti/overlays/BBAI64-P9_25-ehrpwm4_b.dtbo \
-ti/overlays/BB-I2C2-MPU6050.dtbo \
-ti/overlays/BBORG_LOAD-00A2.dtbo \
-ti/overlays/BBORG_RELAY-00A2.dtbo \
-ti/overlays/BBORG_SERVO-00A2.dtbo \
-ti/overlays/BONE-FAN.dtbo \
-ti/overlays/BONE-I2C1.dtbo \
-ti/overlays/BONE-I2C2.dtbo \
-ti/overlays/BONE-I2C3.dtbo \
-ti/overlays/BONE-LED_P8_03.dtbo \
-ti/overlays/BONE-LED_P9_11.dtbo \
-ti/overlays/BONE-PWM0.dtbo \
-ti/overlays/BONE-PWM1.dtbo \
-ti/overlays/BONE-PWM2.dtbo \
-ti/overlays/BONE-SPI0_0.dtbo \
-ti/overlays/BONE-SPI0_1.dtbo \
-ti/overlays/BONE-SPI1_0.dtbo \
-ti/overlays/BONE-UART1.dtbo \
-ti/overlays/BONE-USB0-host.dtbo \
-ti/overlays/J721E-PRU-UIO-00A0.dtbo \
-ti/overlays/k3-j721e-beagleboneai64-RPi-7inch-panel.dtbo \
-ti/overlays/robotics-cape.dtbo \
+ti/k3-fpdlink-imx390-rcm-0-0.dtbo \
+ti/k3-fpdlink-imx390-rcm-0-1.dtbo \
+ti/k3-fpdlink-imx390-rcm-0-2.dtbo \
+ti/k3-fpdlink-imx390-rcm-0-3.dtbo \
+ti/k3-fpdlink-imx390-rcm-1-0.dtbo \
+ti/k3-fpdlink-imx390-rcm-1-1.dtbo \
+ti/k3-fpdlink-imx390-rcm-1-2.dtbo \
+ti/k3-fpdlink-imx390-rcm-1-3.dtbo \
+ti/k3-fpdlink-ov2312-0-0.dtbo \
+ti/k3-fpdlink-ov2312-0-1.dtbo \
+ti/k3-fpdlink-ov2312-0-2.dtbo \
+ti/k3-fpdlink-ov2312-0-3.dtbo \
 "
 
 MACHINE_GUI_CLASS = "bigscreen"
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 f4c1775d..aab0f9b9 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
@@ -21,10 +21,10 @@  SRCREV:armv7a = "a943fc1987e1b8057b0b5219ecd3c5a85285d62a"
 PV:armv7a = "5.10.168+git${SRCPV}"
 BRANCH:armv7a = "v5.10.168-ti-r70"
 
-# 5.10.162 version for 64-bit
-SRCREV:aarch64 = "a2f5d5746b6c389e58d20fda0a0fa88403da428b"
-PV:aarch64 = "5.10.162+git${SRCPV}"
-BRANCH:aarch64 = "v5.10.162-ti-arm64-r99"
+# 6.1.46 version for 64-bit
+SRCREV:aarch64 = "0a1e93a38c699fdd3c629d57f5cd015f90ab0d36"
+PV:aarch64 = "6.1.46+git${SRCPV}"
+BRANCH:aarch64 = "v6.1.46-ti-arm64-r9"
 
 SRC_URI = " \
     git://github.com/beagleboard/linux.git;protocol=https;branch=${BRANCH} \