bootscript: sunxi: Delete the vendor's name from the fdtfile variable

Do not inform the user if the fixup.scr file was not found.
This commit is contained in:
The-going
2024-12-05 16:44:37 +03:00
committed by Igor
parent ac2928baa4
commit 4be6793bdf

View File

@@ -45,6 +45,12 @@ if test -e ${devtype} ${devnum} ${prefix}armbianEnv.txt; then
env import -t ${load_addr} ${filesize} env import -t ${load_addr} ${filesize}
fi fi
# Delete the vendor's name from the fdtfile variable and record the result
# after the file with the environment variables has been read
if setexpr subfdt sub ${vendor}/ "" ${fdtfile};then
setenv fdtfile ${subfdt}
fi
# In this shell, we can only check the existence of the file. # In this shell, we can only check the existence of the file.
# Make a check of reasonable ways to find the dtb file. # Make a check of reasonable ways to find the dtb file.
# Set the true value of the paths. # Set the true value of the paths.
@@ -112,7 +118,8 @@ if test -e ${devtype} ${devnum} "${prefix}.next"; then
echo "Error applying DT overlays, restoring original DT" echo "Error applying DT overlays, restoring original DT"
load ${devtype} ${devnum} ${fdt_addr_r} ${fdtdir}/${fdtfile} load ${devtype} ${devnum} ${fdt_addr_r} ${fdtdir}/${fdtfile}
else else
if load ${devtype} ${devnum} ${load_addr} ${fdtdir}/overlay/${overlay_prefix}-fixup.scr; then if test -e ${devtype} ${devnum} ${fdtdir}/overlay/${overlay_prefix}-fixup.scr; then
load ${devtype} ${devnum} ${load_addr} ${fdtdir}/overlay/${overlay_prefix}-fixup.scr
echo "Applying kernel provided DT fixup script (${overlay_prefix}-fixup.scr)" echo "Applying kernel provided DT fixup script (${overlay_prefix}-fixup.scr)"
source ${load_addr} source ${load_addr}
fi fi