diff mbox

uboot: support -r option for mkenvimage

Message ID 1381478269-29943-1-git-send-email-spdawson@gmail.com
State Superseded
Headers show

Commit Message

Simon Dawson Oct. 11, 2013, 7:57 a.m. UTC
From: Simon Dawson <spdawson@gmail.com>

Some boards are configured in u-boot to store multiple redundant copies of
the environment image in flash. For these boards, it is required to pass the -r
flag, when generating a boot environment image using mkenvimage.

Signed-off-by: Simon Dawson <spdawson@gmail.com>
---
 boot/uboot/Config.in | 5 +++++
 boot/uboot/uboot.mk  | 1 +
 2 files changed, 6 insertions(+)

Comments

Arnout Vandecappelle Oct. 11, 2013, 9:18 p.m. UTC | #1
On 11/10/13 09:57, spdawson@gmail.com wrote:
> From: Simon Dawson <spdawson@gmail.com>
>
> Some boards are configured in u-boot to store multiple redundant copies of
> the environment image in flash. For these boards, it is required to pass the -r
> flag, when generating a boot environment image using mkenvimage.
>
> Signed-off-by: Simon Dawson <spdawson@gmail.com>
> ---
>   boot/uboot/Config.in | 5 +++++
>   boot/uboot/uboot.mk  | 1 +
>   2 files changed, 6 insertions(+)
>
> diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in
> index 998cda2..d33e8e1 100644
> --- a/boot/uboot/Config.in
> +++ b/boot/uboot/Config.in
> @@ -242,6 +242,11 @@ config BR2_TARGET_UBOOT_ENVIMAGE_SIZE
>   	  Size of envronment, can be prefixed with 0x for hexadecimal
>   	  values.
>
> +config BR2_TARGET_UBOOT_ENVIMAGE_REDUNDANT
> +	bool "Redundant environment"

  "Redundant environment" sounds as if it's... redundant :-)

  How about "Environment has two copies"?

> +	help
> +	  The environment has multiple copies in flash.

  It's always two :-)


  Regards,
  Arnout

> +
>   endif # BR2_TARGET_UBOOT_ENVIMAGE
>
>   endif # BR2_TARGET_UBOOT
> diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk
> index dc8e26f..330c177 100644
> --- a/boot/uboot/uboot.mk
> +++ b/boot/uboot/uboot.mk
> @@ -117,6 +117,7 @@ define UBOOT_INSTALL_IMAGES_CMDS
>   		cp -dpf $(@D)/$(BR2_TARGET_UBOOT_SPL_NAME) $(BINARIES_DIR)/)
>   	$(if $(BR2_TARGET_UBOOT_ENVIMAGE),
>   		$(HOST_DIR)/usr/bin/mkenvimage -s $(BR2_TARGET_UBOOT_ENVIMAGE_SIZE) \
> +		$(if $(BR2_TARGET_UBOOT_ENVIMAGE_REDUNDANT),-r) \
>   		-o $(BINARIES_DIR)/uboot-env.bin $(BR2_TARGET_UBOOT_ENVIMAGE_SOURCE))
>   endef
>
>
Thomas Petazzoni Oct. 11, 2013, 9:21 p.m. UTC | #2
Dear Arnout Vandecappelle,

On Fri, 11 Oct 2013 23:18:48 +0200, Arnout Vandecappelle wrote:

> > +config BR2_TARGET_UBOOT_ENVIMAGE_REDUNDANT
> > +	bool "Redundant environment"
> 
>   "Redundant environment" sounds as if it's... redundant :-)
> 
>   How about "Environment has two copies"?

I would also mention in the help text that it's related to the usage of
the CONFIG_ENV_ADDR_REDUND / CONFIG_ENV_SIZE_REDUND options of U-Boot,
so that the user can more easily match that with the U-Boot
configuration for his platform.

Thomas
Simon Dawson Oct. 12, 2013, 10 a.m. UTC | #3
On 11 October 2013 22:21, Thomas Petazzoni
<thomas.petazzoni@free-electrons.com> wrote:
> I would also mention in the help text that it's related to the usage of
> the CONFIG_ENV_ADDR_REDUND / CONFIG_ENV_SIZE_REDUND options of U-Boot,
> so that the user can more easily match that with the U-Boot
> configuration for his platform.

Okay; thanks for the feedback Thomas.

Simon.
diff mbox

Patch

diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in
index 998cda2..d33e8e1 100644
--- a/boot/uboot/Config.in
+++ b/boot/uboot/Config.in
@@ -242,6 +242,11 @@  config BR2_TARGET_UBOOT_ENVIMAGE_SIZE
 	  Size of envronment, can be prefixed with 0x for hexadecimal
 	  values.
 
+config BR2_TARGET_UBOOT_ENVIMAGE_REDUNDANT
+	bool "Redundant environment"
+	help
+	  The environment has multiple copies in flash.
+
 endif # BR2_TARGET_UBOOT_ENVIMAGE
 
 endif # BR2_TARGET_UBOOT
diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk
index dc8e26f..330c177 100644
--- a/boot/uboot/uboot.mk
+++ b/boot/uboot/uboot.mk
@@ -117,6 +117,7 @@  define UBOOT_INSTALL_IMAGES_CMDS
 		cp -dpf $(@D)/$(BR2_TARGET_UBOOT_SPL_NAME) $(BINARIES_DIR)/)
 	$(if $(BR2_TARGET_UBOOT_ENVIMAGE),
 		$(HOST_DIR)/usr/bin/mkenvimage -s $(BR2_TARGET_UBOOT_ENVIMAGE_SIZE) \
+		$(if $(BR2_TARGET_UBOOT_ENVIMAGE_REDUNDANT),-r) \
 		-o $(BINARIES_DIR)/uboot-env.bin $(BR2_TARGET_UBOOT_ENVIMAGE_SOURCE))
 endef