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

fix(devicetree): fix boot for Falcon 

* compatible node in device tree is adjusted
* config for cn9131 Falcon is removed since it is based on cn9130
* config for cn9130 based Falcon is added
This commit is contained in:
Patrick Vogelaar 2023-04-19 16:02:38 +02:00
parent 79b1aa3e8a
commit 2d69b5e24b
6 changed files with 31 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
layers/meta-belden-marvell-bsp/conf/machine/cn9130-bldn-mbv.conf Normal file
View File

@ -0,0 +1,6 @@
#@TYPE: Machine
#@NAME: cn9130-bldn-mbv
#@DESCRIPTION: CN9130 SOM based on Bldn MBV-A/B
#
require conf/machine/include/cn913x.inc

6
layers/meta-belden-marvell-bsp/conf/machine/cn9131-bldn-mbv.conf
View File

@ -1,6 +0,0 @@
#@TYPE: Machine
#@NAME: cn9131-bldn-mbv
#@DESCRIPTION: CN9131 SOM based on Bldn MBV-A/B
#
require conf/machine/include/cn913x.inc

2
layers/meta-belden-marvell-bsp/recipes-bsp/u-boot/files/0001-cn9130-fix-compatible-node-inside-dts.patch
View File

@ -20,7 +20,7 @@ index 9e10eab008..a91c490218 100644
- compatible = "marvell,cn9130-db", "marvell,cn91xx", "marvell,cn9030-vd", - compatible = "marvell,cn9130-db", "marvell,cn91xx", "marvell,cn9030-vd",
- "marvell,cn9030", "marvell,armada-ap806-quad", - "marvell,cn9030", "marvell,armada-ap806-quad",
- "marvell,armada-ap806", "marvell,armada70x0"; - "marvell,armada-ap806", "marvell,armada70x0";
+ compatible = "solidrun,cn9131-bldn-mbv", "marvell,cn9130-db", + compatible = "solidrun,cn9130-bldn-mbv", "marvell,cn9130-db",
+ "marvell,cn91xx", "marvell,cn9030-vd", "marvell,cn9030", + "marvell,cn91xx", "marvell,cn9030-vd", "marvell,cn9030",
+ "marvell,armada-ap806-quad", "marvell,armada-ap806", + "marvell,armada-ap806-quad", "marvell,armada-ap806",
+ "marvell,armada70x0"; + "marvell,armada70x0";

2
layers/meta-belden-marvell-bsp/recipes-bsp/u-boot/u-boot_2019.10-solidrun.bb
View File

@ -43,8 +43,8 @@ SRC_URI = "git://git.denx.de/u-boot.git;branch=master \
file://0001-sr_cn913x_cex7-enable-VERSION_VARIABLE.patch \ file://0001-sr_cn913x_cex7-enable-VERSION_VARIABLE.patch \
file://cn913x.cfg \ file://cn913x.cfg \
file://0001-cn9130-fix-compatible-node-inside-dts.patch \ file://0001-cn9130-fix-compatible-node-inside-dts.patch \
file://0001-cn9130-fix-compatible-node-inside-dts-pt-2.patch \
" "
#
S = "${WORKDIR}/git" S = "${WORKDIR}/git"

22
layers/meta-belden-marvell-bsp/recipes-kernel/linux/linux-netmodule/0001-cn913x-fix-compatible-node-inside-dts-pt-2.patch Normal file
View File

@ -0,0 +1,22 @@
From 2e11aed37443f523006a4a4fccd478e67ddac852 Mon Sep 17 00:00:00 2001
From: Patrick Vogelaar <patrick.vogelaar@belden.com>
Date: Wed, 19 Apr 2023 09:09:50 +0200
Subject: [PATCH] fix u-boot device tree compatible
---
arch/arm64/boot/dts/marvell/cn9130-bldn-mbv.dts | 4 ++++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/arch/arm64/boot/dts/marvell/cn9130-bldn-mbv.dts b/arch/arm64/boot/dts/marvell/cn9130-bldn-mbv.dts
index 42faebf55e28..004b7826371e 100644
--- a/arch/arm64/boot/dts/marvell/cn9130-bldn-mbv.dts
+++ b/arch/arm64/boot/dts/marvell/cn9130-bldn-mbv.dts
@@ -12,6 +12,8 @@
/ {
model = "SolidRun CN9130 based SOM BLDN MBV";
+ compatible = "solidrun,cn9130-bldn-mbv", "marvell,cn9130", "marvell,cn9131",
+ "marvell,armada-ap807-quad", "marvell,armada-ap807";
chosen {
stdout-path = "serial0:115200n8";

1
layers/meta-belden-marvell-bsp/recipes-kernel/linux/linux-netmodule_git-5.15-solidrun.bb
View File

@ -6,6 +6,7 @@ inherit kernel
SRC_URI = "git://gitlab.com/netmodule/kernel/linux-netmodule.git;protocol=ssh;user=git;branch=5.15/solidrun/base \ SRC_URI = "git://gitlab.com/netmodule/kernel/linux-netmodule.git;protocol=ssh;user=git;branch=5.15/solidrun/base \
file://0001-cn913x-fix-compatible-node-inside-dts.patch \ file://0001-cn913x-fix-compatible-node-inside-dts.patch \
file://netfilter.cfg \ file://netfilter.cfg \
file://0001-cn913x-fix-compatible-node-inside-dts-pt-2.patch \
" "
SRCREV ?= "be2f2f0c96e85ecec9d807397194e46bb8bea4a5" SRCREV ?= "be2f2f0c96e85ecec9d807397194e46bb8bea4a5"