From 668119063c630ff3fd7e8b6f1b608374c6c43f60 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Wed, 13 Mar 2019 15:17:28 +0100 Subject: [PATCH] u-boot: try to boot without ramdisk if the system cannot load it Signed-off-by: Arne Fitzenreiter --- .../core/129/filelists/aarch64/u-boot | 2 ++ .../core/129/filelists/armv5tel/u-boot | 2 ++ config/u-boot/boot.cmd | 3 +++ config/u-boot/boot.scr | Bin 2463 -> 2544 bytes 4 files changed, 7 insertions(+) create mode 100644 config/rootfiles/core/129/filelists/aarch64/u-boot create mode 100644 config/rootfiles/core/129/filelists/armv5tel/u-boot 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 2c81cef7625b53e9c93b7e9a3a3734546c7661d4..5143b051bd2f669e651e924ebdf856a319536a3a 100644 GIT binary patch delta 83 zc-osU{6Sb=omDdIcxU9Vm`;8V1_sUz3{arTx4MRviEW~yA`4J>#YPtvPKl)a{E{jK gmFn!&qP*0c_{5ZyqWGd(1>MPvoa&6alg&9Z0F&w#K>z>% delta 52 zc-s3QJYQH|omDcdT~69J`tQAL1_sV}1}Io_{u(nY6Wc^ZMHZlN_(m5N&dD=5!vSQM B46FbE -- 2.39.2