All of lore.kernel.org
 help / color / mirror / Atom feed
* [U-Boot] [PATCH v3] Ability to modify distro boot filename
@ 2018-11-06 12:23 Martyn Welch
  2018-11-06 18:39 ` Heinrich Schuchardt
  2018-11-17 14:08 ` [U-Boot] [U-Boot,v3] " Tom Rini
  0 siblings, 2 replies; 3+ messages in thread
From: Martyn Welch @ 2018-11-06 12:23 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 v3:
- Moving path to config variable, rename `boot_syslinux_conf`

Changes in v2:
- Moving config variable from `boot_config` to `boot_extlinux_conf`

 include/config_distro_bootcmd.h | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/include/config_distro_bootcmd.h b/include/config_distro_bootcmd.h
index 373fee78a9..5838eb3477 100644
--- 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"                                                    \
-- 
2.11.0

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

* [U-Boot] [PATCH v3] Ability to modify distro boot filename
  2018-11-06 12:23 [U-Boot] [PATCH v3] Ability to modify distro boot filename Martyn Welch
@ 2018-11-06 18:39 ` Heinrich Schuchardt
  2018-11-17 14:08 ` [U-Boot] [U-Boot,v3] " Tom Rini
  1 sibling, 0 replies; 3+ messages in thread
From: Heinrich Schuchardt @ 2018-11-06 18:39 UTC (permalink / raw)
  To: u-boot

On 11/6/18 1:23 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>

Reviewed-by: Heinrich Schuchardt <xypron.glpk@gmx.de>

>
> ---
>
> Changes in v3:
> - Moving path to config variable, rename `boot_syslinux_conf`
>
> Changes in v2:
> - Moving config variable from `boot_config` to `boot_extlinux_conf`
>
>  include/config_distro_bootcmd.h | 7 ++++---
>  1 file changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/include/config_distro_bootcmd.h b/include/config_distro_bootcmd.h
> index 373fee78a9..5838eb3477 100644
> --- 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"                                                    \
>

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

* [U-Boot] [U-Boot,v3] Ability to modify distro boot filename
  2018-11-06 12:23 [U-Boot] [PATCH v3] Ability to modify distro boot filename Martyn Welch
  2018-11-06 18:39 ` Heinrich Schuchardt
@ 2018-11-17 14:08 ` Tom Rini
  1 sibling, 0 replies; 3+ messages in thread
From: Tom Rini @ 2018-11-17 14:08 UTC (permalink / raw)
  To: u-boot

On Tue, Nov 06, 2018 at 12:23:53PM +0000, 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>
> Reviewed-by: Heinrich Schuchardt <xypron.glpk@gmx.de>

Applied to u-boot/master, thanks!

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20181117/856f9e16/attachment.sig>

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

end of thread, other threads:[~2018-11-17 14:08 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-11-06 12:23 [U-Boot] [PATCH v3] Ability to modify distro boot filename Martyn Welch
2018-11-06 18:39 ` Heinrich Schuchardt
2018-11-17 14:08 ` [U-Boot] [U-Boot,v3] " Tom Rini

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.