uboot-tools: add option for mkenvimage

The tool mkenvimage generates a valid binary environment image from
a text file describing the key=value pairs of the environment.
This commit allows installation on target and host.

Signed-off-by: Arnaud Rébillout <rebillout@syscom.ch>
Acked-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>

diff --git a/package/uboot-tools/Config.in b/package/uboot-tools/Config.in
index 9cc837c93a73bff8de37eeacdb35b336417c50ef..7c8f17ce6b837cfb6d424a614900d625f107e3f9 100644 (file)
--- a/package/uboot-tools/Config.in
+++ b/package/uboot-tools/Config.in
@@ -13,6 +13,13 @@ config BR2_PACKAGE_UBOOT_TOOLS_MKIMAGE
          The mkimage tool from Das U-Boot bootloader, which allows
          generation of U-Boot images in various formats.
 
+config BR2_PACKAGE_UBOOT_TOOLS_MKENVIMAGE
+       bool "mkenvimage"
+       help
+         The mkenvimage tool from Das U-Boot bootloader, which allows
+         generation of a valid binary environment image from a text file
+         describing the key=value pairs of the environment.
+
 config BR2_PACKAGE_UBOOT_TOOLS_FWPRINTENV
        bool "fw_printenv"
        default y

diff --git a/package/uboot-tools/uboot-tools.mk b/package/uboot-tools/uboot-tools.mk
index 9d7596a7028680ce08432408e9fbcc180f16ee88..f03ff9147555d01e564a99c4d54afe5cd0ac136f 100644 (file)
--- a/package/uboot-tools/uboot-tools.mk
+++ b/package/uboot-tools/uboot-tools.mk
@@ -24,6 +24,12 @@ define UBOOT_TOOLS_INSTALL_MKIMAGE
 endef
 endif
 
+ifeq ($(BR2_PACKAGE_UBOOT_TOOLS_MKENVIMAGE),y)
+define UBOOT_TOOLS_INSTALL_MKENVIMAGE
+       $(INSTALL) -m 0755 -D $(@D)/tools/mkenvimage $(TARGET_DIR)/usr/bin/mkenvimage
+endef
+endif
+
 ifeq ($(BR2_PACKAGE_UBOOT_TOOLS_FWPRINTENV),y)
 define UBOOT_TOOLS_INSTALL_FWPRINTENV
        $(INSTALL) -m 0755 -D $(@D)/tools/env/fw_printenv $(TARGET_DIR)/usr/sbin/fw_printenv
@@ -33,6 +39,7 @@ endif
 
 define UBOOT_TOOLS_INSTALL_TARGET_CMDS
        $(UBOOT_TOOLS_INSTALL_MKIMAGE)
+       $(UBOOT_TOOLS_INSTALL_MKENVIMAGE)
        $(UBOOT_TOOLS_INSTALL_FWPRINTENV)
 endef
 
@@ -51,6 +58,7 @@ endef
 
 define HOST_UBOOT_TOOLS_INSTALL_CMDS
        $(INSTALL) -m 0755 -D $(@D)/tools/mkimage $(HOST_DIR)/usr/bin/mkimage
+       $(INSTALL) -m 0755 -D $(@D)/tools/mkenvimage $(HOST_DIR)/usr/bin/mkenvimage
 endef
 
 $(eval $(generic-package))