From 8133f2ecaacc136a837ba485c85ed7aeb1a1141c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20H=C3=B6ppner?= <jonas.hoeppner@garz-fricke.com>
Date: Thu, 29 Jul 2021 15:49:46 +0200
Subject: [PATCH] bootscript:u-boot: Fix some syntax errors
---
.../bootscript-uboot-alt/boot-alt.scr.cfg | 10 ++++++---
.../bootscript/bootscript-uboot/boot.scr.cfg | 21 ++++++++++++++-----
2 files changed, 23 insertions(+), 8 deletions(-)
diff --git a/recipes-bsp/bootscript/bootscript-uboot-alt/boot-alt.scr.cfg b/recipes-bsp/bootscript/bootscript-uboot-alt/boot-alt.scr.cfg
index e8254072..328b667c 100644
--- a/recipes-bsp/bootscript/bootscript-uboot-alt/boot-alt.scr.cfg
+++ b/recipes-bsp/bootscript/bootscript-uboot-alt/boot-alt.scr.cfg
@@ -2,13 +2,17 @@
if fatload mmc ${current_partition} ${loadaddr} boot-alt.cfg && env import -t ${loadaddr} ${filesize}; then
if test -n ${cmdline};then
- echo "Kernel cmdline: ${cmdline}"
+ echo 'Kernel cmdline: ${cmdline}'
setenv bootargs ${cmdline}
fi
if test -n ${devicetree};then
echo "Loading devicetree ${devicetree}..."
- if fatload mmc ${current_partition} ${fdt_addr} ${devicetree}
+ if fatload mmc ${current_partition} ${fdt_addr} ${devicetree};then
+ true
+ else
+ echo 'Failed to load devicetree ${devicetree}'
+ fi
fi
if test -n ${overlays}; then
@@ -17,7 +21,7 @@ if fatload mmc ${current_partition} ${loadaddr} boot-alt.cfg && env import -t $
if fatload mmc ${current_partition} ${loadaddr} ${ov};then
fdt resize ${filesize} && fdt apply ${loadaddr}
else
- echo 'Failed to load overlay ${ov}
+ echo 'Failed to load overlay ${ov}'
fi
done
fi
diff --git a/recipes-bsp/bootscript/bootscript-uboot/boot.scr.cfg b/recipes-bsp/bootscript/bootscript-uboot/boot.scr.cfg
index 88e18ef0..504c96e8 100644
--- a/recipes-bsp/bootscript/bootscript-uboot/boot.scr.cfg
+++ b/recipes-bsp/bootscript/bootscript-uboot/boot.scr.cfg
@@ -1,20 +1,28 @@
-if fatload mmc ${current_partition} ${loadaddr} boot-alt.cfg && env import -t ${loadaddr} ${filesize}; then
+if fatload mmc ${current_partition} ${loadaddr} boot.cfg && env import -t ${loadaddr} ${filesize}; then
if test -n ${cmdline};then
- echo "Kernel cmdline: ${cmdline}"
+ echo 'Kernel cmdline: ${cmdline}'
setenv bootargs ${cmdline}
fi
if test -n ${devicetree};then
echo "Loading devicetree ${devicetree}..."
- fatload mmc ${current_partition} ${fdt_addr} ${devicetree}
+ if fatload mmc ${current_partition} ${fdt_addr} ${devicetree};then
+ true
+ else
+ echo 'Failed to load devicetree ${devicetree}'
+ fi
fi
if test -n ${overlays}; then
for ov in ${overlays}; do
echo Overlaying ${ov}...
- fatload mmc ${current_partition} ${loadaddr} ${ov} && fdt resize ${filesize} && fdt apply ${loadaddr}
+ if fatload mmc ${current_partition} ${loadaddr} ${ov};then
+ fdt resize ${filesize} && fdt apply ${loadaddr}
+ else
+ echo 'Failed to load overlay ${ov}'
+ fi
done
fi
@@ -23,6 +31,8 @@ if fatload mmc ${current_partition} ${loadaddr} boot-alt.cfg && env import -t $
echo "Loading initramfs ${initramfs}..."
if fatload mmc ${current_partition} ${initrd_addr} ${initramfs};then
initrd=${initrd_addr}:${filesize}
+ else
+ echo 'Failed to load initramfs ${initramfs}'
fi
fi
@@ -38,5 +48,6 @@ if fatload mmc ${current_partition} ${loadaddr} boot-alt.cfg && env import -t $
echo 'Unable to load kernel ${kernel}'
fi
else
- echo 'No valid boot-alt.cfg found'
+ echo 'No valid boot.cfg found'
fi;
+
--
GitLab