diff mbox series

[master/kirkstone] linux-bb.org: update to the latest

Message ID 20231201233755.17721-1-denis@denix.org
State Accepted
Delegated to: Ryan Eatmon
Headers show
Series [master/kirkstone] linux-bb.org: update to the latest | expand

Commit Message

Denys Dmytriyenko Dec. 1, 2023, 11:37 p.m. UTC 
From: Denys Dmytriyenko <denys@konsulko.com>

Update the BB.org kernel to the latest. Also update BeaglePlay device
tree list, as there were some renames and new additions.

Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
 meta-ti-bsp/conf/machine/beagleplay.conf            | 13 +++++++++----
 .../recipes-kernel/linux/linux-bb.org_git.bb        | 12 ++++++------
 2 files changed, 15 insertions(+), 10 deletions(-)
diff mbox series

Patch

diff --git a/meta-ti-bsp/conf/machine/beagleplay.conf b/meta-ti-bsp/conf/machine/beagleplay.conf
index 978bbc5a..ac4a202a 100644
--- a/meta-ti-bsp/conf/machine/beagleplay.conf
+++ b/meta-ti-bsp/conf/machine/beagleplay.conf
@@ -28,17 +28,22 @@  KERNEL_DEVICETREE = " \
 ti/k3-am625-beagleplay.dtb \
 ti/k3-am625-beagleplay-csi2-ov5640.dtbo \
 ti/k3-am625-beagleplay-csi2-tevi-ov5640.dtbo \
+ti/k3-am625-beagleplay-lincolntech-lcd185-panel.dtbo \
 ti/k3-am625-sk.dtb \
-ti/k3-am625-sk-csi2-ov5640.dtbo \
-ti/k3-am625-sk-csi2-tevi-ov5640.dtbo \
 ti/k3-am625-sk-dmtimer-pwm.dtbo \
 ti/k3-am625-sk-ecap-capture.dtbo \
-ti/k3-am625-sk-hdmi-audio.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-rpi-hdr-pwm.dtbo \
+ti/k3-am625-sk-microtips-mf103hie-lcd2.dtbo \
+ti/k3-am625-sk-pwm.dtbo \
+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-hdmi-audio.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 4048e106..9d798b9f 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.33 version for 32-bit
-SRCREV:armv7a = "feb1c153a9693d44dec5772d134bd2c7986ff95d"
-PV:armv7a = "6.1.33+git${SRCPV}"
-BRANCH:armv7a = "v6.1.33-ti-r7"
+# 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 = "0a1e93a38c699fdd3c629d57f5cd015f90ab0d36"
+SRCREV:aarch64 = "f47f74d11b19d8ae2f146de92c258f40e0930d86"
 PV:aarch64 = "6.1.46+git${SRCPV}"
-BRANCH:aarch64 = "v6.1.46-ti-arm64-r9"
+BRANCH:aarch64 = "v6.1.46-ti-arm64-r13"
 
 SRC_URI = " \
     git://github.com/beagleboard/linux.git;protocol=https;branch=${BRANCH} \