diff options
| author | Vladimir Vid | 2019-06-07 13:50:50 +0000 |
|---|---|---|
| committer | Petr Štetiar | 2019-06-28 19:52:57 +0000 |
| commit | 6c9a74458834bde287aec28e2ee0b902a075eb5e (patch) | |
| tree | 772244a9df862e3da104ccd91555d8e0bf0f00e2 | |
| parent | 886f524c6b06bfba1f993d6c09b8262ce87cc15e (diff) | |
| download | openwrt-6c9a74458834bde287aec28e2ee0b902a075eb5e.tar.gz | |
mvebu: fix regression for non-generic ESPRESSObin versions
When targets for multiple ESPRESSObin devices were added, not all
files were updated which means any ESPRESSObin version beside generic
won't have proper networking, sysupgrade and uboot-env. This patch
fixes the issue.
* fixup network detection
* fixup uboot-env
* fixup platform.sh for sysupgrade
Signed-off-by: Vladimir Vid <vladimir.vid@sartura.hr>
(cherry picked from commit bc47285cb3c0125424e628521f905f1f0d7b4cef)
| -rw-r--r-- | package/boot/uboot-envtools/files/mvebu | 3 | ||||
| -rwxr-xr-x | target/linux/mvebu/base-files/etc/board.d/02_network | 5 | ||||
| -rwxr-xr-x | target/linux/mvebu/base-files/lib/upgrade/platform.sh | 3 |
3 files changed, 9 insertions, 2 deletions
diff --git a/package/boot/uboot-envtools/files/mvebu b/package/boot/uboot-envtools/files/mvebu index cd8789c0e9..c2e746d959 100644 --- a/package/boot/uboot-envtools/files/mvebu +++ b/package/boot/uboot-envtools/files/mvebu @@ -18,6 +18,9 @@ cznic,turris-omnia) ubootenv_add_uci_config "/dev/mtd0" "0xC0000" "0x10000" "0x40000" ;; globalscale,espressobin|\ +globalscale,espressobin-emmc|\ +globalscale,espressobin-v7|\ +globalscale,espressobin-v7-emmc|\ marvell,armada8040-mcbin) ubootenv_add_uci_config "/dev/mtd0" "0x3f0000" "0x10000" "0x10000" "1" ;; diff --git a/target/linux/mvebu/base-files/etc/board.d/02_network b/target/linux/mvebu/base-files/etc/board.d/02_network index f099a078b2..08819104d2 100755 --- a/target/linux/mvebu/base-files/etc/board.d/02_network +++ b/target/linux/mvebu/base-files/etc/board.d/02_network @@ -15,7 +15,10 @@ cznic,turris-omnia) ucidef_set_interface_lan "lan0 lan1 lan2 lan3 lan4" ucidef_set_interface_wan "eth2" ;; -globalscale,espressobin) +globalscale,espressobin|\ +globalscale,espressobin-emmc|\ +globalscale,espressobin-v7|\ +globalscale,espressobin-v7-emmc) ucidef_set_interfaces_lan_wan "lan0 lan1" "wan" ;; linksys,caiman|\ diff --git a/target/linux/mvebu/base-files/lib/upgrade/platform.sh b/target/linux/mvebu/base-files/lib/upgrade/platform.sh index c3c31ea06f..a7d5f451c5 100755 --- a/target/linux/mvebu/base-files/lib/upgrade/platform.sh +++ b/target/linux/mvebu/base-files/lib/upgrade/platform.sh @@ -23,7 +23,8 @@ platform_do_upgrade() { linksys,caiman|linksys,cobra|linksys,mamba|linksys,rango|linksys,shelby|linksys,venom) platform_do_upgrade_linksys "$ARGV" ;; - cznic,turris-omnia|globalscale,espressobin|marvell,armada8040-mcbin|solidrun,clearfog-base-a1|solidrun,clearfog-pro-a1) + cznic,turris-omnia|globalscale,espressobin|globalscale,espressobin-emmc|globalscale,espressobin-v7|globalscale,espressobin-v7-emmc|\ + marvell,armada8040-mcbin|solidrun,clearfog-base-a1|solidrun,clearfog-pro-a1) platform_do_upgrade_sdcard "$ARGV" ;; *) |