[ptxdist] [PATCH] u-boot: generate default environment image

[Bruno Thomsen <bruno.thomsen@gmail.com>]

Can be used during manufacturing to avoid bootloader
console usage and speed up first boot.

Signed-off-by: Bruno Thomsen <bruno.thomsen@gmail.com>
---
 platforms/u-boot.in | 28 ++++++++++++++++++++++++++++
 rules/u-boot.make   | 11 +++++++++++
 2 files changed, 39 insertions(+)

diff --git a/platforms/u-boot.in b/platforms/u-boot.in
index 9bac4a758..d9195d7cd 100644
--- a/platforms/u-boot.in
+++ b/platforms/u-boot.in
@@ -2,6 +2,7 @@
 
 menuconfig U_BOOT
 	select BOOTLOADER
+	select HOST_U_BOOT_TOOLS if U_BOOT_DEFAULT_ENV_IMAGE
 	prompt "U-Boot                        "
 	bool
 
@@ -71,6 +72,33 @@ config U_BOOT_CONFIG
 
 endif
 
+config U_BOOT_DEFAULT_ENV_IMAGE
+	prompt "Generate U-Boot default environment image"
+	bool
+	help
+	  Use U-Boot's mkenvimage to compile a U-Boot default environment
+	  image for use in device manufacturing.
+
+if U_BOOT_DEFAULT_ENV_IMAGE
+
+config U_BOOT_DEFAULT_ENV_IMAGE_SIZE
+	prompt "Default environment image size"
+	string
+	default "0x2000"
+	help
+	  Enter the U-Boot environment size for generation of manufacturing
+	  image. Size can be prefixed with 0x for hexadecimal values.
+	  Must match size defined in target config and "/etc/fw_env.config".
+
+config U_BOOT_DEFAULT_ENV_IMAGE_REDUNDANT
+	prompt "Default environment image with redundant copy"
+	bool
+	help
+	  Use to generate a redundant environment in the default image.
+	  Must match target config and "/etc/fw_env.config".
+
+endif
+
 config U_BOOT_BOOT_SCRIPT
 	prompt "Compile U-Boot boot script"
 	bool
diff --git a/rules/u-boot.make b/rules/u-boot.make
index 8f9290ea7..b6e65a95a 100644
--- a/rules/u-boot.make
+++ b/rules/u-boot.make
@@ -94,6 +94,13 @@ ifdef PTXCONF_U_BOOT_BOOT_SCRIPT
 	@$(U_BOOT_DIR)/tools/mkimage -T script -C none \
 		-d $(U_BOOT_BOOT_SCRIPT_TXT) \
 		$(U_BOOT_DIR)/boot.scr.uimg
+endif
+ifdef PTXCONF_U_BOOT_DEFAULT_ENV_IMAGE
+	$(U_BOOT_MAKE_ENV) $(U_BOOT_DIR)/scripts/get_default_envs.sh | \
+		$(PTXDIST_SYSROOT_HOST)/bin/mkenvimage -p 0x0 \
+		$(call ptx/ifdef,PTXCONF_U_BOOT_DEFAULT_ENV_IMAGE_REDUNDANT,-r,) \
+		-s $(PTXCONF_U_BOOT_DEFAULT_ENV_IMAGE_SIZE) \
+		-o $(U_BOOT_DIR)/u-boot-env.img -
 endif
 	@$(call touch)
 
@@ -141,6 +148,10 @@ ifdef PTXCONF_U_BOOT_INSTALL_U_BOOT_WITH_SPL_PBL
 	@install -v -D -m644 $(U_BOOT_DIR)/u-boot-with-spl-pbl.bin \
 		$(IMAGEDIR)/u-boot-with-spl-pbl.bin
 endif
+ifdef PTXCONF_U_BOOT_DEFAULT_ENV_IMAGE
+	@install -v -D -m644 $(U_BOOT_DIR)/u-boot-env.img \
+		$(IMAGEDIR)/u-boot-env.img
+endif
 
 ifdef PTXCONF_U_BOOT_BOOT_SCRIPT
 	@$(call install_init, u-boot)
-- 
2.23.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de