From 592896d2f42bf01fd95d62f8682f51b46edc5efa Mon Sep 17 00:00:00 2001
From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Thu, 5 Apr 2018 09:15:32 +0200
Subject: [PATCH] u-boot: update bootscript to boot from other devices than mmc

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
---
 config/u-boot/boot.cmd |  32 ++++++++++++++++++++++++--------
 config/u-boot/boot.scr | Bin 1456 -> 1830 bytes
 2 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/config/u-boot/boot.cmd b/config/u-boot/boot.cmd
index 9d8d0e402..d9a8c2b15 100644
--- a/config/u-boot/boot.cmd
+++ b/config/u-boot/boot.cmd
@@ -1,5 +1,20 @@
+if test ${boot_dev} = ""; then
+	setenv boot_dev mmc;
+	setenv root_dev /dev/mmcblk0p3;
+fi;
+
+if test ${boot_part} = ""; then
+	setenv boot_dev 0:1;
+fi;
+
+if test ${soc} = "kirkwood"; then
+	setenv kernel_type kirkwood;
+else
+	setenv kernel_type multi;
+fi;
+
 # Import uEnv txt...
-if fatload mmc 0 ${kernel_addr_r} uEnv.txt; then
+if fatload ${boot_dev} ${boot_part} ${kernel_addr_r} uEnv.txt; then
 	echo Load uEnv.txt...;
 	env import -t ${kernel_addr_r} ${filesize};
 	if test "${uenvcmd}" = ""; then
@@ -29,22 +44,23 @@ if test "${SERIAL-CONSOLE}" = "ON"; then
 		fi;
 	fi
 	echo Set console to ${console};
-	setenv bootargs console=${console} rootwait root=/dev/mmcblk0p3 rootwait;
+	setenv bootargs console=${console} rootwait root=${root_dev} rootwait;
 else
 	echo Set console to tty1 ;
-	setenv bootargs console=tty1 rootwait root=/dev/mmcblk0p3 rootwait;
+	setenv bootargs console=tty1 rootwait root=${root_dev} rootwait;
 fi;
 
 setenv fdt_high ffffffff;
-fatload mmc 0:1 ${kernel_addr_r} vmlinuz-${KVER}-ipfire-multi;
-fatload mmc 0:1 ${fdt_addr_r} dtb-${KVER}-ipfire-multi/${fdtfile};
-if fatload mmc 0:1 ${ramdisk_addr_r} uInit-${KVER}-ipfire-multi; then
+fatload ${boot_dev} ${boot_part} ${kernel_addr_r} vmlinuz-${KVER}-ipfire-${kernel_type};
+fatload ${boot_dev} ${boot_part} ${fdt_addr_r} dtb-${KVER}-ipfire-${kernel_type}/${fdtfile};
+setenv ramdisk_addr ${ramdisk_addr_r}
+if fatload ${boot_dev} ${boot_part} ${ramdisk_addr} uInit-${KVER}-ipfire-${kernel_type}; then
 	echo Ramdisk loaded...;
 else
 	echo Ramdisk not loaded...;
-	setenv ramdisk_addr_r -;
+	setenv ramdisk_addr -;
 fi ;
-bootz ${kernel_addr_r} ${ramdisk_addr_r} ${fdt_addr_r};
+bootz ${kernel_addr_r} ${ramdisk_addr} ${fdt_addr_r};
 
 # Recompile with:
 # mkimage -C none -A arm -T script -d /boot/boot.cmd /boot/boot.scr 
diff --git a/config/u-boot/boot.scr b/config/u-boot/boot.scr
index 6b693427c6ffd191dc330a1e3db4110adccbb2af..4128acc7c3858135a3cc4e4c118c1c708e8d08f1 100644
GIT binary patch
delta 613
zcmdnMy^K#@omDdIya@C1sKWvk3=C|~7@$C4#V$iuCbo%+iuFL@dmz!wG=-AX;t~aw
z>ZJVqlK7O=vRVaO1tleGg_4ZaJTA`S)RNS^G6k5VLT+xdHC(g^szpH`s81g#m6Vfh
zP+)A$m6mDE#f4^cL1Iw}-0XU+h8tKJV(2Z-PX_DC&Me9<&(BXmcUg97QC@0Jd`V?N
zssc=nHCJj*aVp%I$Vzfcb4q}YV+Ff#qKAS6vd5upuuC`QerDoUsfKy6c5)tb1PcEO
zvk^|slX+P*4OFU;EUpE5EU_dfKQRR*sF7`)?8Bl|kE%&ur8+I8BrP*16{sH?6-9};
zDVfFD@rfxZML@HVx$#A{pin1d5t^=Ag;LMF%o1IdYVR;f*PvS6%!0JcqEsLs+5MCE
PvxH3+XVshR&YB4T>x|Q*

delta 265
zcmZ3+w}D$;omDbydhf;3sI})S7#LU!7@$Cat1Oq5iEW~yqApN410<@f;F(*HUsR${
z>Y7)kP*PE%r>Do2nWm7ISdx>Un4*xIo2+24xtj4a6Q6!cYMDNepOlkrP+&Z{k|hFN
z=njh!J6MC2;bb*dO|jh4oRUmyE)=tXQuVA#fnX_pmFl#VlC;d6)LLr{ORWqQRH};-
zb5k;lv*Qy}Qi|e>Y86U7^D;|xRjR$iT!U(LGYir(i&AyLW=*za3uBC*+{dO5B=@jo
F0RT^NQtto&