Skip to contentSkip to conversation

boot/uboot: fix the help text of BR2_TARGET_UBOOT_ENVIMAGE_SOURCE

PATCH New Thomas Petazzoni 2 participants 6 messages Oct 27, 2019 – Oct 31, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 boot/uboot: fix the help text of BR2_TARGET_UBOOT_ENVIMAGE_SOURCE

In commit 2c8ff251cb16d38fb417a488ee0367cd03eebda2 ("boot/uboot: add option to generate env image from default env"), the possibility of generating an environment image using the built-in U-Boot environment as a source was added.

This is meant to happen when the string option BR2_TARGET_UBOOT_ENVIMAGE_SOURCE is empty, but the original commit added the Config.in help text to BR2_TARGET_UBOOT_ENVIMAGE, which is a boolean option, and therefore cannot be empty.

Move the help text to BR2_TARGET_UBOOT_ENVIMAGE_SOURCE, where it belongs.

---
 boot/uboot/Config.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
boot/uboot/Config.in +2 -2
index b7f9ed4073..68a915cdae 100644
@@ -487,8 +487,6 @@ menuconfig BR2_TARGET_UBOOT_ENVIMAGE
 
 	  The environment image will be called uboot-env.bin.
 
-	  Leave empty to generate image from compiled-in env.
-
 if BR2_TARGET_UBOOT_ENVIMAGE
 
 config BR2_TARGET_UBOOT_ENVIMAGE_SOURCE
@@ -500,6 +498,8 @@ config BR2_TARGET_UBOOT_ENVIMAGE_SOURCE
 
 	  Multiple source files are concatenated in the order listed.
 
+	  Leave empty to generate image from compiled-in env.
+
 config BR2_TARGET_UBOOT_ENVIMAGE_SIZE
 	string "Size of environment"
 	help
Signature · 1 line
2.21.0
#1 lore raw

PATCH 2/2 boot/uboot: add missing spaces around variable assignment

---
 boot/uboot/uboot.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
boot/uboot/uboot.mk +1 -1
index 3bdedd74b1..5e0f614024 100644
@@ -272,7 +272,7 @@ define UBOOT_BUILD_OMAP_IFT
 endef
 
 ifneq ($(BR2_TARGET_UBOOT_ENVIMAGE),)
-UBOOT_GENERATE_ENV_FILE=$(call qstrip,$(BR2_TARGET_UBOOT_ENVIMAGE_SOURCE))
+UBOOT_GENERATE_ENV_FILE = $(call qstrip,$(BR2_TARGET_UBOOT_ENVIMAGE_SOURCE))
 define UBOOT_GENERATE_ENV_IMAGE
 	$(if $(UBOOT_GENERATE_ENV_FILE), \
 		cat $(UBOOT_GENERATE_ENV_FILE), \
Signature · 1 line
2.21.0
#4 lore raw

PATCH 1/2 boot/uboot: fix the help text of BR2_TARGET_UBOOT_ENVIMAGE_SOURCE

In reply to Thomas Petazzoni
Quoted 12 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

In commit 2c8ff251cb16d38fb417a488ee0367cd03eebda2 ("boot/uboot: add option to generate env image from default env"), the possibility of generating an environment image using the built-in U-Boot environment as a source was added.

This is meant to happen when the string option BR2_TARGET_UBOOT_ENVIMAGE_SOURCE is empty, but the original commit added the Config.in help text to BR2_TARGET_UBOOT_ENVIMAGE, which is a boolean option, and therefore cannot be empty.

Quoted 4 lines

Move the help text to BR2_TARGET_UBOOT_ENVIMAGE_SOURCE, where it belongs.

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard
#5 lore raw

PATCH 1/2 boot/uboot: fix the help text of BR2_TARGET_UBOOT_ENVIMAGE_SOURCE

In reply to Thomas Petazzoni
Quoted 12 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

In commit 2c8ff251cb16d38fb417a488ee0367cd03eebda2 ("boot/uboot: add option to generate env image from default env"), the possibility of generating an environment image using the built-in U-Boot environment as a source was added.

This is meant to happen when the string option BR2_TARGET_UBOOT_ENVIMAGE_SOURCE is empty, but the original commit added the Config.in help text to BR2_TARGET_UBOOT_ENVIMAGE, which is a boolean option, and therefore cannot be empty.

Quoted 4 lines

Move the help text to BR2_TARGET_UBOOT_ENVIMAGE_SOURCE, where it belongs.

Committed to 2019.08.x, thanks.

Signature · 1 line
Bye, Peter Korsgaard