From 31fca1e9a41d9eb8cb9d8d35d394d9111bf98b38 Mon Sep 17 00:00:00 2001 From: Alexandre Bard Date: Wed, 29 Nov 2023 17:37:43 +0100 Subject: [PATCH] feat(meta-netmodule-coreos-bsp): update TI kernel to version 6.1 The patch has been merged directly to git. id:477850 --- .../machine/include/netmodule-am64xx-k3.inc | 2 +- ...gemini-v1.dts-to-k3-am642-netmodule-.patch | 26 ------------------- ...10-ti.bb => linux-netmodule_git-6.1-ti.bb} | 5 ++-- 3 files changed, 3 insertions(+), 30 deletions(-) delete mode 100644 layers/meta-netmodule-coreos-bsp/recipes-kernel/linux/linux-netmodule/0001-rename-k3-am642-gemini-v1.dts-to-k3-am642-netmodule-.patch rename layers/meta-netmodule-coreos-bsp/recipes-kernel/linux/{linux-netmodule_git-5.10-ti.bb => linux-netmodule_git-6.1-ti.bb} (79%) diff --git a/layers/meta-netmodule-coreos-bsp/conf/machine/include/netmodule-am64xx-k3.inc b/layers/meta-netmodule-coreos-bsp/conf/machine/include/netmodule-am64xx-k3.inc index ea9f265..abe0929 100644 --- a/layers/meta-netmodule-coreos-bsp/conf/machine/include/netmodule-am64xx-k3.inc +++ b/layers/meta-netmodule-coreos-bsp/conf/machine/include/netmodule-am64xx-k3.inc @@ -25,7 +25,7 @@ SOC_FAMILY:append = ":am64xx" MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-devicetree" PREFERRED_PROVIDER_virtual/kernel = "linux-netmodule" -PREFERRED_VERSION_linux-netmodule = "git-5.10-ti" +PREFERRED_VERSION_linux-netmodule = "git-6.1-ti" PREFERRED_VERSION_trusted-firmware-a = "2.7+gitAUTOINC+0c9c984a0d" KERNEL_DEFCONFIG ?= "gemini_defconfig" diff --git a/layers/meta-netmodule-coreos-bsp/recipes-kernel/linux/linux-netmodule/0001-rename-k3-am642-gemini-v1.dts-to-k3-am642-netmodule-.patch b/layers/meta-netmodule-coreos-bsp/recipes-kernel/linux/linux-netmodule/0001-rename-k3-am642-gemini-v1.dts-to-k3-am642-netmodule-.patch deleted file mode 100644 index 9112386..0000000 --- a/layers/meta-netmodule-coreos-bsp/recipes-kernel/linux/linux-netmodule/0001-rename-k3-am642-gemini-v1.dts-to-k3-am642-netmodule-.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 04d19014f019b6e5b3236b0f0d31d1df18ffeeca Mon Sep 17 00:00:00 2001 -From: Samuel Dolt -Date: Wed, 24 May 2023 15:59:34 +0200 -Subject: [PATCH] rename k3-am642-gemini-v1.dts to k3-am642-netmodule-hw34.dts - ---- - .../ti/{k3-am642-gemini-v1.dts => k3-am642-netmodule-hw34.dts} | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - rename arch/arm64/boot/dts/ti/{k3-am642-gemini-v1.dts => k3-am642-netmodule-hw34.dts} (99%) - -diff --git a/arch/arm64/boot/dts/ti/k3-am642-gemini-v1.dts b/arch/arm64/boot/dts/ti/k3-am642-netmodule-hw34.dts -similarity index 99% -rename from arch/arm64/boot/dts/ti/k3-am642-gemini-v1.dts -rename to arch/arm64/boot/dts/ti/k3-am642-netmodule-hw34.dts -index bc34523f7006..bca213661615 100644 ---- a/arch/arm64/boot/dts/ti/k3-am642-gemini-v1.dts -+++ b/arch/arm64/boot/dts/ti/k3-am642-netmodule-hw34.dts -@@ -13,7 +13,7 @@ - #include "k3-am642.dtsi" - - / { -- compatible = "ti,am642-gemini-v1", "ti,am642"; -+ compatible = "netmodule,hw34", "ti,am642"; - model = "NetModule AM642 based GEMINI V1"; - - chosen { diff --git a/layers/meta-netmodule-coreos-bsp/recipes-kernel/linux/linux-netmodule_git-5.10-ti.bb b/layers/meta-netmodule-coreos-bsp/recipes-kernel/linux/linux-netmodule_git-6.1-ti.bb similarity index 79% rename from layers/meta-netmodule-coreos-bsp/recipes-kernel/linux/linux-netmodule_git-5.10-ti.bb rename to layers/meta-netmodule-coreos-bsp/recipes-kernel/linux/linux-netmodule_git-6.1-ti.bb index c74bfae..e3ae181 100644 --- a/layers/meta-netmodule-coreos-bsp/recipes-kernel/linux/linux-netmodule_git-5.10-ti.bb +++ b/layers/meta-netmodule-coreos-bsp/recipes-kernel/linux/linux-netmodule_git-6.1-ti.bb @@ -3,10 +3,9 @@ COMPATIBLE_MACHINE = "k3" inherit kernel -SRC_URI = "git://gitlab.netmodule.intranet/oem-linux/linux-netmodule.git;protocol=ssh;user=git;branch=5.10/ti/base \ - file://0001-rename-k3-am642-gemini-v1.dts-to-k3-am642-netmodule-.patch \ +SRC_URI = "git://gitlab.netmodule.intranet/oem-linux/linux-netmodule.git;protocol=ssh;user=git;branch=6.1/ti/gemini \ " -SRCREV = "0417c6736055dcd90c7fc33b7bec5b77b647ab05" +SRCREV = "67c72a62a5e7d6ca961451b1460d27904325ae23" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"