From mboxrd@z Thu Jan 1 00:00:00 1970 From: Martyn Welch Date: Tue, 06 Nov 2018 09:30:45 +0000 Subject: [U-Boot] [PATCH v2] Ability to modify distro boot filename In-Reply-To: <65dd71b8-f45a-9f45-54cb-4698bcfbdce4@gmx.de> References: <20181105181304.26248-1-martyn.welch@collabora.co.uk> <65dd71b8-f45a-9f45-54cb-4698bcfbdce4@gmx.de> Message-ID: <1541496645.13105.1.camel@collabora.co.uk> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit To: u-boot@lists.denx.de On Mon, 2018-11-05 at 20:43 +0100, Heinrich Schuchardt wrote: > On 11/05/2018 07:13 PM, Martyn Welch wrote: > > 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 > > > > --- > > > > Changes in v2: > > - Moving config variable from `boot_config` to `boot_extlinux_conf` > > > >  include/config_distro_bootcmd.h | 10 +++++++--- > >  1 file changed, 7 insertions(+), 3 deletions(-) > > > > diff --git a/include/config_distro_bootcmd.h > > b/include/config_distro_bootcmd.h > > index 373fee78a9..1e9f6cb31a 100644 > > --- a/include/config_distro_bootcmd.h > > +++ b/include/config_distro_bootcmd.h > > @@ -355,15 +355,19 @@ > >   "boot_script_dhcp=boot.scr.uimg\0" \ > >   BOOTENV_BOOT_TARGETS \ > >   \ > > + "boot_extlinux_conf=extlinux.conf\0" \ > > > Why do you only put "extlinux.conf" into the new variable and not > "extlinux/extlinux.conf" and call the variable boot_syslinux_conf. > > Wouldn't this provide more flexibility? > Sounds good to me. Martyn > Best regards > > >   "boot_extlinux="                                           > >         \ > >   "sysboot ${devtype} ${devnum}:${distro_bootpart} > > any "    \ > > - "${scriptaddr} > > ${prefix}extlinux/extlinux.conf\0" \ > > + "${scriptaddr} > > "                                  \ > > + "${prefix}extlinux/${boot_extlinux_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}extlinux/${boot_extlinux > > _conf}; " \ > > + "then > > "                                   \ > > + "echo Found > > "                                     \ > > + "${prefix}extlinux/${boot_extlinux > > _conf}; " \ > >   "run boot_extlinux; > > "                             \ > >   "echo SCRIPT FAILED: continuing...; > > "             \ > >   "fi\0"                                             > >         \ > > > >