From 5b37e66aabf01f4f7c2fc1b80519fc4fc041ca8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20Bl=C3=A4se?= Date: Sat, 20 Jan 2024 16:54:12 +0100 Subject: [PATCH] Fixup sysupgrade --- ...rt-for-SolidRun-CN9130-ClearFog-Pro.patch} | 47 ++++++++++++++----- ...t-for-SolidRun-CN9130-ClearFog-Base.patch} | 41 +++++++++++----- 2 files changed, 66 insertions(+), 22 deletions(-) rename build_patches/openwrt/{0100-Add-support-for-SolidRun-CN9130-ClearFog-Pro.patch => 0240-Add-support-for-SolidRun-CN9130-ClearFog-Pro.patch} (88%) rename build_patches/openwrt/{0101-Add-support-for-SolidRun-CN9130-ClearFog-Base.patch => 0241-Add-support-for-SolidRun-CN9130-ClearFog-Base.patch} (88%) diff --git a/build_patches/openwrt/0100-Add-support-for-SolidRun-CN9130-ClearFog-Pro.patch b/build_patches/openwrt/0240-Add-support-for-SolidRun-CN9130-ClearFog-Pro.patch similarity index 88% rename from build_patches/openwrt/0100-Add-support-for-SolidRun-CN9130-ClearFog-Pro.patch rename to build_patches/openwrt/0240-Add-support-for-SolidRun-CN9130-ClearFog-Pro.patch index 66d71270..84a150ad 100644 --- a/build_patches/openwrt/0100-Add-support-for-SolidRun-CN9130-ClearFog-Pro.patch +++ b/build_patches/openwrt/0240-Add-support-for-SolidRun-CN9130-ClearFog-Pro.patch @@ -1,14 +1,41 @@ -From 67a0e2c7a359f49068cabb6d470f78dc4a1242e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20Bl=C3=A4se?= Date: Fri, 28 Jul 2023 12:18:31 +0200 Subject: [PATCH] Add support for SolidRun CN9130 ClearFog Pro ---- - .../arm64/boot/dts/marvell/cn9130-cf-pro.dts | 430 ++++++++++++++++++ - target/linux/mvebu/image/cortexa72.mk | 10 + - 2 files changed, 440 insertions(+) - create mode 100644 target/linux/mvebu/files/arch/arm64/boot/dts/marvell/cn9130-cf-pro.dts - +diff --git a/target/linux/mvebu/cortexa72/base-files/lib/upgrade/platform.sh b/target/linux/mvebu/cortexa72/base-files/lib/upgrade/platform.sh +index 55bdfb7264..afd090644e 100755 +--- a/target/linux/mvebu/cortexa72/base-files/lib/upgrade/platform.sh ++++ b/target/linux/mvebu/cortexa72/base-files/lib/upgrade/platform.sh +@@ -14,7 +14,8 @@ platform_check_image() { + iei,puzzle-m902|\ + marvell,armada8040-mcbin-doubleshot|\ + marvell,armada8040-mcbin-singleshot|\ +- marvell,armada8040-clearfog-gt-8k) ++ marvell,armada8040-clearfog-gt-8k|\ ++ solidrun,cn9130-cf-pro) + legacy_sdcard_check_image "$1" + ;; + *) +@@ -32,7 +33,8 @@ platform_do_upgrade() { + globalscale,mochabin|\ + marvell,armada8040-mcbin-doubleshot|\ + marvell,armada8040-mcbin-singleshot|\ +- marvell,armada8040-clearfog-gt-8k) ++ marvell,armada8040-clearfog-gt-8k|\ ++ solidrun,cn9130-cf-pro) + legacy_sdcard_do_upgrade "$1" + ;; + mikrotik,rb5009) +@@ -50,7 +52,8 @@ platform_copy_config() { + iei,puzzle-m902|\ + marvell,armada8040-mcbin-doubleshot|\ + marvell,armada8040-mcbin-singleshot|\ +- marvell,armada8040-clearfog-gt-8k) ++ marvell,armada8040-clearfog-gt-8k|\ ++ solidrun,cn9130-cf-pro) + legacy_sdcard_copy_config + ;; + esac diff --git a/target/linux/mvebu/files/arch/arm64/boot/dts/marvell/cn9130-cf-pro.dts b/target/linux/mvebu/files/arch/arm64/boot/dts/marvell/cn9130-cf-pro.dts new file mode 100644 index 0000000000..d34f382736 @@ -446,10 +473,10 @@ index 0000000000..d34f382736 + }; +}; diff --git a/target/linux/mvebu/image/cortexa72.mk b/target/linux/mvebu/image/cortexa72.mk -index 02dccb4d62..c4fb76f4f5 100644 +index 31ad524881..65a496e112 100644 --- a/target/linux/mvebu/image/cortexa72.mk +++ b/target/linux/mvebu/image/cortexa72.mk -@@ -67,3 +67,13 @@ define Device/iei_puzzle-m902 +@@ -93,3 +93,13 @@ define Device/iei_puzzle-m902 SOC := cn9132 endef TARGET_DEVICES += iei_puzzle-m902 @@ -463,6 +490,4 @@ index 02dccb4d62..c4fb76f4f5 100644 + SUPPORTED_DEVICES := solidrun,cn9130-cf-pro +endef +TARGET_DEVICES += solidrun_cn9130-cf-pro --- -2.41.0 diff --git a/build_patches/openwrt/0101-Add-support-for-SolidRun-CN9130-ClearFog-Base.patch b/build_patches/openwrt/0241-Add-support-for-SolidRun-CN9130-ClearFog-Base.patch similarity index 88% rename from build_patches/openwrt/0101-Add-support-for-SolidRun-CN9130-ClearFog-Base.patch rename to build_patches/openwrt/0241-Add-support-for-SolidRun-CN9130-ClearFog-Base.patch index d84fb7fb..55c3ad51 100644 --- a/build_patches/openwrt/0101-Add-support-for-SolidRun-CN9130-ClearFog-Base.patch +++ b/build_patches/openwrt/0241-Add-support-for-SolidRun-CN9130-ClearFog-Base.patch @@ -1,14 +1,35 @@ -From 8b44a21163ac6504dabc3a6dda8c53388913d471 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20Bl=C3=A4se?= Date: Fri, 20 Oct 2023 22:56:53 +0200 Subject: [PATCH] Add support for SolidRun CN9130 ClearFog Base ---- - .../arm64/boot/dts/marvell/cn9130-cf-base.dts | 368 ++++++++++++++++++ - target/linux/mvebu/image/cortexa72.mk | 10 + - 2 files changed, 378 insertions(+) - create mode 100644 target/linux/mvebu/files/arch/arm64/boot/dts/marvell/cn9130-cf-base.dts - +diff --git a/target/linux/mvebu/cortexa72/base-files/lib/upgrade/platform.sh b/target/linux/mvebu/cortexa72/base-files/lib/upgrade/platform.sh +index afd090644e..f0ec9c253a 100755 +--- a/target/linux/mvebu/cortexa72/base-files/lib/upgrade/platform.sh ++++ b/target/linux/mvebu/cortexa72/base-files/lib/upgrade/platform.sh +@@ -15,6 +15,7 @@ platform_check_image() { + marvell,armada8040-mcbin-doubleshot|\ + marvell,armada8040-mcbin-singleshot|\ + marvell,armada8040-clearfog-gt-8k|\ ++ solidrun,cn9130-cf-base|\ + solidrun,cn9130-cf-pro) + legacy_sdcard_check_image "$1" + ;; +@@ -34,6 +35,7 @@ platform_do_upgrade() { + marvell,armada8040-mcbin-doubleshot|\ + marvell,armada8040-mcbin-singleshot|\ + marvell,armada8040-clearfog-gt-8k|\ ++ solidrun,cn9130-cf-base|\ + solidrun,cn9130-cf-pro) + legacy_sdcard_do_upgrade "$1" + ;; +@@ -53,6 +55,7 @@ platform_copy_config() { + marvell,armada8040-mcbin-doubleshot|\ + marvell,armada8040-mcbin-singleshot|\ + marvell,armada8040-clearfog-gt-8k|\ ++ solidrun,cn9130-cf-base|\ + solidrun,cn9130-cf-pro) + legacy_sdcard_copy_config + ;; diff --git a/target/linux/mvebu/files/arch/arm64/boot/dts/marvell/cn9130-cf-base.dts b/target/linux/mvebu/files/arch/arm64/boot/dts/marvell/cn9130-cf-base.dts new file mode 100644 index 0000000000..2010541f01 @@ -384,10 +405,10 @@ index 0000000000..2010541f01 + }; +}; diff --git a/target/linux/mvebu/image/cortexa72.mk b/target/linux/mvebu/image/cortexa72.mk -index c4fb76f4f5..e342014e1a 100644 +index 65a496e112..fb44d24ee6 100644 --- a/target/linux/mvebu/image/cortexa72.mk +++ b/target/linux/mvebu/image/cortexa72.mk -@@ -68,6 +68,16 @@ define Device/iei_puzzle-m902 +@@ -94,6 +94,16 @@ define Device/iei_puzzle-m902 endef TARGET_DEVICES += iei_puzzle-m902 @@ -404,6 +425,4 @@ index c4fb76f4f5..e342014e1a 100644 define Device/solidrun_cn9130-cf-pro $(call Device/Default-arm64) DEVICE_VENDOR := SolidRun --- -2.42.0