Przeglądaj źródła

move mkimage build to toplevel tools directory, required for avr32 kernel build

Waldemar Brodkorb 12 lat temu
rodzic
commit
bbaf8c6bdf

+ 1 - 1
mk/kernel-vars.mk

@@ -18,4 +18,4 @@ ADK_KCPPFLAGS+=		-DBCM47XX_OVERRIDE_FLASHSIZE=0x800000 \
 			-DBCM47XX_OVERRIDE_CFESIZE=0x40000
 endif
 
-KERNEL_MAKE_ENV+=	KCPPFLAGS='${ADK_KCPPFLAGS}'
+KERNEL_MAKE_ENV+=	KCPPFLAGS='${ADK_KCPPFLAGS}' PATH="$$PATH:${TOOLS_DIR}"

+ 0 - 4
target/tools/uboot-mkimage/Makefile

@@ -1,4 +0,0 @@
-include $(TOPDIR)/rules.mk
-
-all: mkimage.c crc32.c
-	$(CC_FOR_BUILD) ${FLAGS_FOR_BUILD} -o ${STAGING_HOST_DIR}/bin/mkimage mkimage.c crc32.c

+ 1 - 1
tools/Makefile

@@ -3,7 +3,7 @@
 
 include $(TOPDIR)/rules.mk
 
-TARGETS:=adk mkcrypt cpio
+TARGETS:=adk mkcrypt cpio mkimage
 
 TARGETS_INSTALL:=$(patsubst %,%-install,$(TARGETS))
 TARGETS_CLEAN:=$(patsubst %,%-clean,$(TARGETS))

+ 11 - 0
tools/mkimage/Makefile

@@ -0,0 +1,11 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+install: ${TOOLS_DIR}/mkimage
+
+${TOOLS_DIR}/mkimage: mkimage.c crc32.c
+	$(CC_FOR_BUILD) ${FLAGS_FOR_BUILD} -o $@ mkimage.c crc32.c
+
+include $(TOPDIR)/mk/tools.mk

+ 0 - 0
target/tools/uboot-mkimage/crc32.c → tools/mkimage/crc32.c


+ 0 - 0
target/tools/uboot-mkimage/image.h → tools/mkimage/image.h


+ 0 - 0
target/tools/uboot-mkimage/mkimage → tools/mkimage/mkimage


+ 0 - 0
target/tools/uboot-mkimage/mkimage.c → tools/mkimage/mkimage.c