7 files changed, 79 insertions, 39 deletions
diff --git a/package/Config.in b/package/Config.in
index db730ece6..a01f8d277 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -206,7 +206,7 @@ source "package/sredird/Config.in"
 source "package/sshfs/Config.in"
 source "package/statserial/Config.in"
 source "package/sysstat/Config.in"
-source "package/uboot-mkimage/Config.in"
+source "package/uboot-tools/Config.in"
 source "package/udev/Config.in"
 source "package/usb_modeswitch/Config.in"
 source "package/usbmount/Config.in"
diff --git a/package/uboot-mkimage/Config.in b/package/uboot-mkimage/Config.in
deleted file mode 100644
index e1dec5379..000000000
--- a/package/uboot-mkimage/Config.in
+++ /dev/null
@@ -1,7 +0,0 @@
-config BR2_PACKAGE_UBOOT_MKIMAGE
-	bool "uboot-mkimage"
-	help
-	  The mkimage tool from Das U-Boot bootloader, which allows
-	  generation of U-Boot images in various formats.
-
-	  http://www.denx.de/wiki/U-Boot/WebHome
diff --git a/package/uboot-mkimage/uboot-mkimage.mk b/package/uboot-mkimage/uboot-mkimage.mk
deleted file mode 100644
index d8a8fbbe9..000000000
--- a/package/uboot-mkimage/uboot-mkimage.mk
+++ /dev/null
@@ -1,31 +0,0 @@
-UBOOT_MKIMAGE_VERSION = 2011.03
-UBOOT_MKIMAGE_SOURCE  = u-boot-$(UBOOT_MKIMAGE_VERSION).tar.bz2
-UBOOT_MKIMAGE_SITE    = ftp://ftp.denx.de/pub/u-boot
-
-define UBOOT_MKIMAGE_BUILD_CMDS
-	$(MAKE) -C $(@D) 			\
-		HOSTCC="$(TARGET_CC)"		\
-		HOSTCFLAGS="$(TARGET_CFLAGS)"	\
-		HOSTLDFLAGS="$(TARGET_LDFLAGS)"	\
-		HOSTSTRIP=true			\
-		tools
-endef
-
-define UBOOT_MKIMAGE_INSTALL_CMDS
-	install -m 0755 -D $(@D)/tools/mkimage $(TARGET_DIR)/usr/bin
-endef
-
-define HOST_UBOOT_MKIMAGE_BUILD_CMDS
-	$(MAKE) -C $(@D) 			\
-		HOSTCC="$(HOSTCC)"		\
-		HOSTCFLAGS="$(HOST_CFLAGS)"	\
-		HOSTLDFLAGS="$(HOST_LDFLAGS)"	\
-		tools
-endef
-
-define HOST_UBOOT_MKIMAGE_INSTALL_CMDS
-	install -m 0755 -D $(@D)/tools/mkimage $(HOST_DIR)/usr/bin
-endef
-
-$(eval $(call GENTARGETS,package,uboot-mkimage))
-$(eval $(call GENTARGETS,package,uboot-mkimage,host))
diff --git a/package/uboot-tools/Config.in b/package/uboot-tools/Config.in
new file mode 100644
index 000000000..f19739150
--- /dev/null
+++ b/package/uboot-tools/Config.in
@@ -0,0 +1,23 @@
+config BR2_PACKAGE_UBOOT_TOOLS
+	bool "u-boot tools"
+	help
+	  Companion tools for Das U-Boot bootloader.
+
+	  http://www.denx.de/wiki/U-Boot/WebHome
+
+if BR2_PACKAGE_UBOOT_TOOLS
+
+config BR2_PACKAGE_UBOOT_TOOLS_MKIMAGE
+	bool "mkimage"
+	help
+	  The mkimage tool from Das U-Boot bootloader, which allows
+	  generation of U-Boot images in various formats.
+
+config BR2_PACKAGE_UBOOT_TOOLS_FWPRINTENV
+	bool "fw_printenv"
+	help
+	  The fw_printenv / fw_setenv tools from Das U-Boot
+	  bootloader, which allows access to the U-Boot environment
+	  from Linux.
+
+endif
diff --git a/package/uboot-mkimage/uboot-mkimage-2011.03-drop-configh.patch b/package/uboot-tools/uboot-tools-2011.03-drop-configh.patch
index bf524c9a3..bf524c9a3 100644
--- a/package/uboot-mkimage/uboot-mkimage-2011.03-drop-configh.patch
+++ b/package/uboot-tools/uboot-tools-2011.03-drop-configh.patch
diff --git a/package/uboot-mkimage/uboot-mkimage-2011.03-hostcflags-override-fix.patch b/package/uboot-tools/uboot-tools-2011.03-hostcflags-override-fix.patch
index 0202eda9b..0202eda9b 100644
--- a/package/uboot-mkimage/uboot-mkimage-2011.03-hostcflags-override-fix.patch
+++ b/package/uboot-tools/uboot-tools-2011.03-hostcflags-override-fix.patch
diff --git a/package/uboot-tools/uboot-tools.mk b/package/uboot-tools/uboot-tools.mk
new file mode 100644
index 000000000..b9e0f215b
--- /dev/null
+++ b/package/uboot-tools/uboot-tools.mk
@@ -0,0 +1,55 @@
+UBOOT_TOOLS_VERSION = 2011.03
+UBOOT_TOOLS_SOURCE  = u-boot-$(UBOOT_TOOLS_VERSION).tar.bz2
+UBOOT_TOOLS_SITE    = ftp://ftp.denx.de/pub/u-boot
+
+define UBOOT_TOOLS_BUILD_CMDS
+	$(MAKE) -C $(@D) 			\
+		HOSTCC="$(TARGET_CC)"		\
+		HOSTCFLAGS="$(TARGET_CFLAGS)"	\
+		HOSTLDFLAGS="$(TARGET_LDFLAGS)"	\
+		HOSTSTRIP=true			\
+		tools env
+endef
+
+ifeq ($(BR2_PACKAGE_UBOOT_TOOLS_MKIMAGE),y)
+define UBOOT_TOOLS_INSTALL_MKIMAGE
+	install -m 0755 -D $(@D)/tools/mkimage $(TARGET_DIR)/usr/bin
+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
+	ln -sf fw_printenv $(TARGET_DIR)/usr/sbin/fw_setenv
+endef
+endif
+
+define UBOOT_TOOLS_INSTALL_TARGET_CMDS
+	$(UBOOT_TOOLS_INSTALL_MKIMAGE)
+	$(UBOOT_TOOLS_INSTALL_FWPRINTENV)
+endef
+
+define UBOOT_TOOLS_UNINSTALL_TARGET_CMDS
+	rm -f $(addprefix $(TARGET_DIR)/,\
+		usr/bin/mkimage usr/sbin/fw_printenv usr/sbin/fw_setenv)
+endef
+
+
+define BUSYBOX_UNINSTALL_TARGET_CMDS
+	$(BUSYBOX_MAKE_ENV) $(MAKE) $(BUSYBOX_MAKE_OPTS) -C $(@D) uninstall
+endef
+
+define HOST_UBOOT_TOOLS_BUILD_CMDS
+	$(MAKE1) -C $(@D) 			\
+		HOSTCC="$(HOSTCC)"		\
+		HOSTCFLAGS="$(HOST_CFLAGS)"	\
+		HOSTLDFLAGS="$(HOST_LDFLAGS)"	\
+		tools
+endef
+
+define HOST_UBOOT_TOOLS_INSTALL_CMDS
+	install -m 0755 -D $(@D)/tools/mkimage $(HOST_DIR)/usr/bin
+endef
+
+$(eval $(call GENTARGETS,package,uboot-tools))
+$(eval $(call GENTARGETS,package,uboot-tools,host))