Commit 7a2fa1f8 authored by Peter Korsgaard's avatar Peter Korsgaard
Browse files

uboot-tools: add fw_printenv, rename to uboot-tools 



Move fw_printenv / fw_setenv options from the uboot bootloader build to
the uboot-mkimage package, and rename it to uboot-tools.

Signed-off-by: default avatarPeter Korsgaard <jacmet@sunsite.dk>
parent 1dfc43cc

boot/uboot/Config.in

+0 −5
Original line number Diff line number Diff line
@@ -91,11 +91,6 @@ config BR2_TARGET_UBOOT_FORMAT_LDR 


endchoice



config BR2_TARGET_UBOOT_TOOL_ENV

	bool "fw_printenv tool in target"

	help

	  Install fw_printenv / fw_setenv tools in target.



menuconfig BR2_TARGET_UBOOT_NETWORK

	bool "Network Settings"

	default y

boot/uboot/uboot.mk

+0 −19
Original line number Diff line number Diff line
@@ -78,35 +78,16 @@ define UBOOT_CONFIGURE_CMDS 
	@echo "#endif /* __BR2_ADDED_CONFIG_H */" >> $(@D)/include/config.h

endef



ifeq ($(BR2_TARGET_UBOOT_TOOL_ENV),y)

define UBOOT_BUILD_TARGET_ENV_UTILS

	$(TARGET_CONFIGURE_OPTS) $(MAKE) HOSTCC="$(TARGET_CC)" -C $(@D) env

endef

endif



define UBOOT_BUILD_CMDS

	$(TARGET_CONFIGURE_OPTS) $(UBOOT_CONFIGURE_OPTS) 	\

		$(MAKE) -C $(@D) $(UBOOT_MAKE_OPTS) 		\

		$(UBOOT_MAKE_TARGET)

	$(UBOOT_BUILD_TARGET_ENV_UTILS)

endef



define UBOOT_INSTALL_IMAGES_CMDS

	cp -dpf $(@D)/$(UBOOT_BIN) $(BINARIES_DIR)/

endef



ifeq ($(BR2_TARGET_UBOOT_TOOL_ENV),y)

define UBOOT_INSTALL_TARGET_ENV_UTILS

	$(INSTALL) -m 0755 -D $(@D)/tools/env/fw_printenv \

		$(TARGET_DIR)/usr/sbin/fw_printenv

	ln -sf fw_printenv $(TARGET_DIR)/usr/sbin/fw_setenv

endef

endif



define UBOOT_INSTALL_TARGET_CMDS

	$(UBOOT_INSTALL_TARGET_ENV_UTILS)

endef



$(eval $(call GENTARGETS,boot,uboot))



ifeq ($(BR2_TARGET_UBOOT),y)

linux/linux.mk

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ LINUX_IMAGE_NAME=vmImage 
else

LINUX_IMAGE_NAME=uImage

endif

LINUX_DEPENDENCIES+=host-uboot-mkimage

LINUX_DEPENDENCIES+=host-uboot-tools

else ifeq ($(BR2_LINUX_KERNEL_BZIMAGE),y)

LINUX_IMAGE_NAME=bzImage

else ifeq ($(BR2_LINUX_KERNEL_ZIMAGE),y)

package/Config.in

+1 −1
Original line number Diff line number Diff line
@@ -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"

package/uboot-mkimage/Config.in

deleted100644 → 0
+0 −7
Original line number Diff line number Diff line 
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