basesystem-jjsandbox/ToshikazuOhiwa/master-jj

recipes

30 files changed, 101 insertions, 43 deletions

diff --git a/bsp/meta-ti/recipes-kernel/jailhouse/jailhouse/0001-tools-update-shebang-in-helper-scripts-for-python3.patch b/bsp/meta-ti/recipes-kernel/jailhouse/jailhouse/0001-tools-update-shebang-in-helper-scripts-for-python3.patch
new file mode 100644
index 00000000..f4922363
--- /dev/null
+++ b/bsp/meta-ti/recipes-kernel/jailhouse/jailhouse/0001-tools-update-shebang-in-helper-scripts-for-python3.patch
@@ -0,0 +1,56 @@
+From 24e58c75592a2ba09f3062c8a4722c0e29a9b558 Mon Sep 17 00:00:00 2001
+From: Denys Dmytriyenko <denys@ti.com>
+Date: Wed, 1 Apr 2020 15:44:46 -0400
+Subject: [PATCH] tools: update shebang in helper scripts for python3
+
+Signed-off-by: Denys Dmytriyenko <denys@ti.com>
+---
+ tools/jailhouse-cell-linux     | 2 +-
+ tools/jailhouse-cell-stats     | 2 +-
+ tools/jailhouse-config-create  | 2 +-
+ tools/jailhouse-hardware-check | 2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/tools/jailhouse-cell-linux b/tools/jailhouse-cell-linux
+index 007a5c4..e106b9d 100755
+--- a/tools/jailhouse-cell-linux
++++ b/tools/jailhouse-cell-linux
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python3
+ 
+ # Jailhouse, a Linux-based partitioning hypervisor
+ #
+diff --git a/tools/jailhouse-cell-stats b/tools/jailhouse-cell-stats
+index 2f7e966..4c5289f 100755
+--- a/tools/jailhouse-cell-stats
++++ b/tools/jailhouse-cell-stats
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python3
+ 
+ # Jailhouse, a Linux-based partitioning hypervisor
+ #
+diff --git a/tools/jailhouse-config-create b/tools/jailhouse-config-create
+index 1e2df74..9382b05 100755
+--- a/tools/jailhouse-config-create
++++ b/tools/jailhouse-config-create
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python3
+ #
+ # Jailhouse, a Linux-based partitioning hypervisor
+ #
+diff --git a/tools/jailhouse-hardware-check b/tools/jailhouse-hardware-check
+index 375816e..658ce6f 100755
+--- a/tools/jailhouse-hardware-check
++++ b/tools/jailhouse-hardware-check
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python3
+ 
+ # Jailhouse, a Linux-based partitioning hypervisor
+ #
+-- 
+2.7.4
+
diff --git a/bsp/meta-ti/recipes-kernel/jailhouse/jailhouse_git.bb b/bsp/meta-ti/recipes-kernel/jailhouse/jailhouse_git.bb
index 4186dc3a..46447af6 100644
--- a/bsp/meta-ti/recipes-kernel/jailhouse/jailhouse_git.bb
+++ b/bsp/meta-ti/recipes-kernel/jailhouse/jailhouse_git.bb
@@ -10,26 +10,27 @@ LIC_FILES_CHKSUM = " \
     file://COPYING;md5=9fa7f895f96bde2d47fd5b7d95b6ba4d \
 "
 
-PV = "0.10+git${SRCPV}"
-SRCREV = "b3a68ac89d7ed955546eae91954b184ec1583ce3"
-BRANCH = "ti-jailhouse-0.10"
+PV = "0.12+git${SRCPV}"
+SRCREV = "8fd88c37ae1a4f7130ef40899c0eadd737c64832"
+BRANCH = "ti-jailhouse-0.12"
 
 SRC_URI = " \
     git://git.ti.com/jailhouse/ti-jailhouse.git;protocol=git;branch=${BRANCH} \
+    file://0001-tools-update-shebang-in-helper-scripts-for-python3.patch \
 "
 
-DEPENDS = "virtual/kernel dtc-native python-mako-native python-mako make-native"
+DEPENDS = "virtual/kernel dtc-native python3-mako-native python3-mako make-native"
 RDEPENDS_${PN} += "\
-	python-curses\
-	python-datetime\
-	python-argparse\
-	python-mmap\
+	python3-curses\
+	python3-datetime\
+	python3-mmap\
 "
 
-S = "${WORKDIR}/git"
-
 require jailhouse-arch.inc
-inherit module pythonnative bash-completion deploy setuptools
+inherit module python3native bash-completion deploy setuptools3
+
+S = "${WORKDIR}/git"
+B = "${S}"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 COMPATIBLE_MACHINE = "(ti-soc)"
@@ -40,37 +41,33 @@ CELL_DIR ?= "${JH_DATADIR}/cells"
 CELLCONF_DIR ?= "${JH_DATADIR}/configs"
 INMATES_DIR ?= "${JH_DATADIR}/inmates"
 
-JH_CONFIG ?= "${S}/ci/jailhouse-config-x86.h"
-JH_CONFIG_k3 ?= "${S}/ci/jailhouse-config-k3.h"
-
 JH_CELL_FILES ?= "*.cell"
 JH_CELL_FILES_k3 ?= "k3-*.cell"
 
 JH_INMATE_DTB ?= ""
 JH_INMATE_DTB_am65xx ?= "inmate-k3-am654-idk.dtb"
-JH_INMATE_DTB_j7-evm ?= "inmate-k3-j721e-evm.dtb"
+JH_INMATE_DTB_j7 ?= "inmate-k3-j721e-evm.dtb"
 
 JH_LINUX_DEMO_CELL ?= ""
 JH_LINUX_DEMO_CELL_am65xx ?= "k3-am654-idk-linux-demo.cell"
-JH_LINUX_DEMO_CELL_j7-evm ?= "k3-j721e-evm-linux-demo.cell"
+JH_LINUX_DEMO_CELL_j7 ?= "k3-j721e-evm-linux-demo.cell"
 
 JH_SYSCONFIG_CELL ?= ""
 JH_SYSCONFIG_CELL_am65xx ?= "k3-am654-idk.cell"
-JH_SYSCONFIG_CELL_j7-evm ?= "k3-j721e-evm.cell"
+JH_SYSCONFIG_CELL_j7 ?= "k3-j721e-evm.cell"
 
 INITRAMFS_IMAGE ?= ""
 JH_RAMFS_IMAGE ?= "${INITRAMFS_IMAGE}"
 
 JH_CMDLINE ?= ""
-JH_CMDLINE_k3 ?= "console=ttyS1,115200n8"
+JH_CMDLINE_am65xx ?= "console=ttyS1,115200n8"
+JH_CMDLINE_j7 ?= "console=ttyS3,115200n8"
 
 do_configure() {
 	if [ -d ${STAGING_DIR_HOST}/${CELLCONF_DIR} ]; 
 	then
 		cp ${STAGING_DIR_HOST}/${CELLCONF_DIR}/*.c ${S}/configs/
 	fi
-
-	cp -av ${JH_CONFIG} ${S}/include/jailhouse/config.h
 }
 
 USER_SPACE_CFLAGS = '${CFLAGS} -DLIBEXECDIR=\\\"${libexecdir}\\\" \
@@ -88,12 +85,12 @@ do_compile() {
 
 do_install() {
 	# Install pyjailhouse python modules needed by the tools
-	distutils_do_install
+	distutils3_do_install
 
 	# We want to install the python tools, but we do not want to use pip...
 	# At least with v0.10, we can work around this with
 	# 'PIP=":" PYTHON_PIP_USEABLE=yes'
-	oe_runmake PIP=: PYTHON_PIP_USEABLE=yes DESTDIR=${D} install
+	oe_runmake PIP=: PYTHON=python3 PYTHON_PIP_USEABLE=yes DESTDIR=${D} install
 
 	install -d ${D}${CELL_DIR}
 	install -m 0644 ${B}/configs/${JH_ARCH}/${JH_CELL_FILES} ${D}${CELL_DIR}/
@@ -141,8 +138,8 @@ FILES_${PN} = "${base_libdir}/firmware ${libexecdir} ${sbindir} ${JH_DATADIR} /b
 FILES_pyjailhouse = "${PYTHON_SITEPACKAGES_DIR}"
 FILES_${PN}-tools = "${libexecdir}/${BPN}/${BPN}-*"
 
-RDEPENDS_${PN}-tools = "pyjailhouse python-mmap python-math python-argparse python-datetime python-curses python-compression"
-RDEPENDS_pyjailhouse = "python-core python-ctypes python-fcntl python-shell"
+RDEPENDS_${PN}-tools = "pyjailhouse python3-mmap python3-math python3-datetime python3-curses python3-compression"
+RDEPENDS_pyjailhouse = "python3-core python3-ctypes python3-fcntl python3-shell"
 
 RRECOMMENDS_${PN} = "${PN}-tools"
 
diff --git a/bsp/meta-ti/recipes-kernel/kselftests/kselftests_4.10.bb b/bsp/meta-ti/recipes-kernel/kselftests/kselftests_4.10.bb
index 96263875..f478e56d 100644
--- a/bsp/meta-ti/recipes-kernel/kselftests/kselftests_4.10.bb
+++ b/bsp/meta-ti/recipes-kernel/kselftests/kselftests_4.10.bb
@@ -185,3 +185,6 @@ INSANE_SKIP_${PN}-exec = "ldflags"
 INSANE_SKIP_${PN}-ipc = "ldflags"
 INSANE_SKIP_${PN}-mount = "ldflags"
 INSANE_SKIP_${PN}-vm = "ldflags"
+
+COMPATIBLE_MACHINE_riscv64 = "(null)"
+COMPATIBLE_MACHINE_riscv32 = "(null)"
diff --git a/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-4.19/defconfig b/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-5.4/defconfig
index d083d182..d083d182 100644
--- a/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-4.19/defconfig
+++ b/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-5.4/defconfig
diff --git a/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-4.19/dra7xx/defconfig b/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-5.4/dra7xx/defconfig
index dcb53bab..dcb53bab 100644
--- a/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-4.19/dra7xx/defconfig
+++ b/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-5.4/dra7xx/defconfig
diff --git a/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-4.19/k2g/defconfig b/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-5.4/k2g/defconfig
index 316b04bb..316b04bb 100644
--- a/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-4.19/k2g/defconfig
+++ b/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-5.4/k2g/defconfig
diff --git a/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-4.19/k3/defconfig b/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-5.4/k3/defconfig
index b9bc6137..b9bc6137 100644
--- a/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-4.19/k3/defconfig
+++ b/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-5.4/k3/defconfig
diff --git a/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-4.19/keystone/defconfig b/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-5.4/keystone/defconfig
index 5a40b93d..5a40b93d 100644
--- a/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-4.19/keystone/defconfig
+++ b/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-5.4/keystone/defconfig
diff --git a/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-4.19/omapl138/defconfig b/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-5.4/omapl138/defconfig
index b3467853..b3467853 100644
--- a/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-4.19/omapl138/defconfig
+++ b/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-5.4/omapl138/defconfig
diff --git a/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-4.19/ti33x/defconfig b/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-5.4/ti33x/defconfig
index 88f80fa9..88f80fa9 100644
--- a/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-4.19/ti33x/defconfig
+++ b/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-5.4/ti33x/defconfig
diff --git a/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-4.19/ti43x/defconfig b/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-5.4/ti43x/defconfig
index 4b9daaf9..4b9daaf9 100644
--- a/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-4.19/ti43x/defconfig
+++ b/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-5.4/ti43x/defconfig
diff --git a/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-rt-4.19/defconfig b/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-rt-5.4/defconfig
index f0b8bab0..f0b8bab0 100644
--- a/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-rt-4.19/defconfig
+++ b/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-rt-5.4/defconfig
diff --git a/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-rt-4.19/dra7xx/defconfig b/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-rt-5.4/dra7xx/defconfig
index 47e3d04a..47e3d04a 100644
--- a/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-rt-4.19/dra7xx/defconfig
+++ b/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-rt-5.4/dra7xx/defconfig
diff --git a/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-rt-4.19/k2g/defconfig b/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-rt-5.4/k2g/defconfig
index a9c24f2e..a9c24f2e 100644
--- a/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-rt-4.19/k2g/defconfig
+++ b/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-rt-5.4/k2g/defconfig
diff --git a/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-rt-4.19/k3/defconfig b/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-rt-5.4/k3/defconfig
index cc10bfda..cc10bfda 100644
--- a/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-rt-4.19/k3/defconfig
+++ b/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-rt-5.4/k3/defconfig
diff --git a/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-rt-4.19/keystone/defconfig b/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-rt-5.4/keystone/defconfig
index fc68085f..fc68085f 100644
--- a/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-rt-4.19/keystone/defconfig
+++ b/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-rt-5.4/keystone/defconfig
diff --git a/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-rt-4.19/ti33x/defconfig b/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-rt-5.4/ti33x/defconfig
index 0a4fbac2..0a4fbac2 100644
--- a/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-rt-4.19/ti33x/defconfig
+++ b/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-rt-5.4/ti33x/defconfig
diff --git a/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-rt-4.19/ti43x/defconfig b/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-rt-5.4/ti43x/defconfig
index 99594c81..99594c81 100644
--- a/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-rt-4.19/ti43x/defconfig
+++ b/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-rt-5.4/ti43x/defconfig
diff --git a/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-rt_4.19.bb b/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-rt_4.19.bb
deleted file mode 100644
index 5c56b286..00000000
--- a/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-rt_4.19.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require linux-ti-staging_4.19.bb
-
-# Look in the generic major.minor directory for files
-# This will have priority over generic non-rt path
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-4.19:"
-
-BRANCH = "ti-rt-linux-4.19.y"
-
-SRCREV = "69c51d6d57c150155bea8dd032bd8ce7835cf234"
-PV = "4.19.94+git${SRCPV}"
diff --git a/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-rt_5.4.bb b/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-rt_5.4.bb
new file mode 100644
index 00000000..6c53ec95
--- /dev/null
+++ b/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-rt_5.4.bb
@@ -0,0 +1,10 @@
+require linux-ti-staging_5.4.bb
+
+# Look in the generic major.minor directory for files
+# This will have priority over generic non-rt path
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-5.4:"
+
+BRANCH = "ti-rt-linux-5.4.y"
+
+SRCREV = "17e2c5c658e9bcdf7566c9e7f70b1f0a8c9f7036"
+PV = "5.4.43+git${SRCPV}"
diff --git a/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-systest-4.19/defconfig b/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-systest-5.4/defconfig
index 5d051bd1..5d051bd1 100644
--- a/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-systest-4.19/defconfig
+++ b/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-systest-5.4/defconfig
diff --git a/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-systest-4.19/dra7xx/defconfig b/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-systest-5.4/dra7xx/defconfig
index 2b3635c3..2b3635c3 100644
--- a/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-systest-4.19/dra7xx/defconfig
+++ b/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-systest-5.4/dra7xx/defconfig
diff --git a/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-systest-4.19/k2g/defconfig b/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-systest-5.4/k2g/defconfig
index abfb3309..abfb3309 100644
--- a/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-systest-4.19/k2g/defconfig
+++ b/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-systest-5.4/k2g/defconfig
diff --git a/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-systest-4.19/k3/defconfig b/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-systest-5.4/k3/defconfig
index 56cf9302..56cf9302 100644
--- a/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-systest-4.19/k3/defconfig
+++ b/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-systest-5.4/k3/defconfig
diff --git a/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-systest-4.19/keystone/defconfig b/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-systest-5.4/keystone/defconfig
index e95bcf95..e95bcf95 100644
--- a/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-systest-4.19/keystone/defconfig
+++ b/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-systest-5.4/keystone/defconfig
diff --git a/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-systest-4.19/omapl138/defconfig b/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-systest-5.4/omapl138/defconfig
index 95b61168..95b61168 100644
--- a/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-systest-4.19/omapl138/defconfig
+++ b/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-systest-5.4/omapl138/defconfig
diff --git a/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-systest-4.19/ti33x/defconfig b/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-systest-5.4/ti33x/defconfig
index 9ab6733c..9ab6733c 100644
--- a/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-systest-4.19/ti33x/defconfig
+++ b/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-systest-5.4/ti33x/defconfig
diff --git a/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-systest-4.19/ti43x/defconfig b/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-systest-5.4/ti43x/defconfig
index 825c31cd..825c31cd 100644
--- a/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-systest-4.19/ti43x/defconfig
+++ b/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-systest-5.4/ti43x/defconfig
diff --git a/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-systest_4.19.bb b/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-systest_5.4.bb
index 6f02f1a7..a2404574 100644
--- a/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-systest_4.19.bb
+++ b/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-systest_5.4.bb
@@ -1,5 +1,5 @@
-require linux-ti-staging_4.19.bb
+require linux-ti-staging_5.4.bb
 
 # Look in the generic major.minor directory for files
 # This will have priority over generic non-rt path
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-4.19:"
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-5.4:"
diff --git a/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging_4.19.bb b/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging_5.4.bb
index ab9653e1..bfcc7f5b 100644
--- a/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging_4.19.bb
+++ b/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging_5.4.bb
@@ -11,7 +11,7 @@ require recipes-kernel/linux/ti-uio.inc
 require recipes-kernel/linux/bundle-devicetree.inc
 
 # Look in the generic major.minor directory for files
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-4.19:"
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-5.4:"
 
 # Pull in the devicetree files into the rootfs
 RDEPENDS_${KERNEL_PACKAGE_NAME}-base += "kernel-devicetree"
@@ -44,24 +44,25 @@ RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_k2e = " netcp-pa-fw"
 RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_k2l = " netcp-pa-fw"
 
 # Add run-time dependency for PRU Ethernet firmware to the rootfs
-RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_am57xx-evm = " prueth-fw"
-RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_am57xx-hs-evm = " prueth-fw"
+RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_am57xx-evm = " prueth-fw prusw-fw"
+RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_am57xx-hs-evm = " prueth-fw prusw-fw"
 RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_ti43x = " prueth-fw"
 RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_ti33x = " prueth-fw"
 RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_k2g = " prueth-fw"
 RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_am65xx = " prueth-fw-am65x"
+RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_am65xx-evm = " prueth-fw-am65x-sr2"
 
 # Add run-time dependency for Cadence MHDP firmware to the rootfs
-RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_j7-evm = " cadence-mhdp-fw"
+RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_j7 = " cadence-mhdp-fw"
 
 KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT}"
 
 S = "${WORKDIR}/git"
 
-BRANCH = "ti-linux-4.19.y"
+BRANCH = "ti-linux-5.4.y"
 
-SRCREV = "5a23bc00e08d26bb83952953d909c95b42fab70c"
-PV = "4.19.94+git${SRCPV}"
+SRCREV = "66cf445b7697a4963cfc796e06918fe5b147fe7d"
+PV = "5.4.40+git${SRCPV}"
 
 # Append to the MACHINE_KERNEL_PR so that a new SRCREV will cause a rebuild
 MACHINE_KERNEL_PR_append = "a"
@@ -79,3 +80,4 @@ 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"
+KERNEL_MODULE_AUTOLOAD_append_j7 = " rpmsg_kdrv_switch"