From ec3f9d2c08c0db671f647da3eb7b99fbc67b120d Mon Sep 17 00:00:00 2001
From: Abdoulaye Walsimou Gaye <awg@embtoolkit.org>
Date: Thu, 3 Nov 2011 23:35:44 +0100
Subject: Host tools: fix mkimage build

Signed-off-by: Abdoulaye Walsimou Gaye <awg@embtoolkit.org>
---
 Kconfig              |  7 +++++++
 mk/mkimage.mk        |  4 ++--
 src/mkimage/Makefile | 10 +++++++---
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/Kconfig b/Kconfig
index 23221d8..f357b16 100644
--- a/Kconfig
+++ b/Kconfig
@@ -68,6 +68,13 @@ comment "-----------------------------"
 config EMBTK_HOST_HAVE_CMAKE
 	bool "Build cmake for the host development machine"
 
+config EMBTK_HAVE_MKIMAGE
+	bool
+	select EMBTK_HOST_HAVE_ZLIB
+	default y
+	help
+		u-boot mkimage tool.
+
 comment "-----------------------------"
 comment "Build options"
 comment "-----------------------------"
diff --git a/mk/mkimage.mk b/mk/mkimage.mk
index 23700ed..742fed8 100644
--- a/mk/mkimage.mk
+++ b/mk/mkimage.mk
@@ -35,9 +35,9 @@ mkimage_install:
 	@test -e $(MAKEIMAGE_BUILD_DIR)/.installed || \
 	$(MAKE) $(MAKEIMAGE_BUILD_DIR)/.installed
 
-$(MAKEIMAGE_BUILD_DIR)/.installed:
+$(MAKEIMAGE_BUILD_DIR)/.installed: zlib_host_install
 	$(Q)cp -R $(EMBTK_ROOT)/src/mkimage $(TOOLS_BUILD)/
-	$(MAKE) -C $(MAKEIMAGE_BUILD_DIR)
+	$(MAKE) -C $(MAKEIMAGE_BUILD_DIR) CPPFLAGS="-I$(HOSTTOOLS)/usr/include"
 	$(MAKE) -C $(MAKEIMAGE_BUILD_DIR) DESTDIR=$(HOSTTOOLS) install
 	@touch $@
 
diff --git a/src/mkimage/Makefile b/src/mkimage/Makefile
index bf97119..0f3a0fa 100644
--- a/src/mkimage/Makefile
+++ b/src/mkimage/Makefile
@@ -1,7 +1,11 @@
+CFLAGS		?= -O2
+CPPFLAGS	?=
+LDFLAGS		?=
+
 build:
-	$(CC) -c crc32.c -o crc32.o
-	$(CC) -c mkimage.c -o mkimage.o
-	$(CC) -o mkimage *.o
+	$(CC) -c $(CPPFLAGS) $(CPPFLAGS) crc32.c -o crc32.o
+	$(CC) -c $(CPPFLAGS) $(CPPFLAGS) mkimage.c -o mkimage.o
+	$(CC) -o $(LDFLAGS) mkimage *.o
 
 clean:
 	rm -f mkimage *.o
-- 
cgit v1.2.3