[Buildroot] [PATCH 1/1] uboot: Support multiple environment source files

Thomas Petazzoni thomas.petazzoni at free-electrons.com
Tue May 31 21:00:51 UTC 2016


Hello,

On Sun, 31 Jan 2016 11:48:33 +1100, Cam Hutchison wrote:

> diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk
> index d539b31..515b1ea 100644
> --- a/boot/uboot/uboot.mk
> +++ b/boot/uboot/uboot.mk
> @@ -171,9 +171,10 @@ define UBOOT_INSTALL_IMAGES_CMDS
>  	$(if $(BR2_TARGET_UBOOT_SPL),
>  		cp -dpf $(@D)/$(call qstrip,$(BR2_TARGET_UBOOT_SPL_NAME)) $(BINARIES_DIR)/)
>  	$(if $(BR2_TARGET_UBOOT_ENVIMAGE),
> +		cat $(call qstrip,$(BR2_TARGET_UBOOT_ENVIMAGE_SOURCE)) | \
>  		$(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))
> +		-o $(BINARIES_DIR)/uboot-env.bin -)

The lines following the pipe should have been indented by one more tab
(but it admittedly wasn't done so far). I've fixed that up and applied
your patch to our next branch.

Thanks, and sorry for the long delay!

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com


More information about the buildroot mailing list