diff --git a/layers/meta-belden-marvell-bsp/conf/machine/cn9130-bldn-mbv.conf b/layers/meta-belden-marvell-bsp/conf/machine/cn9130-bldn-mbv.conf new file mode 100644 index 0000000..aa4fa07 --- /dev/null +++ b/layers/meta-belden-marvell-bsp/conf/machine/cn9130-bldn-mbv.conf @@ -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 diff --git a/layers/meta-belden-marvell-bsp/conf/machine/cn9131-bldn-mbv.conf b/layers/meta-belden-marvell-bsp/conf/machine/cn9131-bldn-mbv.conf deleted file mode 100644 index 404de2d..0000000 --- a/layers/meta-belden-marvell-bsp/conf/machine/cn9131-bldn-mbv.conf +++ /dev/null @@ -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 diff --git a/layers/meta-belden-marvell-bsp/recipes-bsp/u-boot/files/0001-cn9130-fix-compatible-node-inside-dts.patch b/layers/meta-belden-marvell-bsp/recipes-bsp/u-boot/files/0001-cn9130-fix-compatible-node-inside-dts.patch index 2cdd5e3..295c12b 100644 --- a/layers/meta-belden-marvell-bsp/recipes-bsp/u-boot/files/0001-cn9130-fix-compatible-node-inside-dts.patch +++ b/layers/meta-belden-marvell-bsp/recipes-bsp/u-boot/files/0001-cn9130-fix-compatible-node-inside-dts.patch @@ -20,7 +20,7 @@ index 9e10eab008..a91c490218 100644 - compatible = "marvell,cn9130-db", "marvell,cn91xx", "marvell,cn9030-vd", - "marvell,cn9030", "marvell,armada-ap806-quad", - "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,armada-ap806-quad", "marvell,armada-ap806", + "marvell,armada70x0"; diff --git a/layers/meta-belden-marvell-bsp/recipes-bsp/u-boot/u-boot_2019.10-solidrun.bb b/layers/meta-belden-marvell-bsp/recipes-bsp/u-boot/u-boot_2019.10-solidrun.bb index f0b15f6..f7bd101 100644 --- a/layers/meta-belden-marvell-bsp/recipes-bsp/u-boot/u-boot_2019.10-solidrun.bb +++ b/layers/meta-belden-marvell-bsp/recipes-bsp/u-boot/u-boot_2019.10-solidrun.bb @@ -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://cn913x.cfg \ file://0001-cn9130-fix-compatible-node-inside-dts.patch \ + file://0001-cn9130-fix-compatible-node-inside-dts-pt-2.patch \ " -# S = "${WORKDIR}/git" diff --git a/layers/meta-belden-marvell-bsp/recipes-kernel/linux/linux-netmodule/0001-cn913x-fix-compatible-node-inside-dts-pt-2.patch b/layers/meta-belden-marvell-bsp/recipes-kernel/linux/linux-netmodule/0001-cn913x-fix-compatible-node-inside-dts-pt-2.patch new file mode 100644 index 0000000..6b43ebe --- /dev/null +++ b/layers/meta-belden-marvell-bsp/recipes-kernel/linux/linux-netmodule/0001-cn913x-fix-compatible-node-inside-dts-pt-2.patch @@ -0,0 +1,22 @@ +From 2e11aed37443f523006a4a4fccd478e67ddac852 Mon Sep 17 00:00:00 2001 +From: Patrick Vogelaar +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"; diff --git a/layers/meta-belden-marvell-bsp/recipes-kernel/linux/linux-netmodule_git-5.15-solidrun.bb b/layers/meta-belden-marvell-bsp/recipes-kernel/linux/linux-netmodule_git-5.15-solidrun.bb index e500042..814eb51 100644 --- a/layers/meta-belden-marvell-bsp/recipes-kernel/linux/linux-netmodule_git-5.15-solidrun.bb +++ b/layers/meta-belden-marvell-bsp/recipes-kernel/linux/linux-netmodule_git-5.15-solidrun.bb @@ -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 \ file://0001-cn913x-fix-compatible-node-inside-dts.patch \ file://netfilter.cfg \ + file://0001-cn913x-fix-compatible-node-inside-dts-pt-2.patch \ " SRCREV ?= "be2f2f0c96e85ecec9d807397194e46bb8bea4a5"