diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-01-18 18:10:19 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-01-18 18:10:19 +0100 |
| commit | 46b2bb3001ce838ba2483a08418587d8a027f3a9 (patch) | |
| tree | b2b618839b5afcc859fcb90556e6f199d9a9a10c /target/cris | |
| parent | 88d3e6d6c572143bd95a589a44e30bfefd616b88 (diff) | |
| parent | 902ee7e7b23751ca7a8264d36a837aa4aae12032 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'target/cris')
| -rw-r--r-- | target/cris/Makefile | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/target/cris/Makefile b/target/cris/Makefile index 1e072f78e..a0654575d 100644 --- a/target/cris/Makefile +++ b/target/cris/Makefile @@ -9,10 +9,7 @@ include $(TOPDIR)/mk/image.mk KERNEL:=$(LINUX_DIR)/arch/cris/boot/zImage -$(TOOLS_BUILD_DIR): - @mkdir -p $(TOOLS_BUILD_DIR) - -tools-compile: $(TOOLS_BUILD_DIR) +tools-compile: $(MAKE) -C ../tools/mkfimage ifneq ($(ADK_HOST_DARWIN),y) $(MAKE) -C ../tools/e100boot prepare compile install @@ -24,7 +21,7 @@ kernel-install: tools-compile PATH='${TARGET_PATH}' mkfimage $(KERNEL) $(BUILD_DIR)/$(TARGET_KERNEL) ifeq ($(ADK_TARGET_FS),squashfs) -imageinstall: kernel-install $(BIN_DIR)/$(ROOTFSSQUASHFS) +imageinstall: kernel-install $(BUILD_DIR)/$(ROOTFSSQUASHFS) dd if=${BUILD_DIR}/${ROOTFSSQUASHFS} of=${BIN_DIR}/${ROOTFSSQUASHFS} \ bs=4063232 conv=sync $(MAKE_TRACE) @if [ $$(stat --format=%s ${BIN_DIR}/${ROOTFSSQUASHFS}) -gt 4063232 ];then \ |