diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-06-28 10:38:59 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-06-28 10:38:59 +0200 |
| commit | e9e7c5715ae2cb168dfe56192a3a1d5aacc70b23 (patch) | |
| tree | 25656fc11aa2d35418a76114f8d82262e9536bad /target/wag54g | |
| parent | 1143ead360fb043f43388d727e710f358702bc9a (diff) | |
fix busybox rebuild issue, simplify target Makefiles
Diffstat (limited to 'target/wag54g')
| -rw-r--r-- | target/wag54g/Makefile | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/target/wag54g/Makefile b/target/wag54g/Makefile index 44ce7734f..78f88111c 100644 --- a/target/wag54g/Makefile +++ b/target/wag54g/Makefile @@ -13,7 +13,7 @@ $(TOOLS_BUILD_DIR): tools-compile: $(TOOLS_BUILD_DIR) $(MAKE) -C tools/addpattern $(MAKE) -C tools/srec2bin - $(MAKE) -C tools/squashfs prepare compile install + $(MAKE) -C ../tools/squashfs prepare compile install kernel-install: tools-compile PATH='${TARGET_PATH}' \ @@ -28,25 +28,20 @@ kernel-install: tools-compile -o $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel ifeq ($(FS),squashfs) -imageinstall: $(BIN_DIR)/$(ROOTFSSQUASHFS) +imageinstall: kernel-install $(BIN_DIR)/$(ROOTFSSQUASHFS) ${CP} ${BUILD_DIR}/${ROOTFSSQUASHFS} $(BIN_DIR)/$(ROOTFSSQUASHFS) - @echo @echo The image file is $(ROOTFSSQUASHFS) @echo 'You can flash the image via tftp:' @echo 'tftp 192.168.1.1' @echo 'tftp> binary' @echo "tftp> put $(ROOTFSSQUASHFS) upgrade_code.bin" - @echo 'Login as user root with password linux123 via ssh or console' endif - ifeq ($(FS),nfsroot) -imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL) - @echo +imageinstall: kernel-install $(BIN_DIR)/$(ROOTFSTARBALL) @echo 'The kernel file is: ${BIN_DIR}/${ADK_TARGET}-${FS}-kernel' @echo 'The nfs root tarball is: ${BIN_DIR}/${ROOTFSTARBALL}' @echo 'You can flash the kernel via tftp:' @echo 'tftp 192.168.1.1' @echo 'tftp> binary' @echo 'tftp> put ${ADK_TARGET}-${FS}-kernel upgrade_code.bin' - @echo 'Login as user root with password linux123 via ssh or console' endif |