8 files changed, 44 insertions, 36 deletions
diff --git a/bsp/meta-sancloud/recipes-kernel/linux/linux-bbe-4.19.inc b/bsp/meta-sancloud/recipes-kernel/linux/linux-bbe-4.19.inc
deleted file mode 100644
index 2bf8992a..00000000
--- a/bsp/meta-sancloud/recipes-kernel/linux/linux-bbe-4.19.inc
+++ /dev/null
@@ -1,24 +0,0 @@
-SECTION = "kernel"
-DESCRIPTION = "Linux kernel for SanCloud BeagleBone devices"
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814"
-
-inherit kernel
-
-require recipes-kernel/linux/cmem.inc
-require recipes-kernel/linux/ti-uio.inc
-
-# Look in the generic major.minor directory for files
-FILESEXTRAPATHS_prepend = "${THISDIR}/linux-bbe-4.19:"
-
-SRC_URI = "git://github.com/SanCloudLtd/linux.git;protocol=https;branch=${BRANCH}"
-
-S = "${WORKDIR}/git"
-
-do_configure_append() {
-    oe_runmake -C ${S} O=${B} sancloud_bbe_defconfig
-}
-
-# Pull in the devicetree files into the rootfs & add run-time dependency for PM
-# firmware to the rootfs
-RDEPENDS_${KERNEL_PACKAGE_NAME}-base += "${KERNEL_PACKAGE_NAME}-devicetree amx3-cm3"
diff --git a/bsp/meta-sancloud/recipes-kernel/linux/linux-bbe-5.4.inc b/bsp/meta-sancloud/recipes-kernel/linux/linux-bbe-5.4.inc
new file mode 100644
index 00000000..f12c1f44
--- /dev/null
+++ b/bsp/meta-sancloud/recipes-kernel/linux/linux-bbe-5.4.inc
@@ -0,0 +1,32 @@
+SECTION = "kernel"
+DESCRIPTION = "Linux kernel for SanCloud BeagleBone devices"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814"
+
+inherit kernel
+
+require recipes-kernel/linux/cmem.inc
+require recipes-kernel/linux/ti-uio.inc
+
+# Look in the generic major.minor directory for files
+FILESEXTRAPATHS_prepend = "${THISDIR}/linux-bbe-5.4:"
+
+SRC_URI = "git://github.com/SanCloudLtd/linux.git;protocol=https;branch=${BRANCH}"
+
+S = "${WORKDIR}/git"
+
+KERNEL_CONFIG_COMMAND = "oe_runmake -C ${S} CC="${KERNEL_CC}" LD="${KERNEL_LD}" O=${B} sancloud_bbe_defconfig"
+
+# Pull in the devicetree files into the rootfs & add run-time dependency for PM
+# and prueth firmware to the rootfs
+RDEPENDS_${KERNEL_PACKAGE_NAME}-base += " \
+    ${KERNEL_PACKAGE_NAME}-devicetree \
+    amx3-cm3 \
+    prueth-fw \
+    "
+
+# Special configuration for remoteproc/rpmsg IPC modules
+module_conf_rpmsg_client_sample = "blacklist rpmsg_client_sample"
+module_conf_ti_k3_r5_remoteproc = "softdep ti_k3_r5_remoteproc pre: virtio_rpmsg_bus"
+module_conf_ti_k3_dsp_remoteproc = "softdep ti_k3_dsp_remoteproc pre: virtio_rpmsg_bus"
+KERNEL_MODULE_PROBECONF += "rpmsg_client_sample ti_k3_r5_remoteproc ti_k3_dsp_remoteproc"
diff --git a/bsp/meta-sancloud/recipes-kernel/linux/linux-bbe-4.19/am335x-pru-uio.dtsi b/bsp/meta-sancloud/recipes-kernel/linux/linux-bbe-5.4/am335x-pru-uio.dtsi
index 714b1d78..93a40ab5 100644
--- a/bsp/meta-sancloud/recipes-kernel/linux/linux-bbe-4.19/am335x-pru-uio.dtsi
+++ b/bsp/meta-sancloud/recipes-kernel/linux/linux-bbe-5.4/am335x-pru-uio.dtsi
@@ -1,7 +1,7 @@
 &pruss_soc_bus {
-		uio_pruss_mdio: uio_pruss_mdio@32400 {
+		uio_pruss_mdio: uio_mdio@4a332400 {
 			compatible = "ti,davinci_mdio";
-			reg = <0x32400 0x90>;
+			reg = <0x4a332400 0x90>;
 			clocks = <&dpll_core_m4_ck>;
 			clock-names = "fck";
 			bus_freq = <1000000>;
diff --git a/bsp/meta-sancloud/recipes-kernel/linux/linux-bbe-4.19/cmem.dtsi b/bsp/meta-sancloud/recipes-kernel/linux/linux-bbe-5.4/cmem.dtsi
index 23119861..23119861 100644
--- a/bsp/meta-sancloud/recipes-kernel/linux/linux-bbe-4.19/cmem.dtsi
+++ b/bsp/meta-sancloud/recipes-kernel/linux/linux-bbe-5.4/cmem.dtsi
diff --git a/bsp/meta-sancloud/recipes-kernel/linux/linux-bbe-rt_4.19.bb b/bsp/meta-sancloud/recipes-kernel/linux/linux-bbe-rt_4.19.bb
deleted file mode 100644
index cea5de6e..00000000
--- a/bsp/meta-sancloud/recipes-kernel/linux/linux-bbe-rt_4.19.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-BRANCH = "linux-sancloud-rt-4.19.y"
-SRCREV = "8cab3d65bea71044d2efbe2b30cfa6ca5c1cd1ad"
-PV = "4.19.94+git${SRCPV}"
-
-require linux-bbe-4.19.inc
diff --git a/bsp/meta-sancloud/recipes-kernel/linux/linux-bbe-rt_5.4.bb b/bsp/meta-sancloud/recipes-kernel/linux/linux-bbe-rt_5.4.bb
new file mode 100644
index 00000000..5c8d41bf
--- /dev/null
+++ b/bsp/meta-sancloud/recipes-kernel/linux/linux-bbe-rt_5.4.bb
@@ -0,0 +1,5 @@
+BRANCH = "linux-sancloud-rt-5.4.y"
+SRCREV = "37c7505fe68ae6ade1af735eb4031f3d25f7491c"
+PV = "5.4.43+git${SRCPV}"
+
+require linux-bbe-5.4.inc
diff --git a/bsp/meta-sancloud/recipes-kernel/linux/linux-bbe_4.19.bb b/bsp/meta-sancloud/recipes-kernel/linux/linux-bbe_4.19.bb
deleted file mode 100644
index 0aeabaef..00000000
--- a/bsp/meta-sancloud/recipes-kernel/linux/linux-bbe_4.19.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-BRANCH = "linux-sancloud-4.19.y"
-SRCREV = "1657cbc7b7cf883f629ce5c0b05761401cbbf292"
-PV = "4.19.94+git${SRCPV}"
-
-require linux-bbe-4.19.inc
diff --git a/bsp/meta-sancloud/recipes-kernel/linux/linux-bbe_5.4.bb b/bsp/meta-sancloud/recipes-kernel/linux/linux-bbe_5.4.bb
new file mode 100644
index 00000000..34fb401b
--- /dev/null
+++ b/bsp/meta-sancloud/recipes-kernel/linux/linux-bbe_5.4.bb
@@ -0,0 +1,5 @@
+BRANCH = "linux-sancloud-5.4.y"
+SRCREV = "aa7f8f7fec8744ade6af31fbb45ba807559ae47c"
+PV = "5.4.40+git${SRCPV}"
+
+require linux-bbe-5.4.inc