From 7a2fa1f8db5c2e627a4b939862af5f938fcfc359 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 18 Jul 2011 15:22:13 +0200 Subject: 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: Peter Korsgaard --- boot/uboot/Config.in | 5 -- boot/uboot/uboot.mk | 19 -------- linux/linux.mk | 2 +- package/Config.in | 2 +- package/uboot-mkimage/Config.in | 7 --- .../uboot-mkimage-2011.03-drop-configh.patch | 27 ----------- ...t-mkimage-2011.03-hostcflags-override-fix.patch | 29 ------------ package/uboot-mkimage/uboot-mkimage.mk | 31 ------------ package/uboot-tools/Config.in | 23 +++++++++ .../uboot-tools-2011.03-drop-configh.patch | 27 +++++++++++ ...oot-tools-2011.03-hostcflags-override-fix.patch | 29 ++++++++++++ package/uboot-tools/uboot-tools.mk | 55 ++++++++++++++++++++++ 12 files changed, 136 insertions(+), 120 deletions(-) delete mode 100644 package/uboot-mkimage/Config.in delete mode 100644 package/uboot-mkimage/uboot-mkimage-2011.03-drop-configh.patch delete mode 100644 package/uboot-mkimage/uboot-mkimage-2011.03-hostcflags-override-fix.patch delete mode 100644 package/uboot-mkimage/uboot-mkimage.mk create mode 100644 package/uboot-tools/Config.in create mode 100644 package/uboot-tools/uboot-tools-2011.03-drop-configh.patch create mode 100644 package/uboot-tools/uboot-tools-2011.03-hostcflags-override-fix.patch create mode 100644 package/uboot-tools/uboot-tools.mk diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in index 070533efd..a0b2bfc87 100644 --- a/boot/uboot/Config.in +++ b/boot/uboot/Config.in @@ -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 diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk index 0610e4c9d..142557995 100644 --- a/boot/uboot/uboot.mk +++ b/boot/uboot/uboot.mk @@ -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) diff --git a/linux/linux.mk b/linux/linux.mk index bdd8bb3e4..e6cf01aea 100644 --- a/linux/linux.mk +++ b/linux/linux.mk @@ -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) 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-2011.03-drop-configh.patch b/package/uboot-mkimage/uboot-mkimage-2011.03-drop-configh.patch deleted file mode 100644 index bf524c9a3..000000000 --- a/package/uboot-mkimage/uboot-mkimage-2011.03-drop-configh.patch +++ /dev/null @@ -1,27 +0,0 @@ -"make tools-all" should allow building tools such as mkimage and the new -imximage without any config, but imximage.c currently fails to build -with: -imximage.h:27:20: error: config.h: No such file or directory - -config.h is not needed in imximage.h nor in imximage.c, and imximage.h -is only included from imximage.c, so drop this include to fix the build. - -Signed-off-by: Lo?c Minier ---- - tools/imximage.h | 2 -- - 1 files changed, 0 insertions(+), 2 deletions(-) - -diff --git a/tools/imximage.h b/tools/imximage.h -index 38ca6be..d126a46 100644 ---- a/tools/imximage.h -+++ b/tools/imximage.h -@@ -24,8 +24,6 @@ - #ifndef _IMXIMAGE_H_ - #define _IMXIMAGE_H_ - --#include -- - #define MAX_HW_CFG_SIZE_V2 121 /* Max number of registers imx can set for v2 */ - #define MAX_HW_CFG_SIZE_V1 60 /* Max number of registers imx can set for v1 */ - #define APP_CODE_BARKER 0xB1 --- 1.7.2.3 diff --git a/package/uboot-mkimage/uboot-mkimage-2011.03-hostcflags-override-fix.patch b/package/uboot-mkimage/uboot-mkimage-2011.03-hostcflags-override-fix.patch deleted file mode 100644 index 0202eda9b..000000000 --- a/package/uboot-mkimage/uboot-mkimage-2011.03-hostcflags-override-fix.patch +++ /dev/null @@ -1,29 +0,0 @@ -[PATCH] Fix tools build with custom HOSTCFLAGS - -We always need to append HOSTCPPFLAGS, even if HOSTCFLAGS have been -overridden on the cmdline. - -Signed-off-by: Peter Korsgaard ---- - config.mk | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -Index: u-boot-2011.03/config.mk -=================================================================== ---- u-boot-2011.03.orig/config.mk -+++ u-boot-2011.03/config.mk -@@ -46,10 +46,12 @@ - - ######################################################################### - --HOSTCFLAGS = -Wall -Wstrict-prototypes -O2 -fomit-frame-pointer \ -- $(HOSTCPPFLAGS) -+HOSTCFLAGS = -Wall -Wstrict-prototypes -O2 -fomit-frame-pointer - HOSTSTRIP = strip - -+# append CPPFLAGS even if CFLAGS has been overridden on cmdline -+override HOSTCFLAGS += $(HOSTCPPFLAGS) -+ - # - # Mac OS X / Darwin's C preprocessor is Apple specific. It - # generates numerous errors and warnings. We want to bypass it 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-tools/uboot-tools-2011.03-drop-configh.patch b/package/uboot-tools/uboot-tools-2011.03-drop-configh.patch new file mode 100644 index 000000000..bf524c9a3 --- /dev/null +++ b/package/uboot-tools/uboot-tools-2011.03-drop-configh.patch @@ -0,0 +1,27 @@ +"make tools-all" should allow building tools such as mkimage and the new +imximage without any config, but imximage.c currently fails to build +with: +imximage.h:27:20: error: config.h: No such file or directory + +config.h is not needed in imximage.h nor in imximage.c, and imximage.h +is only included from imximage.c, so drop this include to fix the build. + +Signed-off-by: Lo?c Minier +--- + tools/imximage.h | 2 -- + 1 files changed, 0 insertions(+), 2 deletions(-) + +diff --git a/tools/imximage.h b/tools/imximage.h +index 38ca6be..d126a46 100644 +--- a/tools/imximage.h ++++ b/tools/imximage.h +@@ -24,8 +24,6 @@ + #ifndef _IMXIMAGE_H_ + #define _IMXIMAGE_H_ + +-#include +- + #define MAX_HW_CFG_SIZE_V2 121 /* Max number of registers imx can set for v2 */ + #define MAX_HW_CFG_SIZE_V1 60 /* Max number of registers imx can set for v1 */ + #define APP_CODE_BARKER 0xB1 +-- 1.7.2.3 diff --git a/package/uboot-tools/uboot-tools-2011.03-hostcflags-override-fix.patch b/package/uboot-tools/uboot-tools-2011.03-hostcflags-override-fix.patch new file mode 100644 index 000000000..0202eda9b --- /dev/null +++ b/package/uboot-tools/uboot-tools-2011.03-hostcflags-override-fix.patch @@ -0,0 +1,29 @@ +[PATCH] Fix tools build with custom HOSTCFLAGS + +We always need to append HOSTCPPFLAGS, even if HOSTCFLAGS have been +overridden on the cmdline. + +Signed-off-by: Peter Korsgaard +--- + config.mk | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +Index: u-boot-2011.03/config.mk +=================================================================== +--- u-boot-2011.03.orig/config.mk ++++ u-boot-2011.03/config.mk +@@ -46,10 +46,12 @@ + + ######################################################################### + +-HOSTCFLAGS = -Wall -Wstrict-prototypes -O2 -fomit-frame-pointer \ +- $(HOSTCPPFLAGS) ++HOSTCFLAGS = -Wall -Wstrict-prototypes -O2 -fomit-frame-pointer + HOSTSTRIP = strip + ++# append CPPFLAGS even if CFLAGS has been overridden on cmdline ++override HOSTCFLAGS += $(HOSTCPPFLAGS) ++ + # + # Mac OS X / Darwin's C preprocessor is Apple specific. It + # generates numerous errors and warnings. We want to bypass it 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)) -- cgit v1.2.3