Skip to content

Commit

Permalink
bootscript: sunxi: Delete the vendor's name from the fdtfile variable
Browse files Browse the repository at this point in the history
Do not inform the user if the fixup.scr file was not found.
  • Loading branch information
The-going authored and igorpecovnik committed Dec 9, 2024
1 parent ac2928b commit 4be6793
Showing 1 changed file with 8 additions and 1 deletion.
9 changes: 8 additions & 1 deletion config/bootscripts/boot-sunxi.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,12 @@ if test -e ${devtype} ${devnum} ${prefix}armbianEnv.txt; then
env import -t ${load_addr} ${filesize}
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.
# Make a check of reasonable ways to find the dtb file.
# Set the true value of the paths.
Expand Down Expand Up @@ -112,7 +118,8 @@ if test -e ${devtype} ${devnum} "${prefix}.next"; then
echo "Error applying DT overlays, restoring original DT"
load ${devtype} ${devnum} ${fdt_addr_r} ${fdtdir}/${fdtfile}
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)"
source ${load_addr}
fi
Expand Down

0 comments on commit 4be6793

Please sign in to comment.