* [Buildroot] [PATCH] u-boot: add option to generate env image from default env @ 2018-10-02 5:38 Denis OSTERLAND 2018-10-08 17:33 ` Arnout Vandecappelle 2019-01-14 15:28 ` [Buildroot] [PATCH v2] " Denis OSTERLAND 0 siblings, 2 replies; 8+ messages in thread From: Denis OSTERLAND @ 2018-10-02 5:38 UTC (permalink / raw) To: buildroot From: Denis Osterland <Denis.Osterland@diehl.com> This patch adds support to extract compiled in default env via u-boots get_default_envs script and generate env image from it. Signed-off-by: Denis Osterland <Denis.Osterland@diehl.com> --- boot/uboot/Config.in | 15 +++++++++++++++ boot/uboot/uboot.mk | 6 +++++- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in index 9e40c11fa1..a2e9c3866a 100644 --- a/boot/uboot/Config.in +++ b/boot/uboot/Config.in @@ -468,8 +468,23 @@ menuconfig BR2_TARGET_UBOOT_ENVIMAGE if BR2_TARGET_UBOOT_ENVIMAGE +choice + prompt "source" + +config BR2_TARGET_UBOOT_ENVIMAGE_TEXTFILE + bool "text file" + +config BR2_TARGET_UBOOT_ENVIMAGE_BUIILTIN + bool "compiled in" + help + Use the default env from u-boot image. + requires >= v2018.03 + +endchoice # source + config BR2_TARGET_UBOOT_ENVIMAGE_SOURCE string "Source files for environment" + depends on BR2_TARGET_UBOOT_ENVIMAGE_TEXTFILE help Text files describing the environment. Files should have lines of the form var=value, one per line. Blank lines and diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk index c5abc125f3..ae9e38c8c2 100644 --- a/boot/uboot/uboot.mk +++ b/boot/uboot/uboot.mk @@ -263,7 +263,9 @@ endef ifneq ($(BR2_TARGET_UBOOT_ENVIMAGE),) define UBOOT_GENERATE_ENV_IMAGE - cat $(call qstrip,$(BR2_TARGET_UBOOT_ENVIMAGE_SOURCE)) \ + $(if $(BR2_TARGET_UBOOT_ENVIMAGE_BUIILTIN), \ + CROSS_COMPILE="$(TARGET_CROSS)" $(@D)/scripts/get_default_envs.sh $(@D), \ + cat $(call qstrip,$(BR2_TARGET_UBOOT_ENVIMAGE_SOURCE))) \ >$(@D)/buildroot-env.txt $(HOST_DIR)/bin/mkenvimage -s $(BR2_TARGET_UBOOT_ENVIMAGE_SIZE) \ $(if $(BR2_TARGET_UBOOT_ENVIMAGE_REDUNDANT),-r) \ @@ -376,9 +378,11 @@ endef ifeq ($(BR2_TARGET_UBOOT_ENVIMAGE),y) ifeq ($(BR_BUILDING),y) +ifeq ($(BR2_TARGET_UBOOT_ENVIMAGE_TEXTFILE),y) ifeq ($(call qstrip,$(BR2_TARGET_UBOOT_ENVIMAGE_SOURCE)),) $(error Please define a source file for Uboot environment (BR2_TARGET_UBOOT_ENVIMAGE_SOURCE setting)) endif +endif ifeq ($(call qstrip,$(BR2_TARGET_UBOOT_ENVIMAGE_SIZE)),) $(error Please provide Uboot environment size (BR2_TARGET_UBOOT_ENVIMAGE_SIZE setting)) endif -- 2.19.0 Diehl Connectivity Solutions GmbH Gesch?ftsf?hrung: Horst Leonberger Sitz der Gesellschaft: N?rnberg - Registergericht: Amtsgericht N?rnberg: HRB 32315 ___________________________________________________________________________________________________ Der Inhalt der vorstehenden E-Mail ist nicht rechtlich bindend. Diese E-Mail enthaelt vertrauliche und/oder rechtlich geschuetzte Informationen. Informieren Sie uns bitte, wenn Sie diese E-Mail faelschlicherweise erhalten haben. Bitte loeschen Sie in diesem Fall die Nachricht. Jede unerlaubte Form der Reproduktion, Bekanntgabe, Aenderung, Verteilung und/oder Publikation dieser E-Mail ist strengstens untersagt. The contents of the above mentioned e-mail is not legally binding. This e-mail contains confidential and/or legally protected information. Please inform us if you have received this e-mail by mistake and delete it in such a case. Each unauthorized reproduction, disclosure, alteration, distribution and/or publication of this e-mail is strictly prohibited. ^ permalink raw reply related [flat|nested] 8+ messages in thread
* [Buildroot] [PATCH] u-boot: add option to generate env image from default env 2018-10-02 5:38 [Buildroot] [PATCH] u-boot: add option to generate env image from default env Denis OSTERLAND @ 2018-10-08 17:33 ` Arnout Vandecappelle 2018-10-09 7:07 ` Denis OSTERLAND 2019-01-14 15:28 ` [Buildroot] [PATCH v2] " Denis OSTERLAND 1 sibling, 1 reply; 8+ messages in thread From: Arnout Vandecappelle @ 2018-10-08 17:33 UTC (permalink / raw) To: buildroot Hi Denis, I have a few very small comments about this patch. On 2/10/18 07:38, Denis OSTERLAND wrote: > From: Denis Osterland <Denis.Osterland@diehl.com> > > This patch adds support to extract compiled in default env > via u-boots get_default_envs script and generate env image from it. > > Signed-off-by: Denis Osterland <Denis.Osterland@diehl.com> > --- > boot/uboot/Config.in | 15 +++++++++++++++ > boot/uboot/uboot.mk | 6 +++++- > 2 files changed, 20 insertions(+), 1 deletion(-) > > diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in > index 9e40c11fa1..a2e9c3866a 100644 > --- a/boot/uboot/Config.in > +++ b/boot/uboot/Config.in > @@ -468,8 +468,23 @@ menuconfig BR2_TARGET_UBOOT_ENVIMAGE > > if BR2_TARGET_UBOOT_ENVIMAGE > > +choice > + prompt "source" It's not immediately obvious that this is the source of the envimage, so better "Source for environment". > + > +config BR2_TARGET_UBOOT_ENVIMAGE_TEXTFILE I would call this BR2_TARGET_UBOOT_ENVIMAGE_CUSTOM to be consistent with the other uses of custom config files. However, see below. > + bool "text file" Here as well: "custom". > + > +config BR2_TARGET_UBOOT_ENVIMAGE_BUIILTIN and here _DEFAULT > + bool "compiled in" and "default". > + help > + Use the default env from u-boot image. > + requires >= v2018.03 > + > +endchoice # source > + > config BR2_TARGET_UBOOT_ENVIMAGE_SOURCE > string "Source files for environment" > + depends on BR2_TARGET_UBOOT_ENVIMAGE_TEXTFILE However, I think it would be simpler to just allow this option to be empty. In other words, remove the choice, and add something like the following at the end of the help text: For U-Boot >= v2018.03, it is possible to leave this empty. In that case, the default environment for the target configuration will be used. This is just an idea, if you don't like it, feel free to keep the current solution. > help > Text files describing the environment. Files should have > lines of the form var=value, one per line. Blank lines and > diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk > index c5abc125f3..ae9e38c8c2 100644 > --- a/boot/uboot/uboot.mk > +++ b/boot/uboot/uboot.mk > @@ -263,7 +263,9 @@ endef > > ifneq ($(BR2_TARGET_UBOOT_ENVIMAGE),) > define UBOOT_GENERATE_ENV_IMAGE > - cat $(call qstrip,$(BR2_TARGET_UBOOT_ENVIMAGE_SOURCE)) \ > + $(if $(BR2_TARGET_UBOOT_ENVIMAGE_BUIILTIN), \ With the choice removed, this test could be: $(if $(call qstrip,$(BR2_TARGET_UBOOT_ENVIMAGE_SOURCE)), but then it is better to factor it out in a separate variable, e.g. UBOOT_GENERATE_ENV_FILE, that is protected by an ifdef. > + CROSS_COMPILE="$(TARGET_CROSS)" $(@D)/scripts/get_default_envs.sh $(@D), \ > + cat $(call qstrip,$(BR2_TARGET_UBOOT_ENVIMAGE_SOURCE))) \ > >$(@D)/buildroot-env.txt > $(HOST_DIR)/bin/mkenvimage -s $(BR2_TARGET_UBOOT_ENVIMAGE_SIZE) \ > $(if $(BR2_TARGET_UBOOT_ENVIMAGE_REDUNDANT),-r) \ > @@ -376,9 +378,11 @@ endef > > ifeq ($(BR2_TARGET_UBOOT_ENVIMAGE),y) > ifeq ($(BR_BUILDING),y) > +ifeq ($(BR2_TARGET_UBOOT_ENVIMAGE_TEXTFILE),y) > ifeq ($(call qstrip,$(BR2_TARGET_UBOOT_ENVIMAGE_SOURCE)),) > $(error Please define a source file for Uboot environment (BR2_TARGET_UBOOT_ENVIMAGE_SOURCE setting)) > endif > +endif With the choice removed, this entire condition+error would just be removed. Regards, Arnout > ifeq ($(call qstrip,$(BR2_TARGET_UBOOT_ENVIMAGE_SIZE)),) > $(error Please provide Uboot environment size (BR2_TARGET_UBOOT_ENVIMAGE_SIZE setting)) > endif > -- Arnout Vandecappelle arnout at mind be Senior Embedded Software Architect +32-16-286500 Essensium/Mind http://www.mind.be G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle GPG fingerprint: 7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF ^ permalink raw reply [flat|nested] 8+ messages in thread
* [Buildroot] [PATCH] u-boot: add option to generate env image from default env 2018-10-08 17:33 ` Arnout Vandecappelle @ 2018-10-09 7:07 ` Denis OSTERLAND 2018-10-09 8:01 ` Arnout Vandecappelle 0 siblings, 1 reply; 8+ messages in thread From: Denis OSTERLAND @ 2018-10-09 7:07 UTC (permalink / raw) To: buildroot Hi Arnout, thanks for the review. Am Montag, den 08.10.2018, 19:33 +0200 schrieb Arnout Vandecappelle: > > ? > > +choice > > + prompt "source" > ?It's not immediately obvious that this is the source of the envimage, so better > "Source for environment". clear > > > > > + > > +config BR2_TARGET_UBOOT_ENVIMAGE_TEXTFILE > ?I would call this BR2_TARGET_UBOOT_ENVIMAGE_CUSTOM to be consistent with the > other uses of custom config files. However, see below. > > > > > + bool "text file" > ?Here as well: "custom". okay > > > > > + > > +config BR2_TARGET_UBOOT_ENVIMAGE_BUIILTIN > ?and here _DEFAULT > > > > > + bool "compiled in" > ?and "default". okay > > > > > + help > > + ??Use the default env from u-boot image. > > + ??requires >= v2018.03 > > + > > +endchoice # source > > + > > ?config BR2_TARGET_UBOOT_ENVIMAGE_SOURCE > > ? string "Source files for environment" > > + depends on BR2_TARGET_UBOOT_ENVIMAGE_TEXTFILE > ?However, I think it would be simpler to just allow this option to be empty. In > other words, remove the choice, and add something like the following at the end > of the help text: > > ??For U-Boot >= v2018.03, it is possible to leave this empty. In that > ??case, the default environment for the target configuration will be > ??used. > > ?This is just an idea, if you don't like it, feel free to keep the current solution. Well, I thought about it. contra: ?- adds additional configuration switches pro: ?- clear on first look (not required to read help first) ?- easier to extend (add other sources in future) ?- keeps current behavior (failed to build, if only BR2_TARGET_UBOOT_ENVIMAGE is selected) I think it is not very likely that other sources were implemented. Maybe it would be nice to just tick BR2_TARGET_UBOOT_ENVIMAGE and empty default of SOURCE will lead to default env. What do you think? > > > > > > ? help > > ? ??Text files describing the environment. Files should have > > ? ??lines of the form var=value, one per line. Blank lines and > > diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk > > index c5abc125f3..ae9e38c8c2 100644 > > --- a/boot/uboot/uboot.mk > > +++ b/boot/uboot/uboot.mk > > @@ -263,7 +263,9 @@ endef > > ? > > ?ifneq ($(BR2_TARGET_UBOOT_ENVIMAGE),) > > ?define UBOOT_GENERATE_ENV_IMAGE > > - cat $(call qstrip,$(BR2_TARGET_UBOOT_ENVIMAGE_SOURCE)) \ > > + $(if $(BR2_TARGET_UBOOT_ENVIMAGE_BUIILTIN), \ > ?With the choice removed, this test could be: > > $(if $(call qstrip,$(BR2_TARGET_UBOOT_ENVIMAGE_SOURCE)), > > but then it is better to factor it out in a separate variable, e.g. > UBOOT_GENERATE_ENV_FILE, that is protected by an ifdef. indeed > > > > > + CROSS_COMPILE="$(TARGET_CROSS)" $(@D)/scripts/get_default_envs.sh $(@D), \ > > + cat $(call qstrip,$(BR2_TARGET_UBOOT_ENVIMAGE_SOURCE))) \ > > ? >$(@D)/buildroot-env.txt > > ? $(HOST_DIR)/bin/mkenvimage -s $(BR2_TARGET_UBOOT_ENVIMAGE_SIZE) \ > > ? $(if $(BR2_TARGET_UBOOT_ENVIMAGE_REDUNDANT),-r) \ > > @@ -376,9 +378,11 @@ endef > > ? > > ?ifeq ($(BR2_TARGET_UBOOT_ENVIMAGE),y) > > ?ifeq ($(BR_BUILDING),y) > > +ifeq ($(BR2_TARGET_UBOOT_ENVIMAGE_TEXTFILE),y) > > ?ifeq ($(call qstrip,$(BR2_TARGET_UBOOT_ENVIMAGE_SOURCE)),) > > ?$(error Please define a source file for Uboot environment (BR2_TARGET_UBOOT_ENVIMAGE_SOURCE setting)) > > ?endif > > +endif > ?With the choice removed, this entire condition+error would just be removed. remove code is always nice ;-) > > ?Regards, > ?Arnout Regards Denis Diehl Connectivity Solutions GmbH Gesch?ftsf?hrung: Horst Leonberger Sitz der Gesellschaft: N?rnberg - Registergericht: Amtsgericht N?rnberg: HRB 32315 ___________________________________________________________________________________________________ Der Inhalt der vorstehenden E-Mail ist nicht rechtlich bindend. Diese E-Mail enthaelt vertrauliche und/oder rechtlich geschuetzte Informationen. Informieren Sie uns bitte, wenn Sie diese E-Mail faelschlicherweise erhalten haben. Bitte loeschen Sie in diesem Fall die Nachricht. Jede unerlaubte Form der Reproduktion, Bekanntgabe, Aenderung, Verteilung und/oder Publikation dieser E-Mail ist strengstens untersagt. The contents of the above mentioned e-mail is not legally binding. This e-mail contains confidential and/or legally protected information. Please inform us if you have received this e-mail by mistake and delete it in such a case. Each unauthorized reproduction, disclosure, alteration, distribution and/or publication of this e-mail is strictly prohibited. ^ permalink raw reply [flat|nested] 8+ messages in thread
* [Buildroot] [PATCH] u-boot: add option to generate env image from default env 2018-10-09 7:07 ` Denis OSTERLAND @ 2018-10-09 8:01 ` Arnout Vandecappelle 2018-10-09 9:20 ` Denis OSTERLAND 0 siblings, 1 reply; 8+ messages in thread From: Arnout Vandecappelle @ 2018-10-09 8:01 UTC (permalink / raw) To: buildroot On 9/10/18 09:07, Denis OSTERLAND wrote: > Hi Arnout, > > thanks for the review. > Am Montag, den 08.10.2018, 19:33 +0200 schrieb Arnout Vandecappelle: [snip] >> ?However, I think it would be simpler to just allow this option to be empty. In >> other words, remove the choice, and add something like the following at the end >> of the help text: >> >> ??For U-Boot >= v2018.03, it is possible to leave this empty. In that >> ??case, the default environment for the target configuration will be >> ??used. >> >> ?This is just an idea, if you don't like it, feel free to keep the current solution. > Well, I thought about it. > contra: > ?- adds additional configuration switches > pro: > ?- clear on first look (not required to read help first) This is a valid point. > ?- easier to extend (add other sources in future) Hm, there is something to be said for this point as well. It might be possible that U-Boot will start shipping internal environment fragments. However, in that case, I think we would really want to add an additional list of internal sources, again without an option to control enabling it. > ?- keeps current behavior (failed to build, if only BR2_TARGET_UBOOT_ENVIMAGE is selected) This is really not important. > I think it is not very likely that other sources were implemented. > Maybe it would be nice to just tick BR2_TARGET_UBOOT_ENVIMAGE and > empty default of SOURCE will lead to default env. > > What do you think? That is indeed what I meant. Regards, Arnout [snip] -- Arnout Vandecappelle arnout at mind be Senior Embedded Software Architect +32-16-286500 Essensium/Mind http://www.mind.be G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle GPG fingerprint: 7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF ^ permalink raw reply [flat|nested] 8+ messages in thread
* [Buildroot] [PATCH] u-boot: add option to generate env image from default env 2018-10-09 8:01 ` Arnout Vandecappelle @ 2018-10-09 9:20 ` Denis OSTERLAND 0 siblings, 0 replies; 8+ messages in thread From: Denis OSTERLAND @ 2018-10-09 9:20 UTC (permalink / raw) To: buildroot Hi Arnout, Am Dienstag, den 09.10.2018, 10:01 +0200 schrieb Arnout Vandecappelle: > > On 9/10/18 09:07, Denis OSTERLAND wrote: > > > > pro: > > ?- clear on first look (not required to read help first) > ?This is a valid point. > > > > > ?- easier to extend (add other sources in future) > ?Hm, there is something to be said for this point as well. It might be possible > that U-Boot will start shipping internal environment fragments. > > ?However, in that case, I think we would really want to add an additional list > of internal sources, again without an option to control enabling it. > > > > > ?- keeps current behavior (failed to build, if only BR2_TARGET_UBOOT_ENVIMAGE is selected) > ?This is really not important. > > > > > > I think it is not very likely that other sources were implemented. > > Maybe it would be nice to just tick BR2_TARGET_UBOOT_ENVIMAGE and > > empty default of SOURCE will lead to default env. > > > > What do you think? > ?That is indeed what I meant. so... you vote for empty list? What about this? ? ? ? ? $(if $(BR2_TARGET_UBOOT_ENVIMAGE_DEFAULT), \ ????????CROSS_COMPILE="$(TARGET_CROSS)" $(@D)/scripts/get_default_envs.sh $(@D), \ ????????echo "") | cat - $(call qstrip,$(BR2_TARGET_UBOOT_ENVIMAGE_SOURCE)) \ ????????????????>$(@D)/buildroot-env.txt Introduce a bool DEFAULT to enable read of compiled in env and concatenate it with the files from SOURCES list. > > ?Regards, > ?Arnout > Regards Denis Diehl Connectivity Solutions GmbH Gesch?ftsf?hrung: Horst Leonberger Sitz der Gesellschaft: N?rnberg - Registergericht: Amtsgericht N?rnberg: HRB 32315 ___________________________________________________________________________________________________ Der Inhalt der vorstehenden E-Mail ist nicht rechtlich bindend. Diese E-Mail enthaelt vertrauliche und/oder rechtlich geschuetzte Informationen. Informieren Sie uns bitte, wenn Sie diese E-Mail faelschlicherweise erhalten haben. Bitte loeschen Sie in diesem Fall die Nachricht. Jede unerlaubte Form der Reproduktion, Bekanntgabe, Aenderung, Verteilung und/oder Publikation dieser E-Mail ist strengstens untersagt. The contents of the above mentioned e-mail is not legally binding. This e-mail contains confidential and/or legally protected information. Please inform us if you have received this e-mail by mistake and delete it in such a case. Each unauthorized reproduction, disclosure, alteration, distribution and/or publication of this e-mail is strictly prohibited. ^ permalink raw reply [flat|nested] 8+ messages in thread
* [Buildroot] [PATCH v2] u-boot: add option to generate env image from default env 2018-10-02 5:38 [Buildroot] [PATCH] u-boot: add option to generate env image from default env Denis OSTERLAND 2018-10-08 17:33 ` Arnout Vandecappelle @ 2019-01-14 15:28 ` Denis OSTERLAND 2018-12-04 12:55 ` Denis OSTERLAND 2019-08-01 10:32 ` Arnout Vandecappelle 1 sibling, 2 replies; 8+ messages in thread From: Denis OSTERLAND @ 2019-01-14 15:28 UTC (permalink / raw) To: buildroot From: Denis Osterland <Denis.Osterland@diehl.com> This patch adds support to extract compiled in default env via u-boots get_default_envs script and generate env image from it. Signed-off-by: Denis Osterland <Denis.Osterland@diehl.com> --- v1 -> v2: use compiled in env if sources list is empty, as suggested by Arnout Vandecappelle boot/uboot/Config.in | 2 ++ boot/uboot/uboot.mk | 8 ++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in index ac6f8bc8c1..2e3a112874 100644 --- a/boot/uboot/Config.in +++ b/boot/uboot/Config.in @@ -466,6 +466,8 @@ 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 diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk index cbdfee6ac3..693fe69508 100644 --- a/boot/uboot/uboot.mk +++ b/boot/uboot/uboot.mk @@ -262,8 +262,11 @@ define UBOOT_BUILD_OMAP_IFT endef ifneq ($(BR2_TARGET_UBOOT_ENVIMAGE),) +UBOOT_GENERATE_ENV_FILE=$(call qstrip,$(BR2_TARGET_UBOOT_ENVIMAGE_SOURCE)) define UBOOT_GENERATE_ENV_IMAGE - cat $(call qstrip,$(BR2_TARGET_UBOOT_ENVIMAGE_SOURCE)) \ + $(if $(UBOOT_GENERATE_ENV_FILE), \ + cat $(UBOOT_GENERATE_ENV_FILE), \ + CROSS_COMPILE="$(TARGET_CROSS)" $(@D)/scripts/get_default_envs.sh $(@D)) \ >$(@D)/buildroot-env.txt $(HOST_DIR)/bin/mkenvimage -s $(BR2_TARGET_UBOOT_ENVIMAGE_SIZE) \ $(if $(BR2_TARGET_UBOOT_ENVIMAGE_REDUNDANT),-r) \ @@ -376,9 +379,6 @@ endef ifeq ($(BR2_TARGET_UBOOT_ENVIMAGE),y) ifeq ($(BR_BUILDING),y) -ifeq ($(call qstrip,$(BR2_TARGET_UBOOT_ENVIMAGE_SOURCE)),) -$(error Please define a source file for Uboot environment (BR2_TARGET_UBOOT_ENVIMAGE_SOURCE setting)) -endif ifeq ($(call qstrip,$(BR2_TARGET_UBOOT_ENVIMAGE_SIZE)),) $(error Please provide Uboot environment size (BR2_TARGET_UBOOT_ENVIMAGE_SIZE setting)) endif -- 2.19.1 Diehl Connectivity Solutions GmbH Gesch?ftsf?hrung: Horst Leonberger Sitz der Gesellschaft: N?rnberg - Registergericht: Amtsgericht N?rnberg: HRB 32315 ___________________________________________________________________________________________________ Der Inhalt der vorstehenden E-Mail ist nicht rechtlich bindend. Diese E-Mail enthaelt vertrauliche und/oder rechtlich geschuetzte Informationen. Informieren Sie uns bitte, wenn Sie diese E-Mail faelschlicherweise erhalten haben. Bitte loeschen Sie in diesem Fall die Nachricht. Jede unerlaubte Form der Reproduktion, Bekanntgabe, Aenderung, Verteilung und/oder Publikation dieser E-Mail ist strengstens untersagt. The contents of the above mentioned e-mail is not legally binding. This e-mail contains confidential and/or legally protected information. Please inform us if you have received this e-mail by mistake and delete it in such a case. Each unauthorized reproduction, disclosure, alteration, distribution and/or publication of this e-mail is strictly prohibited. ^ permalink raw reply related [flat|nested] 8+ messages in thread
* [Buildroot] [PATCH v2] u-boot: add option to generate env image from default env 2019-01-14 15:28 ` [Buildroot] [PATCH v2] " Denis OSTERLAND @ 2018-12-04 12:55 ` Denis OSTERLAND 2019-08-01 10:32 ` Arnout Vandecappelle 1 sibling, 0 replies; 8+ messages in thread From: Denis OSTERLAND @ 2018-12-04 12:55 UTC (permalink / raw) To: buildroot Hi, any objections here? Regards Denis Am Montag, den 12.11.2018, 11:17 +0100 schrieb Denis OSTERLAND: > From: Denis Osterland <Denis.Osterland@diehl.com> > > This patch adds support to extract compiled in default env > via u-boots get_default_envs script and generate env image from it. > > Signed-off-by: Denis Osterland <Denis.Osterland@diehl.com> > --- > v1 -> v2: use compiled in env if sources list is empty, > ??????????as suggested by Arnout Vandecappelle > > ?boot/uboot/Config.in | 2 ++ > ?boot/uboot/uboot.mk??| 8 ++++---- > ?2 files changed, 6 insertions(+), 4 deletions(-) > > diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in > index ac6f8bc8c1..2e3a112874 100644 > --- a/boot/uboot/Config.in > +++ b/boot/uboot/Config.in > @@ -466,6 +466,8 @@ 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 > diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk > index cbdfee6ac3..693fe69508 100644 > --- a/boot/uboot/uboot.mk > +++ b/boot/uboot/uboot.mk > @@ -262,8 +262,11 @@ define UBOOT_BUILD_OMAP_IFT > ?endef > ? > ?ifneq ($(BR2_TARGET_UBOOT_ENVIMAGE),) > +UBOOT_GENERATE_ENV_FILE=$(call qstrip,$(BR2_TARGET_UBOOT_ENVIMAGE_SOURCE)) > ?define UBOOT_GENERATE_ENV_IMAGE > - cat $(call qstrip,$(BR2_TARGET_UBOOT_ENVIMAGE_SOURCE)) \ > + $(if $(UBOOT_GENERATE_ENV_FILE), \ > + cat $(UBOOT_GENERATE_ENV_FILE), \ > + CROSS_COMPILE="$(TARGET_CROSS)" $(@D)/scripts/get_default_envs.sh $(@D)) \ > ? >$(@D)/buildroot-env.txt > ? $(HOST_DIR)/bin/mkenvimage -s $(BR2_TARGET_UBOOT_ENVIMAGE_SIZE) \ > ? $(if $(BR2_TARGET_UBOOT_ENVIMAGE_REDUNDANT),-r) \ > @@ -376,9 +379,6 @@ endef > ? > ?ifeq ($(BR2_TARGET_UBOOT_ENVIMAGE),y) > ?ifeq ($(BR_BUILDING),y) > -ifeq ($(call qstrip,$(BR2_TARGET_UBOOT_ENVIMAGE_SOURCE)),) > -$(error Please define a source file for Uboot environment (BR2_TARGET_UBOOT_ENVIMAGE_SOURCE setting)) > -endif > ?ifeq ($(call qstrip,$(BR2_TARGET_UBOOT_ENVIMAGE_SIZE)),) > ?$(error Please provide Uboot environment size (BR2_TARGET_UBOOT_ENVIMAGE_SIZE setting)) > ?endif Diehl Connectivity Solutions GmbH Gesch?ftsf?hrung: Horst Leonberger Sitz der Gesellschaft: N?rnberg - Registergericht: Amtsgericht N?rnberg: HRB 32315 ___________________________________________________________________________________________________ Der Inhalt der vorstehenden E-Mail ist nicht rechtlich bindend. Diese E-Mail enthaelt vertrauliche und/oder rechtlich geschuetzte Informationen. Informieren Sie uns bitte, wenn Sie diese E-Mail faelschlicherweise erhalten haben. Bitte loeschen Sie in diesem Fall die Nachricht. Jede unerlaubte Form der Reproduktion, Bekanntgabe, Aenderung, Verteilung und/oder Publikation dieser E-Mail ist strengstens untersagt. The contents of the above mentioned e-mail is not legally binding. This e-mail contains confidential and/or legally protected information. Please inform us if you have received this e-mail by mistake and delete it in such a case. Each unauthorized reproduction, disclosure, alteration, distribution and/or publication of this e-mail is strictly prohibited. ^ permalink raw reply [flat|nested] 8+ messages in thread
* [Buildroot] [PATCH v2] u-boot: add option to generate env image from default env 2019-01-14 15:28 ` [Buildroot] [PATCH v2] " Denis OSTERLAND 2018-12-04 12:55 ` Denis OSTERLAND @ 2019-08-01 10:32 ` Arnout Vandecappelle 1 sibling, 0 replies; 8+ messages in thread From: Arnout Vandecappelle @ 2019-08-01 10:32 UTC (permalink / raw) To: buildroot On 14/01/2019 16:28, Denis OSTERLAND wrote: > From: Denis Osterland <Denis.Osterland@diehl.com> > > This patch adds support to extract compiled in default env > via u-boots get_default_envs script and generate env image from it. > > Signed-off-by: Denis Osterland <Denis.Osterland@diehl.com> Applied to master, thanks. Sorry it took so long. Regards, Arnout ^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2019-08-01 10:32 UTC | newest] Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2018-10-02 5:38 [Buildroot] [PATCH] u-boot: add option to generate env image from default env Denis OSTERLAND 2018-10-08 17:33 ` Arnout Vandecappelle 2018-10-09 7:07 ` Denis OSTERLAND 2018-10-09 8:01 ` Arnout Vandecappelle 2018-10-09 9:20 ` Denis OSTERLAND 2019-01-14 15:28 ` [Buildroot] [PATCH v2] " Denis OSTERLAND 2018-12-04 12:55 ` Denis OSTERLAND 2019-08-01 10:32 ` Arnout Vandecappelle
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.