From: Marko Ratkaj <marko.ratkaj@sartura.hr>
Date: Thu, 6 Apr 2017 18:08:41 +0000 (+0200)
Subject: mvebu: ClearFog renamed upstream to ClearFog Pro
X-Git-Tag: v18.06.0-rc1~2970
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=ec4a8c6dee811e1aaa0c55377b2e239d236a1496;p=openwrt%2Fstaging%2Fchunkeey.git

mvebu: ClearFog renamed upstream to ClearFog Pro

The conventional model is now known as the "Clearfog Pro"

Signed-off-by: Marko Ratkaj <marko.ratkaj@sartura.hr>
---

diff --git a/package/boot/uboot-mvebu/Makefile b/package/boot/uboot-mvebu/Makefile
index bd95f769e9..1f2361caf0 100644
--- a/package/boot/uboot-mvebu/Makefile
+++ b/package/boot/uboot-mvebu/Makefile
@@ -23,7 +23,7 @@ endef
 
 define U-Boot/clearfog
   NAME:=SolidRun ClearFog A1
-  BUILD_DEVICES:=armada-388-clearfog
+  BUILD_DEVICES:=armada-388-clearfog-pro
   UBOOT_IMAGE:=u-boot-spl.kwb
 endef
 
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 d71fa9aac1..68231e004a 100755
--- a/target/linux/mvebu/base-files/etc/board.d/02_network
+++ b/target/linux/mvebu/base-files/etc/board.d/02_network
@@ -27,7 +27,7 @@ armada-385-db-ap)
 armada-xp-gp)
 	ucidef_set_interface_lan "eth0 eth1 eth2 eth3"
 	;;
-armada-388-clearfog)
+armada-388-clearfog-pro)
 	ucidef_set_interfaces_lan_wan "eth0 eth1" "eth2"
 	swconfig list 2>&1 | grep -q switch0 && \
 		ucidef_add_switch "switch0" \
diff --git a/target/linux/mvebu/base-files/lib/mvebu.sh b/target/linux/mvebu/base-files/lib/mvebu.sh
index 9a4c53ed40..0fcc82d034 100755
--- a/target/linux/mvebu/base-files/lib/mvebu.sh
+++ b/target/linux/mvebu/base-files/lib/mvebu.sh
@@ -53,8 +53,8 @@ mvebu_board_detect() {
 	*"Marvell Armada XP Development Board DB-MV784MP-GP")
 		name="armada-xp-gp"
 		;;
-	*"SolidRun Clearfog A1")
-		name="armada-388-clearfog"
+	*"SolidRun Clearfog Pro A1")
+		name="armada-388-clearfog-pro"
 		;;
 	esac
 
diff --git a/target/linux/mvebu/base-files/lib/upgrade/platform.sh b/target/linux/mvebu/base-files/lib/upgrade/platform.sh
index 77578e28d4..6db25448d6 100755
--- a/target/linux/mvebu/base-files/lib/upgrade/platform.sh
+++ b/target/linux/mvebu/base-files/lib/upgrade/platform.sh
@@ -19,7 +19,7 @@ platform_do_upgrade() {
 	armada-385-linksys-caiman|armada-385-linksys-cobra|armada-385-linksys-rango|armada-385-linksys-shelby|armada-xp-linksys-mamba)
 		platform_do_upgrade_linksys "$ARGV"
 		;;
-	armada-388-clearfog)
+	armada-388-clearfog-pro)
 		platform_do_upgrade_clearfog "$ARGV"
 		;;
 	*)
diff --git a/target/linux/mvebu/image/Makefile b/target/linux/mvebu/image/Makefile
index f4635dd1bf..dcbf4a67b3 100644
--- a/target/linux/mvebu/image/Makefile
+++ b/target/linux/mvebu/image/Makefile
@@ -23,9 +23,9 @@ endef
 # Partition 1:   32768 sectors
 # Partition 2:   98304 sectors (configurable)
 
-define Build/boot-scr
+define Build/boot-scr-cfpro
 	rm -f $@.bootscript
-	mkimage -A arm -O linux -T script -C none -a 0 -e 0 -d boot.script $@.bootscript
+	mkimage -A arm -O linux -T script -C none -a 0 -e 0 -d cfpro-boot.script $@.bootscript
 endef
 
 define Build/boot-img
@@ -171,16 +171,16 @@ define Device/armada-388-rd
 endef
 TARGET_DEVICES += armada-388-rd
 
-define Device/armada-388-clearfog
+define Device/armada-388-clearfog-pro
   KERNEL_INSTALL := 1
   KERNEL := dtb | kernel-bin
-  DEVICE_TITLE := SolidRun ClearFog
+  DEVICE_TITLE := SolidRun ClearFog Pro
   DEVICE_PACKAGES := mkf2fs e2fsprogs swconfig kmod-fs-vfat kmod-nls-cp437 kmod-nls-iso8859-1
   IMAGES := sdcard.img.gz
-  IMAGE/sdcard.img.gz := boot-scr | boot-img | sdcard-img | gzip | append-metadata
+  IMAGE/sdcard.img.gz := boot-scr-cfpro | boot-img | sdcard-img | gzip | append-metadata
   IMAGE_NAME = $$(IMAGE_PREFIX)-$$(2)
 endef
-TARGET_DEVICES += armada-388-clearfog
+TARGET_DEVICES += armada-388-clearfog-pro
 
 define Device/globalscale-mirabox
   $(Device/NAND-512K)
diff --git a/target/linux/mvebu/image/boot.script b/target/linux/mvebu/image/boot.script
deleted file mode 100644
index 1ebc88bda3..0000000000
--- a/target/linux/mvebu/image/boot.script
+++ /dev/null
@@ -1,7 +0,0 @@
-setenv bootargs console=ttyS0,115200n8 root=/dev/mmcblk0p2 rootfstype=squashfs rootwait overlay=/dev/mmcblk0p3
-setenv fdt_high 0x07a12000
-
-fatload mmc 0:1 0x02000000 zImage
-fatload mmc 0:1 0x05F00000 armada-388-clearfog.dtb
-
-bootz 0x02000000 - 0x05F00000
diff --git a/target/linux/mvebu/image/cfpro-boot.script b/target/linux/mvebu/image/cfpro-boot.script
new file mode 100644
index 0000000000..6f7653bace
--- /dev/null
+++ b/target/linux/mvebu/image/cfpro-boot.script
@@ -0,0 +1,7 @@
+setenv bootargs console=ttyS0,115200n8 root=/dev/mmcblk0p2 rootfstype=squashfs rootwait overlay=/dev/mmcblk0p3
+setenv fdt_high 0x07a12000
+
+fatload mmc 0:1 0x02000000 zImage
+fatload mmc 0:1 0x05F00000 armada-388-clearfog-pro.dtb
+
+bootz 0x02000000 - 0x05F00000