public inbox for u-boot@lists.denx.de
 help / color / mirror / Atom feed
* [U-Boot] [PATCH v2] Ability to modify distro boot filename
@ 2018-11-05 18:13 Martyn Welch
  2018-11-05 19:43 ` Heinrich Schuchardt
  0 siblings, 1 reply; 3+ messages in thread
From: Martyn Welch @ 2018-11-05 18:13 UTC (permalink / raw)
  To: u-boot

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>

---

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" \
 	"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"                                                    \
-- 
2.19.1

^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [U-Boot] [PATCH v2] Ability to modify distro boot filename
  2018-11-05 18:13 [U-Boot] [PATCH v2] Ability to modify distro boot filename Martyn Welch
@ 2018-11-05 19:43 ` Heinrich Schuchardt
  2018-11-06  9:30   ` Martyn Welch
  0 siblings, 1 reply; 3+ messages in thread
From: Heinrich Schuchardt @ 2018-11-05 19:43 UTC (permalink / raw)
  To: u-boot

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 <martyn.welch@collabora.co.uk>
> 
> ---
> 
> 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?

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"                                                    \
> 

^ permalink raw reply	[flat|nested] 3+ messages in thread

* [U-Boot] [PATCH v2] Ability to modify distro boot filename
  2018-11-05 19:43 ` Heinrich Schuchardt
@ 2018-11-06  9:30   ` Martyn Welch
  0 siblings, 0 replies; 3+ messages in thread
From: Martyn Welch @ 2018-11-06  9:30 UTC (permalink / raw)
  To: u-boot

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 <martyn.welch@collabora.co.uk>
> > 
> > ---
> > 
> > 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"                                            
> >         \
> > 
> 
> 

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2018-11-06  9:30 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-11-05 18:13 [U-Boot] [PATCH v2] Ability to modify distro boot filename Martyn Welch
2018-11-05 19:43 ` Heinrich Schuchardt
2018-11-06  9:30   ` Martyn Welch

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox