Ability to modify distro boot filename

Add in the ability to modify the distro boot filename. Whilst not
immediately useful in normal usage, it allows an alternative
configuration to be provided when other u-boot functionality is used, such
as bootcount limit, to fallback to an alternative boot configuration. In
this case we can follow the same boot path as for normal boot, just
using an alternatively named configuration file.

For example, by providing the following `altbootcmd` when bootcount is in
use:

altbootcmd=setenv boot_extlinx_conf extlinux-rollback.conf; \
	run distro_bootcmd

Signed-off-by: Martyn Welch <martyn.welch@collabora.co.uk>
Reviewed-by: Heinrich Schuchardt <xypron.glpk@gmx.de>

diff --git a/include/config_distro_bootcmd.h b/include/config_distro_bootcmd.h
index 373fee78a99931e55dfc10f8308c92f624e9c0cb..5838eb347798e430e809e870c8112b985b151a8f 100644 (file)
--- a/include/config_distro_bootcmd.h
+++ b/include/config_distro_bootcmd.h
@@ -355,15 +355,16 @@
        "boot_script_dhcp=boot.scr.uimg\0" \
        BOOTENV_BOOT_TARGETS \
        \
+       "boot_syslinux_conf=extlinux/extlinux.conf\0" \
        "boot_extlinux="                                                  \
                "sysboot ${devtype} ${devnum}:${distro_bootpart} any "    \
-                       "${scriptaddr} ${prefix}extlinux/extlinux.conf\0" \
+                       "${scriptaddr} ${prefix}${boot_syslinux_conf}\0"  \
        \
        "scan_dev_for_extlinux="                                          \
                "if test -e ${devtype} "                                  \
                                "${devnum}:${distro_bootpart} "           \
-                               "${prefix}extlinux/extlinux.conf; then "  \
-                       "echo Found ${prefix}extlinux/extlinux.conf; "    \
+                               "${prefix}${boot_syslinux_conf}; then "   \
+                       "echo Found ${prefix}${boot_syslinux_conf}; "     \
                        "run boot_extlinux; "                             \
                        "echo SCRIPT FAILED: continuing...; "             \
                "fi\0"                                                    \