From: Tomasz Maciej Nowak <tomek_n@o2.pl>
Date: Wed, 24 Jan 2018 15:39:48 +0000 (+0100)
Subject: mvebu: rename clearfog sysupgrade script and functions
X-Git-Tag: v18.06.0-rc1~729
X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=commitdiff_plain;h=d29a2814b71554231630859dc08cf1f0739f5b45

mvebu: rename clearfog sysupgrade script and functions

Cosmetic name change of ClearFog sysupgrade script and its functions to
more generic sdcard. This way it won't be confusing for other future
device additions.

Signed-off-by: Tomasz Maciej Nowak <tomek_n@o2.pl>
---

diff --git a/target/linux/mvebu/base-files/lib/upgrade/clearfog.sh b/target/linux/mvebu/base-files/lib/upgrade/clearfog.sh
deleted file mode 100644
index b6dbde8458..0000000000
--- a/target/linux/mvebu/base-files/lib/upgrade/clearfog.sh
+++ /dev/null
@@ -1,32 +0,0 @@
-get_magic_at() {
-	local file="$1"
-	local pos="$2"
-	get_image "$file" | dd bs=1 count=2 skip="$pos" 2>/dev/null | hexdump -v -n 2 -e '1/1 "%02x"'
-}
-
-platform_check_image_clearfog() {
-	local file="$1"
-	local magic
-
-	magic=$(get_magic_at "$file" 510)
-	[ "$magic" != "55aa" ] && {
-		echo "Failed to verify MBR boot signature."
-		return 1
-	}
-
-	return 0;
-}
-
-platform_do_upgrade_clearfog() {
-	sync
-	get_image "$1" | dd of=/dev/mmcblk0 bs=2M conv=fsync
-	sleep 1
-}
-
-platform_copy_config_clearfog() {
-	mkdir -p /boot
-	[ -f /boot/kernel.img ] || mount -o rw,noatime /dev/mmcblk0p1 /boot
-	cp -af "$CONF_TAR" /boot/
-	sync
-	umount /boot
-}
diff --git a/target/linux/mvebu/base-files/lib/upgrade/platform.sh b/target/linux/mvebu/base-files/lib/upgrade/platform.sh
index fdc94d3e8e..b59c765a38 100755
--- a/target/linux/mvebu/base-files/lib/upgrade/platform.sh
+++ b/target/linux/mvebu/base-files/lib/upgrade/platform.sh
@@ -17,7 +17,7 @@ platform_do_upgrade() {
 		platform_do_upgrade_linksys "$ARGV"
 		;;
 	armada-388-clearfog-base|armada-388-clearfog-pro)
-		platform_do_upgrade_clearfog "$ARGV"
+		platform_do_upgrade_sdcard "$ARGV"
 		;;
 	*)
 		default_do_upgrade "$ARGV"
@@ -30,7 +30,7 @@ platform_copy_config() {
 		platform_copy_config_linksys
 		;;
 	armada-388-clearfog-base|armada-388-clearfog-pro)
-		platform_copy_config_clearfog "$ARGV"
+		platform_copy_config_sdcard "$ARGV"
 		;;
 	esac
 }
diff --git a/target/linux/mvebu/base-files/lib/upgrade/sdcard.sh b/target/linux/mvebu/base-files/lib/upgrade/sdcard.sh
new file mode 100644
index 0000000000..de6e1a920c
--- /dev/null
+++ b/target/linux/mvebu/base-files/lib/upgrade/sdcard.sh
@@ -0,0 +1,32 @@
+get_magic_at() {
+	local file="$1"
+	local pos="$2"
+	get_image "$file" | dd bs=1 count=2 skip="$pos" 2>/dev/null | hexdump -v -n 2 -e '1/1 "%02x"'
+}
+
+platform_check_image_sdcard() {
+	local file="$1"
+	local magic
+
+	magic=$(get_magic_at "$file" 510)
+	[ "$magic" != "55aa" ] && {
+		echo "Failed to verify MBR boot signature."
+		return 1
+	}
+
+	return 0;
+}
+
+platform_do_upgrade_sdcard() {
+	sync
+	get_image "$1" | dd of=/dev/mmcblk0 bs=2M conv=fsync
+	sleep 1
+}
+
+platform_copy_config_sdcard() {
+	mkdir -p /boot
+	[ -f /boot/kernel.img ] || mount -o rw,noatime /dev/mmcblk0p1 /boot
+	cp -af "$CONF_TAR" /boot/
+	sync
+	umount /boot
+}