diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-11-04 21:41:55 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-11-04 21:41:55 +0100 |
| commit | bbaf8c6bdf66ed5cc104d644ee666b316d7cde54 (patch) | |
| tree | 1f245d520594251e7ad17457c045794508008272 | |
| parent | 9f21d9bd78d5a8269e72cf5c230207e1b3961b9a (diff) | |
move mkimage build to toplevel tools directory, required for avr32 kernel build
| -rw-r--r-- | mk/kernel-vars.mk | 2 | ||||
| -rw-r--r-- | target/tools/uboot-mkimage/Makefile | 4 | ||||
| -rw-r--r-- | tools/Makefile | 2 | ||||
| -rw-r--r-- | tools/mkimage/Makefile | 11 | ||||
| -rw-r--r-- | tools/mkimage/crc32.c (renamed from target/tools/uboot-mkimage/crc32.c) | 0 | ||||
| -rw-r--r-- | tools/mkimage/image.h (renamed from target/tools/uboot-mkimage/image.h) | 0 | ||||
| -rwxr-xr-x | tools/mkimage/mkimage (renamed from target/tools/uboot-mkimage/mkimage) | bin | 23424 -> 23424 bytes | |||
| -rw-r--r-- | tools/mkimage/mkimage.c (renamed from target/tools/uboot-mkimage/mkimage.c) | 0 |
8 files changed, 13 insertions, 6 deletions
diff --git a/mk/kernel-vars.mk b/mk/kernel-vars.mk index e726b14da..4d302fc57 100644 --- a/mk/kernel-vars.mk +++ b/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}" diff --git a/target/tools/uboot-mkimage/Makefile b/target/tools/uboot-mkimage/Makefile deleted file mode 100644 index e93964ff2..000000000 --- a/target/tools/uboot-mkimage/Makefile +++ /dev/null @@ -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 diff --git a/tools/Makefile b/tools/Makefile index 8bf118641..e4e0b249b 100644 --- a/tools/Makefile +++ b/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)) diff --git a/tools/mkimage/Makefile b/tools/mkimage/Makefile new file mode 100644 index 000000000..426b18b88 --- /dev/null +++ b/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 diff --git a/target/tools/uboot-mkimage/crc32.c b/tools/mkimage/crc32.c index 067b3106c..067b3106c 100644 --- a/target/tools/uboot-mkimage/crc32.c +++ b/tools/mkimage/crc32.c diff --git a/target/tools/uboot-mkimage/image.h b/tools/mkimage/image.h index cb62cde5b..cb62cde5b 100644 --- a/target/tools/uboot-mkimage/image.h +++ b/tools/mkimage/image.h diff --git a/target/tools/uboot-mkimage/mkimage b/tools/mkimage/mkimage Binary files differindex 87ed9a473..87ed9a473 100755 --- a/target/tools/uboot-mkimage/mkimage +++ b/tools/mkimage/mkimage diff --git a/target/tools/uboot-mkimage/mkimage.c b/tools/mkimage/mkimage.c index 7c0432bad..7c0432bad 100644 --- a/target/tools/uboot-mkimage/mkimage.c +++ b/tools/mkimage/mkimage.c |