From mboxrd@z Thu Jan 1 00:00:00 1970 From: spdawson at gmail.com Date: Sat, 12 Oct 2013 11:05:39 +0100 Subject: [Buildroot] [PATCH v2] uboot: support -r option for mkenvimage Message-ID: <1381572339-3232-1-git-send-email-spdawson@gmail.com> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: buildroot@busybox.net From: Simon Dawson 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 --- v2: Change configuration menu text and help text, in response to feedback from Arnout Vandecappelle and Thomas Petazzoni boot/uboot/Config.in | 8 ++++++++ boot/uboot/uboot.mk | 1 + 2 files changed, 9 insertions(+) diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in index 998cda2..b750c77 100644 --- a/boot/uboot/Config.in +++ b/boot/uboot/Config.in @@ -242,6 +242,14 @@ config BR2_TARGET_UBOOT_ENVIMAGE_SIZE Size of envronment, can be prefixed with 0x for hexadecimal values. +config BR2_TARGET_UBOOT_ENVIMAGE_REDUNDANT + bool "Environment has two copies" + help + There are two copies of the environment in flash. + + Check your u-boot configuration for the CONFIG_ENV_ADDR_REDUND and + CONFIG_ENV_SIZE_REDUND settings. + endif # BR2_TARGET_UBOOT_ENVIMAGE endif # BR2_TARGET_UBOOT diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk index dc8e26f..e21ee81 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 -- 1.8.1.2