From 05cdc60eb14cd10cf5f53453516cf7e6f84a708e Mon Sep 17 00:00:00 2001
From: Henrik Nordstrom <henrik@henriknordstrom.net>
Date: Tue, 21 May 2013 23:19:19 +0200
Subject: [PATCH] usb-boot: Rework ram boot to use a boot.scr @0x41000000 to
 indicate RAM boot

---
 bin/ramboot.scr     | Bin 0 -> 246 bytes
 felboot/ramboot.cmd |   7 +++++++
 usb-boot            |  34 +++++++++++++++++++++++++---------
 3 files changed, 32 insertions(+), 9 deletions(-)
 create mode 100644 bin/ramboot.scr
 create mode 100644 felboot/ramboot.cmd

diff --git a/bin/ramboot.scr b/bin/ramboot.scr
new file mode 100644
index 0000000000000000000000000000000000000000..944aa5837726e04cdc07001c545c1acfefe3047b
GIT binary patch
literal 246
zcmY#ql?*GWost|l`$;MT1H(2T27@2dS#Gm3vB9|b=yf1TWra}Pr2PC6g&;>?1u&yH
zxhS)sgsUhqHzl(;+m<UcO(8QkGcPS)!Jxt<*#Hcz6-qKv^SC%+iV!kfX_;KbsU@j-
zWnj}1i_(h~lJoP5^K(*dOG+w(4Rj0*O^pl;6pB(Z^D;|p^^21-^YlSXg@VMq%w$_b
U11^v=azVD4Kx|V`f!f0b0KwTn3IG5A

literal 0
HcmV?d00001

diff --git a/felboot/ramboot.cmd b/felboot/ramboot.cmd
new file mode 100644
index 0000000..72e13aa
--- /dev/null
+++ b/felboot/ramboot.cmd
@@ -0,0 +1,7 @@
+# U-boot RAM boot script
+ramdisk=
+if iminfo 0x4c000000; then
+	ramdisk=0x4c000000
+fi
+setenv bootargs console=ttyS0,115200 rdinit=/sbin/init panic=10
+bootm 0x44000000 $ramdisk
diff --git a/usb-boot b/usb-boot
index 299edca..c72dc49 100755
--- a/usb-boot
+++ b/usb-boot
@@ -1,30 +1,46 @@
 #!/bin/sh -e
+top=`dirname $0`
 if [ $# -lt 2 ]; then
-	echo "Usage: $0 board u-boot.bin [kernel script.bin [initramfs]]"
+	echo "Usage: $0 board u-boot.bin [boot.scr|-] [kernel script.bin [initramfs]]"
 	exit 1
 fi
-board=$1
-uboot=$2
-kernel=$3
-scriptbin=$4
-initramfs=$5
+board=$1; shift
+uboot=$1; shift
+bootscr=$tob/felboot/ramboot.scr
+if [ ! -f $bootscr ]; then
+	bootscr=$top/bin/ramboot.scr
+fi
+case "$1" in
+*.scr)	bootscr="$1"; shift
+	;;
+esac
+kernel=$1; shift
+scriptbin=$1; shift
+initramfs=$1; shift
 fel() {
 	echo fel "$@"
-	./fel $@
+	$top/fel $@
 }
-felboot=felboot/fel-boot-${board}.bin
+felboot=$top/felboot/fel-boot-${board}.bin
 if [ ! -f $felboot ]; then
-	felboot=bin/fel-boot-${board}.bin
+	felboot=$top/bin/fel-boot-${board}.bin
 fi
 if [ ! -f $felboot ]; then
 	echo "ERROR: Can't find fel-boot binary for ${board}"
 	exit 1
 fi
+if [ ! -f $bootscr ]; then
+	echo "ERROR: Can't fint boot script '${bootscr}'"
+	exit 1
+fi
 fel write 0x2000 $felboot
 fel exe 0x2000
 if [ -n "$uboot" ]; then
 	fel write 0x4a000000 $uboot
 fi
+if [ -n "$bootscr" ]; then
+	fel write 0x41000000 $bootscr
+fi
 if [ -n "$kernel" ]; then
  if [ -n "$scriptbin" ]; then
   fel write 0x43000000 $scriptbin