diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-08-29 05:13:22 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-08-29 05:13:22 +0200 |
| commit | 9a91d51f24b366181d1a953c84232871125c6666 (patch) | |
| tree | a1bb1400683406ed20cb9177698ec6c91ff6ad27 /target/mips/Makefile | |
| parent | a3f13b147ab6e48be91dedbe116411196f1448b0 (diff) | |
| parent | 83b06f4f07ae26ef02fd909f18288f43ed4c3c29 (diff) | |
resolve conflict
Diffstat (limited to 'target/mips/Makefile')
| -rw-r--r-- | target/mips/Makefile | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/target/mips/Makefile b/target/mips/Makefile index 00a3e8bdc..97533275a 100644 --- a/target/mips/Makefile +++ b/target/mips/Makefile @@ -98,6 +98,8 @@ imageinstall: kernel-install $(BIN_DIR)/$(ROOTFSTARBALL) endif ifeq ($(ADK_TARGET_FS),archive) imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL) + @cp $(KERNEL) $(BIN_DIR)/$(TARGET_KERNEL) + @echo 'The kernel file is: $(BIN_DIR)/${TARGET_KERNEL}' @echo "The RootFS tarball is: $(BIN_DIR)/$(ROOTFSTARBALL)" ifneq ($(ADK_HARDWARE_QEMU),) @echo "Use following command to create a QEMU Image:" @@ -152,12 +154,12 @@ imageinstall: kernel-install ${BUILD_DIR}/${ROOTFSSQUASHFS} echo The image file is $(ROOTFSSQUASHFS); \ fi ifeq ($(ADK_TARGET_SYSTEM_FON_FON2100),y) - echo The kernel file is $(TARGET_KERNEL) + echo The kernel file is $(TARGET_KERNEL) endif ifeq ($(ADK_TARGET_SYSTEM_BROADCOM_BCM47XX),y) - 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 'You can flash the image via tftp:' + echo 'tftp 192.168.1.1' + echo 'tftp> binary' + echo "tftp> put $(ROOTFSSQUASHFS) upgrade_code.bin" endif endif |