From 5e0d46138fbba1197f4f9cef4b96c7b87f42a5a1 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Tue, 5 Jul 2011 21:54:08 +0200 Subject: uboot-mkimage: new package The mkimage for the host is now built by a package, so that boot/u-boot/u-boot.mk is no longer responsible for doing this. It makes things a lot easier to handle, as linux/linux.mk now simply depends on host-uboot-mkimage. Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- boot/u-boot/u-boot-2011.03-drop-configh.patch | 27 ---------------------- .../uboot-mkimage-2011.03-drop-configh.patch | 27 ++++++++++++++++++++++ package/uboot-mkimage/uboot-mkimage.mk | 16 +++++++++++++ 3 files changed, 43 insertions(+), 27 deletions(-) delete mode 100644 boot/u-boot/u-boot-2011.03-drop-configh.patch create mode 100644 package/uboot-mkimage/uboot-mkimage-2011.03-drop-configh.patch create mode 100644 package/uboot-mkimage/uboot-mkimage.mk diff --git a/boot/u-boot/u-boot-2011.03-drop-configh.patch b/boot/u-boot/u-boot-2011.03-drop-configh.patch deleted file mode 100644 index bf524c9a3..000000000 --- a/boot/u-boot/u-boot-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-drop-configh.patch b/package/uboot-mkimage/uboot-mkimage-2011.03-drop-configh.patch new file mode 100644 index 000000000..bf524c9a3 --- /dev/null +++ b/package/uboot-mkimage/uboot-mkimage-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-mkimage/uboot-mkimage.mk b/package/uboot-mkimage/uboot-mkimage.mk new file mode 100644 index 000000000..055348c3c --- /dev/null +++ b/package/uboot-mkimage/uboot-mkimage.mk @@ -0,0 +1,16 @@ +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 HOST_UBOOT_MKIMAGE_BUILD_CMDS + $(MAKE) -C $(@D) \ + CROSS_COMPILE="$(TARGET_CROSS)" \ + ARCH=$(U_BOOT_ARCH) \ + 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,host)) -- cgit v1.2.3