diff options
| author | Peter Korsgaard <peter@korsgaard.com> | 2016-06-01 17:55:16 +0200 |
|---|---|---|
| committer | Peter Korsgaard <peter@korsgaard.com> | 2016-06-01 17:55:16 +0200 |
| commit | 577021e81b0bf894d26d8127822410267b2bb411 (patch) | |
| tree | 8b93cd2342bc73294c9a7695cf8d558da7f16503 /boot/uboot | |
| parent | 206ce569269a4b0b7d3ae60f9162d40b290726d8 (diff) | |
| parent | 5386c61796feb30a02ec287ad769a6754aa525dd (diff) | |
Merge branch 'next'
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'boot/uboot')
| -rw-r--r-- | boot/uboot/Config.in | 12 | ||||
| -rw-r--r-- | boot/uboot/uboot.hash | 2 | ||||
| -rw-r--r-- | boot/uboot/uboot.mk | 7 |
3 files changed, 13 insertions, 8 deletions
diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in index 4613dd3c9..9ffbb5145 100644 --- a/boot/uboot/Config.in +++ b/boot/uboot/Config.in @@ -38,7 +38,7 @@ choice Select the specific U-Boot version you want to use config BR2_TARGET_UBOOT_LATEST_VERSION - bool "2016.03" + bool "2016.05" config BR2_TARGET_UBOOT_CUSTOM_VERSION bool "Custom version" @@ -86,7 +86,7 @@ endif config BR2_TARGET_UBOOT_VERSION string - default "2016.03" if BR2_TARGET_UBOOT_LATEST_VERSION + default "2016.05" if BR2_TARGET_UBOOT_LATEST_VERSION default BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE \ if BR2_TARGET_UBOOT_CUSTOM_VERSION default "custom" if BR2_TARGET_UBOOT_CUSTOM_TARBALL @@ -348,9 +348,13 @@ menuconfig BR2_TARGET_UBOOT_ENVIMAGE if BR2_TARGET_UBOOT_ENVIMAGE config BR2_TARGET_UBOOT_ENVIMAGE_SOURCE - string "Source file for environment" + string "Source files for environment" help - Text file describing the environment. + Text files describing the environment. Files should have + lines of the form var=value, one per line. Blank lines and + lines starting with a # are ignored. + + Multiple source files are concatenated in the order listed. config BR2_TARGET_UBOOT_ENVIMAGE_SIZE string "Size of environment" diff --git a/boot/uboot/uboot.hash b/boot/uboot/uboot.hash index 747d133df..2076b3b80 100644 --- a/boot/uboot/uboot.hash +++ b/boot/uboot/uboot.hash @@ -1,2 +1,2 @@ # Locally computed: -sha256 e49337262ecac44dbdeac140f2c6ebd1eba345e0162b0464172e7f05583ed7bb u-boot-2016.03.tar.bz2 +sha256 87d02275615aaf0cd007b54cbe9fbadceef2bee7c79e6c323ea1ae8956dcb171 u-boot-2016.05.tar.bz2 diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk index e73963853..bc5d952bb 100644 --- a/boot/uboot/uboot.mk +++ b/boot/uboot/uboot.mk @@ -168,9 +168,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), - $(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)) + 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 -) endef define UBOOT_INSTALL_OMAP_IFT_IMAGE |