Skip to content
Snippets Groups Projects
Commit 8133f2ec authored by Jonas Höppner's avatar Jonas Höppner
Browse files

bootscript:u-boot: Fix some syntax errors

parent 2896d21b
No related branches found
No related tags found
1 merge request!105bootscript:u-boot: Fix some syntax errors
Pipeline #17082 passed with stages
in 27 minutes and 11 seconds
...@@ -2,13 +2,17 @@ ...@@ -2,13 +2,17 @@
if fatload mmc ${current_partition} ${loadaddr} boot-alt.cfg && env import -t ${loadaddr} ${filesize}; then if fatload mmc ${current_partition} ${loadaddr} boot-alt.cfg && env import -t ${loadaddr} ${filesize}; then
if test -n ${cmdline};then if test -n ${cmdline};then
echo "Kernel cmdline: ${cmdline}" echo 'Kernel cmdline: ${cmdline}'
setenv bootargs ${cmdline} setenv bootargs ${cmdline}
fi fi
if test -n ${devicetree};then if test -n ${devicetree};then
echo "Loading devicetree ${devicetree}..." 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 fi
if test -n ${overlays}; then if test -n ${overlays}; then
...@@ -17,7 +21,7 @@ if fatload mmc ${current_partition} ${loadaddr} boot-alt.cfg && env import -t $ ...@@ -17,7 +21,7 @@ if fatload mmc ${current_partition} ${loadaddr} boot-alt.cfg && env import -t $
if fatload mmc ${current_partition} ${loadaddr} ${ov};then if fatload mmc ${current_partition} ${loadaddr} ${ov};then
fdt resize ${filesize} && fdt apply ${loadaddr} fdt resize ${filesize} && fdt apply ${loadaddr}
else else
echo 'Failed to load overlay ${ov} echo 'Failed to load overlay ${ov}'
fi fi
done done
fi fi
......
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 if test -n ${cmdline};then
echo "Kernel cmdline: ${cmdline}" echo 'Kernel cmdline: ${cmdline}'
setenv bootargs ${cmdline} setenv bootargs ${cmdline}
fi fi
if test -n ${devicetree};then if test -n ${devicetree};then
echo "Loading devicetree ${devicetree}..." 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 fi
if test -n ${overlays}; then if test -n ${overlays}; then
for ov in ${overlays}; do for ov in ${overlays}; do
echo Overlaying ${ov}... 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 done
fi fi
...@@ -23,6 +31,8 @@ if fatload mmc ${current_partition} ${loadaddr} boot-alt.cfg && env import -t $ ...@@ -23,6 +31,8 @@ if fatload mmc ${current_partition} ${loadaddr} boot-alt.cfg && env import -t $
echo "Loading initramfs ${initramfs}..." echo "Loading initramfs ${initramfs}..."
if fatload mmc ${current_partition} ${initrd_addr} ${initramfs};then if fatload mmc ${current_partition} ${initrd_addr} ${initramfs};then
initrd=${initrd_addr}:${filesize} initrd=${initrd_addr}:${filesize}
else
echo 'Failed to load initramfs ${initramfs}'
fi fi
fi fi
...@@ -38,5 +48,6 @@ if fatload mmc ${current_partition} ${loadaddr} boot-alt.cfg && env import -t $ ...@@ -38,5 +48,6 @@ if fatload mmc ${current_partition} ${loadaddr} boot-alt.cfg && env import -t $
echo 'Unable to load kernel ${kernel}' echo 'Unable to load kernel ${kernel}'
fi fi
else else
echo 'No valid boot-alt.cfg found' echo 'No valid boot.cfg found'
fi; fi;
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment