LM
/
coreos
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat(meta-netmodule-coreos-bsp): update TI kernel to version 6.1 

The patch has been merged directly to git.

id:477850
This commit is contained in:
Alexandre Bard 2023-11-29 17:37:43 +01:00
parent 9492b3272f
commit 31fca1e9a4
3 changed files with 3 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
layers/meta-netmodule-coreos-bsp/conf/machine/include/netmodule-am64xx-k3.inc
View File

@ -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"

26
layers/meta-netmodule-coreos-bsp/recipes-kernel/linux/linux-netmodule/0001-rename-k3-am642-gemini-v1.dts-to-k3-am642-netmodule-.patch
View File

@ -1,26 +0,0 @@
From 04d19014f019b6e5b3236b0f0d31d1df18ffeeca Mon Sep 17 00:00:00 2001
From: Samuel Dolt <samuel.dolt@netmodule.com>
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 {

5
layers/meta-netmodule-coreos-bsp/recipes-kernel/linux/linux-netmodule_git-5.10-ti.bb → layers/meta-netmodule-coreos-bsp/recipes-kernel/linux/linux-netmodule_git-6.1-ti.bb
View File

@ -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"