From 4beac8e8ceaa2810c70f7c4d3c29bdecf63f1901 Mon Sep 17 00:00:00 2001
From: Calin Crisan <ccrisan@gmail.com>
Date: Thu, 16 Mar 2017 22:32:20 +0200
Subject: [PATCH] bananapi: initial work on fwupdate support

---
 board/bananapi/boot-fwupdater.cmd                  | 8 ++++++++
 board/bananapi/boot.cmd                            | 6 +++---
 board/bananapi/overlay/usr/libexec/fw-prepare-boot | 7 +++++++
 board/bananapi/postscript.sh                       | 1 +
 4 files changed, 19 insertions(+), 3 deletions(-)
 create mode 100644 board/bananapi/boot-fwupdater.cmd
 create mode 100755 board/bananapi/overlay/usr/libexec/fw-prepare-boot

diff --git a/board/bananapi/boot-fwupdater.cmd b/board/bananapi/boot-fwupdater.cmd
new file mode 100644
index 0000000000..dec6a46ac7
--- /dev/null
+++ b/board/bananapi/boot-fwupdater.cmd
@@ -0,0 +1,8 @@
+setenv bootargs console=tty1 root=/dev/mmcblk0p2 rootwait panic=10 earlyprintk quiet loglevel=1 ipv6.disable=1 ${extra}
+setenv fdt_high ffffffff
+setenv video-mode sunxi:1024x768-24@60,monitor=hdmi,hpd=1,edid=1
+fatload mmc 0 0x43000000 sun7i-a20-bananapi.dtb
+fatload mmc 0 0x41000000 uImage
+fatload mmc 0 0x45000000 uInitrd
+bootm 0x43000000 0x41000000 0x45000000
+
diff --git a/board/bananapi/boot.cmd b/board/bananapi/boot.cmd
index 9789e58599..28f43dc899 100644
--- a/board/bananapi/boot.cmd
+++ b/board/bananapi/boot.cmd
@@ -1,7 +1,7 @@
 setenv bootargs console=tty1 root=/dev/mmcblk0p2 rootwait panic=10 earlyprintk quiet loglevel=1 ipv6.disable=1 ${extra}
-fatload mmc 0 0x49000000 sun7i-a20-bananapi.dtb
-fatload mmc 0 0x46000000 uImage
 setenv fdt_high ffffffff
 setenv video-mode sunxi:1024x768-24@60,monitor=hdmi,hpd=1,edid=1
-bootm 0x46000000 - 0x49000000
+fatload mmc 0 0x43000000 sun7i-a20-bananapi.dtb
+fatload mmc 0 0x41000000 uImage
+bootm 0x43000000 - 0x45000000
 
diff --git a/board/bananapi/overlay/usr/libexec/fw-prepare-boot b/board/bananapi/overlay/usr/libexec/fw-prepare-boot
new file mode 100755
index 0000000000..3617a48109
--- /dev/null
+++ b/board/bananapi/overlay/usr/libexec/fw-prepare-boot
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+if [ -f /boot/boot-fwupdater.scr ] then
+    mv /boot/boot.scr /boot/boot-normal.scr
+    mv /boot/boot-fwupdater.scr /boot/boot.scr
+fi
+
diff --git a/board/bananapi/postscript.sh b/board/bananapi/postscript.sh
index dea94dadbf..633c3505da 100755
--- a/board/bananapi/postscript.sh
+++ b/board/bananapi/postscript.sh
@@ -6,4 +6,5 @@ cp $IMG_DIR/uImage $BOOT_DIR
 cp $IMG_DIR/sun7i-a20-bananapi.dtb $BOOT_DIR
 
 $UBOOT_HOST_DIR/tools/mkimage -C none -A arm -T script -d $BOARD_DIR/boot.cmd $BOOT_DIR/boot.scr
+$UBOOT_HOST_DIR/tools/mkimage -C none -A arm -T script -d $BOARD_DIR/boot-fwupdater.cmd $BOOT_DIR/boot-fwupdater.scr