Enalbe builtin support for FAT filesystem as we need to mount boot
partition to store sysupgrade.tgz there
Signed-off-by: Yousong Zhou <yszhou4t...@gmail.com>
---
.../sunxi/base-files/lib/preinit/79_move_config | 20 +++++++
.../linux/sunxi/base-files/lib/upgrade/platform.sh | 67 ++++++++++++++++++++++
target/linux/sunxi/config-4.4 | 4 ++
3 files changed, 91 insertions(+)
create mode 100644 target/linux/sunxi/base-files/lib/preinit/79_move_config
create mode 100644 target/linux/sunxi/base-files/lib/upgrade/platform.sh
diff --git a/target/linux/sunxi/base-files/lib/preinit/79_move_config
b/target/linux/sunxi/base-files/lib/preinit/79_move_config
new file mode 100644
index 0000000..c112588
--- /dev/null
+++ b/target/linux/sunxi/base-files/lib/preinit/79_move_config
@@ -0,0 +1,20 @@
+#!/bin/sh
+# Copyright (C) 2012-2015 OpenWrt.org
+
+move_config() {
+ local partdev
+
+ . /lib/upgrade/common.sh
+
+ if export_bootdevice && export_partdevice partdev -1; then
+ if mount -t vfat -o rw,noatime "/dev/$partdev" /mnt; then
+ if [ -f /mnt/sysupgrade.tgz ]; then
+ mv -f /mnt/sysupgrade.tgz /
+ fi
+ umount /mnt
+ fi
+ fi
+}
+
+boot_hook_add preinit_mount_root move_config
+
diff --git a/target/linux/sunxi/base-files/lib/upgrade/platform.sh
b/target/linux/sunxi/base-files/lib/upgrade/platform.sh
new file mode 100644
index 0000000..f2cd970
--- /dev/null
+++ b/target/linux/sunxi/base-files/lib/upgrade/platform.sh
@@ -0,0 +1,67 @@
+platform_check_image() {
+ true
+}
+
+platform_copy_config() {
+ local partdev
+
+ if export_partdevice partdev -1; then
+ mount -t vfat -o rw,noatime "/dev/$partdev" /mnt
+ cp -af "$CONF_TAR" /mnt/
+ umount /mnt
+ fi
+}
+
+platform_do_upgrade() {
+ local diskdev partdev ibs diff
+
+ if export_bootdevice && export_partdevice diskdev -2; then
+ sync
+ if [ "$SAVE_PARTITIONS" = "1" ]; then
+ get_partitions "/dev/$diskdev" bootdisk
+
+ #get block size
+ if [ -f "/sys/block/$diskdev/queue/physical_block_size"
]; then
+ ibs="$(cat
"/sys/block/$diskdev/queue/physical_block_size")"
+ else
+ ibs=512
+ fi
+
+ #extract the boot sector from the image
+ get_image "$@" | dd of=/tmp/image.bs count=1 bs=512b
+
+ get_partitions /tmp/image.bs image
+
+ #compare tables
+ diff="$(grep -F -x -v -f /tmp/partmap.bootdisk
/tmp/partmap.image)"
+ if [ -n "$diff" ]; then
+ echo "Partition layout is changed. Full image
will be written."
+ ask_bool 0 "Abort" && exit
+
+ get_image "$@" | dd of="/dev/$diskdev" bs=4096
conv=fsync
+ return 0
+ fi
+
+ #write uboot image
+ get_image "$@" | dd of="$diskdev" bs=1024 skip=8 seek=8
conv=notrunc
+ #iterate over each partition from the image and write
it to the boot disk
+ while read part start size; do
+ part="$(($part - 2))"
+ if export_partdevice partdev $part; then
+ echo "Writing image to /dev/$partdev..."
+ get_image "$@" | dd of="/dev/$partdev"
ibs="$ibs" obs=1M skip="$start" count="$size" conv=fsync
+ else
+ echo "Unable to find partition $part
device, skipped."
+ fi
+ done < /tmp/partmap.image
+
+ #copy partition uuid
+ echo "Writing new UUID to /dev/$diskdev..."
+ get_image "$@" | dd of="/dev/$diskdev" bs=1 skip=440
count=4 seek=440 conv=fsync
+ else
+ get_image "$@" | dd of="/dev/$diskdev" bs=4096
conv=fsync
+ fi
+
+ sleep 1
+ fi
+}
diff --git a/target/linux/sunxi/config-4.4 b/target/linux/sunxi/config-4.4
index 816f44a..2253afa 100644
--- a/target/linux/sunxi/config-4.4
+++ b/target/linux/sunxi/config-4.4
@@ -162,6 +162,7 @@ CONFIG_F2FS_FS=y
# CONFIG_F2FS_FS_SECURITY is not set
CONFIG_F2FS_FS_XATTR=y
CONFIG_F2FS_STAT_FS=y
+CONFIG_FAT_FS=y
CONFIG_FB=y
CONFIG_FB_CFB_COPYAREA=y
CONFIG_FB_CFB_FILLRECT=y
@@ -347,6 +348,8 @@ CONFIG_NET_FLOW_LIMIT=y
CONFIG_NET_PTP_CLASSIFY=y
CONFIG_NET_VENDOR_ALLWINNER=y
CONFIG_NLS=y
+CONFIG_NLS_CODEPAGE_437=y
+CONFIG_NLS_ISO8859_1=y
CONFIG_NO_BOOTMEM=y
CONFIG_NO_HZ=y
CONFIG_NO_HZ_COMMON=y
@@ -526,6 +529,7 @@ CONFIG_USERIO=y
CONFIG_USE_OF=y
CONFIG_VDSO=y
CONFIG_VECTORS_BASE=0xffff0000
+CONFIG_VFAT_FS=y
CONFIG_VFP=y
CONFIG_VFPv3=y
CONFIG_VHOST=y
--
2.6.4
_______________________________________________
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev
