diff options
5 files changed, 20 insertions, 6 deletions
diff --git a/package/boot/uboot-envtools/files/mvebu b/package/boot/uboot-envtools/files/mvebu index 72e2df5d19..590000aae7 100644 --- a/package/boot/uboot-envtools/files/mvebu +++ b/package/boot/uboot-envtools/files/mvebu @@ -24,7 +24,7 @@ globalscale,espressobin|\ globalscale,espressobin-emmc|\ globalscale,espressobin-v7|\ globalscale,espressobin-v7-emmc|\ -marvell,armada8040-mcbin) +marvell,armada8040-mcbin-doubleshot) ubootenv_add_uci_config "/dev/mtd0" "0x3f0000" "0x10000" "0x10000" "1" ;; linksys,wrt1200ac|\ diff --git a/target/linux/mvebu/cortexa72/base-files/etc/board.d/02_network b/target/linux/mvebu/cortexa72/base-files/etc/board.d/02_network index 080e32ada3..32053d74e8 100755 --- a/target/linux/mvebu/cortexa72/base-files/etc/board.d/02_network +++ b/target/linux/mvebu/cortexa72/base-files/etc/board.d/02_network @@ -11,7 +11,7 @@ board_config_update board=$(board_name) case "$board" in -marvell,armada8040-mcbin) +marvell,armada8040-mcbin-doubleshot) ucidef_set_interfaces_lan_wan "eth0 eth1 eth3" "eth2" ;; marvell,armada8040-db) 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 2428de08c4..75d2933f05 100755 --- a/target/linux/mvebu/cortexa72/base-files/lib/upgrade/platform.sh +++ b/target/linux/mvebu/cortexa72/base-files/lib/upgrade/platform.sh @@ -9,7 +9,7 @@ REQUIRE_IMAGE_METADATA=1 platform_check_image() { case "$(board_name)" in - marvell,armada8040-mcbin) + marvell,armada8040-mcbin-doubleshot) platform_check_image_sdcard "$1" ;; *) @@ -20,7 +20,7 @@ platform_check_image() { platform_do_upgrade() { case "$(board_name)" in - marvell,armada8040-mcbin) + marvell,armada8040-mcbin-doubleshot) platform_do_upgrade_sdcard "$1" ;; *) @@ -30,7 +30,7 @@ platform_do_upgrade() { } platform_copy_config() { case "$(board_name)" in - marvell,armada8040-mcbin) + marvell,armada8040-mcbin-doubleshot) platform_copy_config_sdcard ;; esac diff --git a/target/linux/mvebu/image/cortexa72.mk b/target/linux/mvebu/image/cortexa72.mk index 50233540ed..6e52109237 100644 --- a/target/linux/mvebu/image/cortexa72.mk +++ b/target/linux/mvebu/image/cortexa72.mk @@ -24,6 +24,6 @@ define Device/marvell_macchiatobin DEVICE_ALT0_MODEL := Armada 8040 Community Board DEVICE_PACKAGES += kmod-i2c-mux-pca954x DEVICE_DTS := armada-8040-mcbin - SUPPORTED_DEVICES := marvell,armada8040-mcbin + SUPPORTED_DEVICES := marvell,armada8040-mcbin-doubleshot marvell,armada8040-mcbin endef TARGET_DEVICES += marvell_macchiatobin diff --git a/target/linux/mvebu/patches-4.19/260-align-mcbin-compatible-with-5.4.patch b/target/linux/mvebu/patches-4.19/260-align-mcbin-compatible-with-5.4.patch new file mode 100644 index 0000000000..53e34300db --- /dev/null +++ b/target/linux/mvebu/patches-4.19/260-align-mcbin-compatible-with-5.4.patch @@ -0,0 +1,14 @@ +--- a/arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts ++++ b/arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts +@@ -10,8 +10,9 @@ + #include <dt-bindings/gpio/gpio.h> + + / { +- model = "Marvell 8040 MACCHIATOBin"; +- compatible = "marvell,armada8040-mcbin", "marvell,armada8040", ++ model = "Marvell 8040 MACCHIATOBin Double-shot"; ++ compatible = "marvell,armada8040-mcbin-doubleshot", ++ "marvell,armada8040-mcbin", "marvell,armada8040", + "marvell,armada-ap806-quad", "marvell,armada-ap806"; + + chosen { |