From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Wed, 13 Mar 2019 14:17:28 +0000 (+0100)
Subject: u-boot: try to boot without ramdisk if the system cannot load it
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=668119063c630ff3fd7e8b6f1b608374c6c43f60;p=people%2Fms%2Fipfire-2.x.git

u-boot: try to boot without ramdisk if the system cannot load it

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
---

diff --git a/config/rootfiles/core/129/filelists/aarch64/u-boot b/config/rootfiles/core/129/filelists/aarch64/u-boot
new file mode 100644
index 0000000000..6a00446f4d
--- /dev/null
+++ b/config/rootfiles/core/129/filelists/aarch64/u-boot
@@ -0,0 +1,2 @@
+boot/boot.cmd
+boot/boot.scr
diff --git a/config/rootfiles/core/129/filelists/armv5tel/u-boot b/config/rootfiles/core/129/filelists/armv5tel/u-boot
new file mode 100644
index 0000000000..6a00446f4d
--- /dev/null
+++ b/config/rootfiles/core/129/filelists/armv5tel/u-boot
@@ -0,0 +1,2 @@
+boot/boot.cmd
+boot/boot.scr
diff --git a/config/u-boot/boot.cmd b/config/u-boot/boot.cmd
index 2ba403824f..5cb4b8971c 100644
--- a/config/u-boot/boot.cmd
+++ b/config/u-boot/boot.cmd
@@ -91,5 +91,8 @@ fi ;
 bootz ${kernel_addr_r} ${ramdisk_addr} ${fdt_addr_r};
 booti ${kernel_addr_r} ${ramdisk_addr} ${fdt_addr_r};
 
+bootz ${kernel_addr_r} - ${fdt_addr_r};
+booti ${kernel_addr_r} - ${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 2c81cef762..5143b051bd 100644
Binary files a/config/u-boot/boot.scr and b/config/u-boot/boot.scr differ