diff options
Diffstat (limited to 'bsp/meta-ti/recipes-kernel')
14 files changed, 341 insertions, 39 deletions
diff --git a/bsp/meta-ti/recipes-kernel/jailhouse/jailhouse-arch.inc b/bsp/meta-ti/recipes-kernel/jailhouse/jailhouse-arch.inc new file mode 100644 index 00000000..498b25ed --- /dev/null +++ b/bsp/meta-ti/recipes-kernel/jailhouse/jailhouse-arch.inc @@ -0,0 +1,22 @@ +# Set jailhouse architecture JH_ARCH variable +# +# return value must match one of architectures supported by jailhouse +# +valid_jh_archs = "x86 arm" + +def map_jh_arch(a, d): + import re + + valid_jh_archs = d.getVar('valid_jh_archs', True).split() + + if re.match('(i.86|athlon|x86.64)$', a): return 'x86' + elif re.match('armeb$', a): return 'arm' + elif re.match('aarch64$', a): return 'arm64' + elif re.match('aarch64_be$', a): return 'arm64' + elif a in valid_jh_archs: return a + else: + bb.error("cannot map '%s' to a jailhouse supported architecture" % a) + +export JH_ARCH = "${@map_jh_arch(d.getVar('TARGET_ARCH', True), d)}" + +COMPATIBLE_HOST = "(i.86|x86_64|arm|aarch64).*-linux" diff --git a/bsp/meta-ti/recipes-kernel/jailhouse/jailhouse_git.bb b/bsp/meta-ti/recipes-kernel/jailhouse/jailhouse_git.bb new file mode 100644 index 00000000..4186dc3a --- /dev/null +++ b/bsp/meta-ti/recipes-kernel/jailhouse/jailhouse_git.bb @@ -0,0 +1,167 @@ +SUMMARY = "Linux-based partitioning hypervisor" +DESCRIPTION = "Jailhouse is a partitioning Hypervisor based on Linux. It is able to run bare-metal applications or (adapted) \ +operating systems besides Linux. For this purpose, it configures CPU and device virtualization features of the hardware \ +platform in a way that none of these domains, called 'cells' here, can interfere with each other in an unacceptable way." +HOMEPAGE = "https://github.com/siemens/jailhouse" +SECTION = "jailhouse" +LICENSE = "GPL-2.0 & BSD-2-Clause" + +LIC_FILES_CHKSUM = " \ + file://COPYING;md5=9fa7f895f96bde2d47fd5b7d95b6ba4d \ +" + +PV = "0.10+git${SRCPV}" +SRCREV = "b3a68ac89d7ed955546eae91954b184ec1583ce3" +BRANCH = "ti-jailhouse-0.10" + +SRC_URI = " \ + git://git.ti.com/jailhouse/ti-jailhouse.git;protocol=git;branch=${BRANCH} \ +" + +DEPENDS = "virtual/kernel dtc-native python-mako-native python-mako make-native" +RDEPENDS_${PN} += "\ + python-curses\ + python-datetime\ + python-argparse\ + python-mmap\ +" + +S = "${WORKDIR}/git" + +require jailhouse-arch.inc +inherit module pythonnative bash-completion deploy setuptools + +PACKAGE_ARCH = "${MACHINE_ARCH}" +COMPATIBLE_MACHINE = "(ti-soc)" + +JH_DATADIR ?= "${datadir}/jailhouse" +JH_EXEC_DIR ?= "${libexecdir}/jailhouse" +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_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_SYSCONFIG_CELL ?= "" +JH_SYSCONFIG_CELL_am65xx ?= "k3-am654-idk.cell" +JH_SYSCONFIG_CELL_j7-evm ?= "k3-j721e-evm.cell" + +INITRAMFS_IMAGE ?= "" +JH_RAMFS_IMAGE ?= "${INITRAMFS_IMAGE}" + +JH_CMDLINE ?= "" +JH_CMDLINE_k3 ?= "console=ttyS1,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}\\\" \ + -DJAILHOUSE_VERSION=\\\"$JAILHOUSE_VERSION\\\" \ + -Wall -Wextra -Wmissing-declarations -Wmissing-prototypes -Werror \ + -I../driver' + +TOOLS_SRC_DIR = "${S}/tools" + +EXTRA_OEMAKE = "ARCH=${JH_ARCH} CROSS_COMPILE=${TARGET_PREFIX} CC="${CC}" KDIR=${STAGING_KERNEL_BUILDDIR}" + +do_compile() { + oe_runmake V=1 +} + +do_install() { + # Install pyjailhouse python modules needed by the tools + distutils_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 + + install -d ${D}${CELL_DIR} + install -m 0644 ${B}/configs/${JH_ARCH}/${JH_CELL_FILES} ${D}${CELL_DIR}/ + + install -d ${D}${INMATES_DIR} + install -m 0644 ${B}/inmates/demos/${JH_ARCH}/*.bin ${D}${INMATES_DIR} + + install -d ${D}/boot + if [ -n "${JH_RAMFS_IMAGE}" ] + then + if [ -f ${DEPLOY_DIR_IMAGE}/${JH_RAMFS_IMAGE}-${MACHINE}.cpio ] + then + install -m 0644 ${DEPLOY_DIR_IMAGE}/${JH_RAMFS_IMAGE}-${MACHINE}.cpio ${D}/boot + else + bberror "Could not find JH_RAMFS_IMAGE (${JH_RAMFS_IMAGE}-${MACHINE}.cpio)!" + bberror "Please make sure that \"cpio\" is in IMAGE_FSTYPES." + fi + fi + + if [ -n "${JH_INMATE_DTB}" -a -n "${JH_LINUX_DEMO_CELL}" ]; then + cd ${TOOLS_SRC_DIR} + + echo "#! /bin/sh" > ${D}${JH_DATADIR}/linux-demo.sh + echo "jailhouse enable ${CELL_DIR}/${JH_SYSCONFIG_CELL}" >> ${D}${JH_DATADIR}/linux-demo.sh + ./jailhouse-cell-linux -w ${D}${JH_DATADIR}/${JH_INMATE_DTB} \ + -a ${JH_ARCH} -c "${JH_CMDLINE}" \ + -d ../configs/${JH_ARCH}/dts/${JH_INMATE_DTB} \ + -i ${D}/boot/${JH_RAMFS_IMAGE}-${MACHINE}.cpio \ + ${D}${CELL_DIR}/${JH_LINUX_DEMO_CELL} \ + ${DEPLOY_DIR_IMAGE}/Image \ + | tr -cd '\11\12\15\40-\176' \ + >> ${D}${JH_DATADIR}/linux-demo.sh + + sed -i -e 's,^Modified device tree written.*,,g' ${D}${JH_DATADIR}/linux-demo.sh + sed -i -e 's,\${D},,g' ${D}${JH_DATADIR}/linux-demo.sh + sed -i -e 's, linux-loader.bin, ${JH_EXEC_DIR}/linux-loader.bin,g' ${D}${JH_DATADIR}/linux-demo.sh + sed -i -e 's,\${DEPLOY_DIR_IMAGE},/boot,g' ${D}${JH_DATADIR}/linux-demo.sh + sed -i -e '/^\s*$/d' ${D}${JH_DATADIR}/linux-demo.sh + chmod +x ${D}${JH_DATADIR}/linux-demo.sh + fi +} + +PACKAGE_BEFORE_PN = "kernel-module-jailhouse pyjailhouse ${PN}-tools" +FILES_${PN} = "${base_libdir}/firmware ${libexecdir} ${sbindir} ${JH_DATADIR} /boot" +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" + +RRECOMMENDS_${PN} = "${PN}-tools" + +INSANE_SKIP_${PN} = "ldflags" + +KERNEL_MODULE_AUTOLOAD += "jailhouse" + +# Any extra cells/inmates from external recipes/packages +CELLS = "" + +python __anonymous () { + d.appendVarFlag('do_install', 'depends', ' virtual/kernel:do_deploy') + ramfs = d.getVar('JH_RAMFS_IMAGE', True) + if ramfs: + d.appendVarFlag('do_install', 'depends', ' ${JH_RAMFS_IMAGE}:do_image_complete') + + # Setup DEPENDS and RDEPENDS to included cells + cells = d.getVar('CELLS', True) or "" + for cell in cells.split(): + d.appendVar('DEPENDS', ' ' + cell) + d.appendVar('RDEPENDS_${PN}', ' ' + cell) +} 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 b28868f5..96263875 100644 --- a/bsp/meta-ti/recipes-kernel/kselftests/kselftests_4.10.bb +++ b/bsp/meta-ti/recipes-kernel/kselftests/kselftests_4.10.bb @@ -160,6 +160,7 @@ RDEPENDS_${PN} += "bash \ ${PN}-net \ ${PN}-nsfs \ ${PN}-pstore \ + ${PN}-ptp \ ${PN}-ptrace \ ${PN}-seccomp \ ${PN}-sigaltstack \ diff --git a/bsp/meta-ti/recipes-kernel/linux/cmem.inc b/bsp/meta-ti/recipes-kernel/linux/cmem.inc index 5fd0b9d9..24760a9f 100644 --- a/bsp/meta-ti/recipes-kernel/linux/cmem.inc +++ b/bsp/meta-ti/recipes-kernel/linux/cmem.inc @@ -2,28 +2,33 @@ # # Use these for temporary overrides CMEM_MACHINE = "${MACHINE}" -CMEM_MACHINE_am57xx-evm = "am571x am572x am574x" -CMEM_MACHINE_am57xx-hs-evm = "am571x am572x am574x" -CMEM_MACHINE_dra7xx-evm = "dra71x dra72x dra74x" -CMEM_MACHINE_dra7xx-hs-evm = "dra71x dra72x dra74x" +CMEM_MACHINE_am57xx-evm = "am571x am572x am572idk am5729-beagleboneai am574x" +CMEM_MACHINE_am57xx-hs-evm = "am571x am572x am572idk am5729-beagleboneai am574x" +CMEM_MACHINE_dra7xx-evm = "dra71x dra72x dra74x dra76x" +CMEM_MACHINE_dra7xx-hs-evm = "dra71x dra72x dra74x dra76x" # Set cmem.dtsi per machine or machine variant CMEM_DTSI = "cmem.dtsi" CMEM_DTSI_am571x = "cmem-am571x.dtsi" +CMEM_DTSI_am572idk = "cmem-am572idk.dtsi" +CMEM_DTSI_am5729-beagleboneai = "cmem-am5729-beagleboneai.dtsi" CMEM_DTSI_am574x = "cmem-am574x.dtsi" CMEM_DTSI_dra71x = "cmem-dra71x.dtsi" CMEM_DTSI_dra72x = "cmem-dra72x.dtsi" +CMEM_DTSI_dra76x = "cmem-dra76x.dtsi" # Split device trees between variants CMEM_DEVICETREE = "${KERNEL_DEVICETREE}" CMEM_DEVICETREE_am571x = "am571x-idk.dtb am571x-idk-lcd-osd101t2045.dtb am571x-idk-lcd-osd101t2587.dtb" -CMEM_DEVICETREE_am572x = "am57xx-beagle-x15.dtb am57xx-beagle-x15-revc.dtb \ - am572x-idk.dtb am572x-idk-lcd-osd101t2045.dtb am572x-idk-lcd-osd101t2587.dtb" +CMEM_DEVICETREE_am572x = "am57xx-beagle-x15.dtb am57xx-beagle-x15-revc.dtb" +CMEM_DEVICETREE_am572idk = "am572x-idk.dtb am572x-idk-lcd-osd101t2045.dtb am572x-idk-lcd-osd101t2587.dtb" +CMEM_DEVICETREE_am5729-beagleboneai = "am5729-beagleboneai.dtb" CMEM_DEVICETREE_am574x = "am574x-idk.dtb am574x-idk-lcd-osd101t2587.dtb" CMEM_DEVICETREE_dra71x = "dra71-evm.dtb" CMEM_DEVICETREE_dra72x = "dra72-evm.dtb dra72-evm-lcd-osd101t2045.dtb dra72-evm-lcd-osd101t2587.dtb \ dra72-evm-revc.dtb dra72-evm-revc-lcd-osd101t2045.dtb dra72-evm-revc-lcd-osd101t2587.dtb" CMEM_DEVICETREE_dra74x = "dra7-evm.dtb dra7-evm-lcd-osd101t2045.dtb dra7-evm-lcd-osd101t2587.dtb" +CMEM_DEVICETREE_dra76x = "dra76-evm.dtb dra76-evm-tfp410.dtb" # Flag to enable CMEM injection RESERVE_CMEM ?= "0" diff --git a/bsp/meta-ti/recipes-kernel/linux/files/dra7xx/am571x-pru-uio.dtsi b/bsp/meta-ti/recipes-kernel/linux/files/dra7xx/am571x-pru-uio.dtsi index 4228827e..8ca11c78 100644 --- a/bsp/meta-ti/recipes-kernel/linux/files/dra7xx/am571x-pru-uio.dtsi +++ b/bsp/meta-ti/recipes-kernel/linux/files/dra7xx/am571x-pru-uio.dtsi @@ -1,14 +1,14 @@ &pruss_soc_bus1 { - uio_pruss1_mdio { + uio_pruss1_mdio: uio_mdio@4b232400 { status = "okay"; compatible = "ti,davinci_mdio"; + reg = <0x4b232400 0x90>; #address-cells = <1>; #size-cells = <0>; clocks = <&dpll_gmac_h13x2_ck>; clock-names = "fck"; bus_freq = <1000000>; - reg = <0x32400 0x90>; reset-gpios = <&gpio5 8 GPIO_ACTIVE_LOW>; reset-delay-us = <2>; /* PHY datasheet states 1uS min */ @@ -112,14 +112,14 @@ }; &pruss_soc_bus2 { - uio_pruss2_mdio { + uio_pruss2_mdio: uio_mdio@4b2b2400 { compatible = "ti,davinci_mdio"; + reg = <0x4b2b2400 0x90>; #address-cells = <1>; #size-cells = <0>; clocks = <&dpll_gmac_h13x2_ck>; clock-names = "fck"; bus_freq = <1000000>; - reg = <0x32400 0x90>; status = "okay"; reset-gpios = <&gpio5 9 GPIO_ACTIVE_LOW>; @@ -223,18 +223,6 @@ }; }; -&pruss1_eth { - status = "disabled"; -}; - -&pruss1_emac0 { - status = "disabled"; -}; - -&pruss1_emac1 { - status = "disabled"; -}; - &pruss2_emac0 { status = "disabled"; }; diff --git a/bsp/meta-ti/recipes-kernel/linux/files/dra7xx/am57xx-pru-uio.dtsi b/bsp/meta-ti/recipes-kernel/linux/files/dra7xx/am57xx-pru-uio.dtsi index 17b3f963..4cc57118 100644 --- a/bsp/meta-ti/recipes-kernel/linux/files/dra7xx/am57xx-pru-uio.dtsi +++ b/bsp/meta-ti/recipes-kernel/linux/files/dra7xx/am57xx-pru-uio.dtsi @@ -106,14 +106,14 @@ }; &pruss_soc_bus2 { - uio_pruss2_mdio: uio_pruss2_mdio { + uio_pruss2_mdio: uio_mdio@4b2b2400 { compatible = "ti,davinci_mdio"; + reg = <0x4b2b2400 0x90>; #address-cells = <1>; #size-cells = <0>; clocks = <&dpll_gmac_h13x2_ck>; clock-names = "fck"; bus_freq = <1000000>; - reg = <0x32400 0x90>; status = "disabled"; }; diff --git a/bsp/meta-ti/recipes-kernel/linux/files/dra7xx/cmem-am5729-beagleboneai.dtsi b/bsp/meta-ti/recipes-kernel/linux/files/dra7xx/cmem-am5729-beagleboneai.dtsi new file mode 100644 index 00000000..e0511d08 --- /dev/null +++ b/bsp/meta-ti/recipes-kernel/linux/files/dra7xx/cmem-am5729-beagleboneai.dtsi @@ -0,0 +1,40 @@ +/ { + reserved-memory { + #address-cells = <2>; + #size-cells = <2>; + ranges; + + cmem_block_mem_0: cmem_block_mem@a0000000 { + reg = <0x0 0xa0000000 0x0 0x18000000>; + no-map; + status = "okay"; + }; + + cmem_block_mem_1_ocmc3: cmem_block_mem@40500000 { + reg = <0x0 0x40500000 0x0 0x100000>; + no-map; + status = "okay"; + }; + }; + + cmem { + compatible = "ti,cmem"; + #address-cells = <1>; + #size-cells = <0>; + + #pool-size-cells = <2>; + + status = "okay"; + + cmem_block_0: cmem_block@0 { + reg = <0>; + memory-region = <&cmem_block_mem_0>; + cmem-buf-pools = <1 0x0 0x18000000>; + }; + + cmem_block_1: cmem_block@1 { + reg = <1>; + memory-region = <&cmem_block_mem_1_ocmc3>; + }; + }; +}; diff --git a/bsp/meta-ti/recipes-kernel/linux/files/dra7xx/cmem-am572idk.dtsi b/bsp/meta-ti/recipes-kernel/linux/files/dra7xx/cmem-am572idk.dtsi new file mode 100644 index 00000000..6c39e22c --- /dev/null +++ b/bsp/meta-ti/recipes-kernel/linux/files/dra7xx/cmem-am572idk.dtsi @@ -0,0 +1,40 @@ +/ { + reserved-memory { + #address-cells = <2>; + #size-cells = <2>; + ranges; + + cmem_block_mem_0: cmem_block_mem@a0000000 { + reg = <0x0 0xa0000000 0x0 0x20000000>; + no-map; + status = "okay"; + }; + + cmem_block_mem_1_ocmc3: cmem_block_mem@40500000 { + reg = <0x0 0x40500000 0x0 0x100000>; + no-map; + status = "okay"; + }; + }; + + cmem { + compatible = "ti,cmem"; + #address-cells = <1>; + #size-cells = <0>; + + #pool-size-cells = <2>; + + status = "okay"; + + cmem_block_0: cmem_block@0 { + reg = <0>; + memory-region = <&cmem_block_mem_0>; + cmem-buf-pools = <1 0x0 0x20000000>; + }; + + cmem_block_1: cmem_block@1 { + reg = <1>; + memory-region = <&cmem_block_mem_1_ocmc3>; + }; + }; +}; diff --git a/bsp/meta-ti/recipes-kernel/linux/files/dra7xx/cmem-dra76x.dtsi b/bsp/meta-ti/recipes-kernel/linux/files/dra7xx/cmem-dra76x.dtsi new file mode 100644 index 00000000..9d207db5 --- /dev/null +++ b/bsp/meta-ti/recipes-kernel/linux/files/dra7xx/cmem-dra76x.dtsi @@ -0,0 +1,29 @@ +/ { + reserved-memory { + #address-cells = <2>; + #size-cells = <2>; + ranges; + + cmem_block_mem_0: cmem_block_mem@a0000000 { + reg = <0x0 0xa0000000 0x0 0x18000000>; + no-map; + status = "okay"; + }; + }; + + cmem { + compatible = "ti,cmem"; + #address-cells = <1>; + #size-cells = <0>; + + #pool-size-cells = <2>; + + status = "okay"; + + cmem_block_0: cmem_block@0 { + reg = <0>; + memory-region = <&cmem_block_mem_0>; + cmem-buf-pools = <1 0x0 0x18000000>; + }; + }; +}; diff --git a/bsp/meta-ti/recipes-kernel/linux/files/k2g/keystone-k2g-pru-uio.dtsi b/bsp/meta-ti/recipes-kernel/linux/files/k2g/keystone-k2g-pru-uio.dtsi index e4baca50..49894e0d 100644 --- a/bsp/meta-ti/recipes-kernel/linux/files/k2g/keystone-k2g-pru-uio.dtsi +++ b/bsp/meta-ti/recipes-kernel/linux/files/k2g/keystone-k2g-pru-uio.dtsi @@ -1,7 +1,7 @@ &pruss_soc_bus0 { - uio_pruss1_mdio: uio_mdio@32400 { + uio_pruss1_mdio: uio_mdio@20ab2400 { compatible = "ti,davinci_mdio"; - reg = <0x32400 0x90>; + reg = <0x20ab2400 0x90>; clocks = <&k2g_clks 0x0014 1>; clock-names = "fck"; #address-cells = <1>; @@ -95,9 +95,9 @@ }; &pruss_soc_bus1 { - uio_pruss2_mdio: uio_mdio@32400 { + uio_pruss2_mdio: uio_mdio@20af2400 { compatible = "ti,davinci_mdio"; - reg = <0x32400 0x90>; + reg = <0x20af2400 0x90>; clocks = <&k2g_clks 0x0015 1>; clock-names = "fck"; #address-cells = <1>; diff --git a/bsp/meta-ti/recipes-kernel/linux/files/ti33x/am335x-pru-uio.dtsi b/bsp/meta-ti/recipes-kernel/linux/files/ti33x/am335x-pru-uio.dtsi index 714b1d78..93a40ab5 100644 --- a/bsp/meta-ti/recipes-kernel/linux/files/ti33x/am335x-pru-uio.dtsi +++ b/bsp/meta-ti/recipes-kernel/linux/files/ti33x/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-ti/recipes-kernel/linux/files/ti43x/am437x-pru-uio.dtsi b/bsp/meta-ti/recipes-kernel/linux/files/ti43x/am437x-pru-uio.dtsi index 81c16e34..80993c4b 100644 --- a/bsp/meta-ti/recipes-kernel/linux/files/ti43x/am437x-pru-uio.dtsi +++ b/bsp/meta-ti/recipes-kernel/linux/files/ti43x/am437x-pru-uio.dtsi @@ -1,7 +1,7 @@ &pruss_soc_bus { - uio_pruss2_mdio: uio_mdio@32400 { + uio_pruss2_mdio: uio_mdio@54432400 { compatible = "ti,davinci_mdio"; - reg = <0x32400 0x90>; + reg = <0x54432400 0x90>; clocks = <&dpll_core_m4_ck>; clock-names = "fck"; bus_freq = <1000000>; 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 index 12532db6..5c56b286 100644 --- 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 @@ -6,5 +6,5 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-4.19:" BRANCH = "ti-rt-linux-4.19.y" -SRCREV = "b8935c3f161b90a15cec065066d710b216ae5c97" -PV = "4.19.38+git${SRCPV}" +SRCREV = "69c51d6d57c150155bea8dd032bd8ce7835cf234" +PV = "4.19.94+git${SRCPV}" 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_4.19.bb index c7cf13b4..ab9653e1 100644 --- a/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging_4.19.bb +++ b/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging_4.19.bb @@ -45,10 +45,14 @@ 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_am437x-evm = " prueth-fw" -RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_am335x-evm = " prueth-fw" +RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_am57xx-hs-evm = " prueth-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-evm = " prueth-fw-bin" +RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_am65xx = " prueth-fw-am65x" + +# Add run-time dependency for Cadence MHDP firmware to the rootfs +RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_j7-evm = " cadence-mhdp-fw" KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT}" @@ -56,8 +60,8 @@ S = "${WORKDIR}/git" BRANCH = "ti-linux-4.19.y" -SRCREV = "c17c3766610f07dc0549e51694b4149b92f3ce97" -PV = "4.19.38+git${SRCPV}" +SRCREV = "5a23bc00e08d26bb83952953d909c95b42fab70c" +PV = "4.19.94+git${SRCPV}" # Append to the MACHINE_KERNEL_PR so that a new SRCREV will cause a rebuild MACHINE_KERNEL_PR_append = "a" @@ -69,3 +73,9 @@ SRC_URI += "${KERNEL_GIT_URI};protocol=${KERNEL_GIT_PROTOCOL};branch=${BRANCH} \ file://defconfig" FILES_${KERNEL_PACKAGE_NAME}-devicetree += "/${KERNEL_IMAGEDEST}/*.itb" + +# 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" |