summaryrefslogtreecommitdiff
path: root/target/mips/Makefile
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2014-05-23 16:39:17 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2014-05-23 16:39:17 +0200
commit2735fdf97305e110eba8e776f8728a52ae886c05 (patch)
tree0ce26ce1066bd7260625ca641b1e64c99015f47f /target/mips/Makefile
parent65c2ab93616bdf982152a94ab35c2079a5e3a2d7 (diff)
resolve merge conflict
Diffstat (limited to 'target/mips/Makefile')
-rw-r--r--target/mips/Makefile17
1 files changed, 1 insertions, 16 deletions
diff --git a/target/mips/Makefile b/target/mips/Makefile
index cdb5b7f8a..5c9f7f5fc 100644
--- a/target/mips/Makefile
+++ b/target/mips/Makefile
@@ -25,11 +25,6 @@ ifeq ($(ADK_HARDWARE_QEMU),y)
@echo "Start qemu with following options:"
@echo 'qemu-system-${CPU_ARCH} ${QEMU_ARGS} -kernel $(FW_DIR)/$(TARGET_KERNEL) qemu-${CPU_ARCH}.img'
endif
-ifeq ($(ADK_TARGET_SYSTEM_LEMOTE_YEELONG),y)
- @echo "Startup the Lemote Yeelong and type del to enter PMON:"
- @echo "PMON> load /dev/fs/ext2@wd0a/boot/kernel"
- @echo "PMON> g root=/dev/sda1"
-endif
ifeq ($(ADK_TARGET_SYSTEM_MIKROTIK_RB532),y)
@echo "Use following command to install it on CF card:"
@echo "sudo ./scripts/install-rb532.sh /dev/sdX $(FW_DIR)/$(ROOTFSTARBALL)"
@@ -93,14 +88,7 @@ kernel-strip:
kernel-install: kernel-strip
@cp $(BUILD_DIR)/$(TARGET_KERNEL) $(FW_DIR)/${TARGET_KERNEL}
endif
-ifeq ($(ADK_TARGET_SYSTEM_LEMOTE_YEELONG),y)
-kernel-strip:
- $(TARGET_CROSS)objcopy $(OSTRIP) -S $(KERNEL) $(BUILD_DIR)/$(TARGET_KERNEL)
-
-kernel-install: kernel-strip
- @cp $(BUILD_DIR)/$(TARGET_KERNEL) $(FW_DIR)/${TARGET_KERNEL}
-endif
-ifeq ($(ADK_HARDWARE_QEMU),y)
+ifeq ($(ADK_TARGET_QEMU),y)
kernel-strip:
$(TARGET_CROSS)objcopy $(OSTRIP) -S $(KERNEL) $(BUILD_DIR)/$(TARGET_KERNEL)
@@ -124,9 +112,6 @@ endif
ifeq ($(ADK_TARGET_FS),nfsroot)
imageinstall: kernel-install $(FW_DIR)/$(ROOTFSUSERTARBALL) targethelp
endif
-ifeq ($(ADK_TARGET_FS),usb)
-imageinstall: $(FW_DIR)/$(ROOTFSTARBALL) targethelp
-endif
ifeq ($(ADK_TARGET_FS),yaffs)
imageinstall: $(FW_DIR)/$(ROOTFSTARBALL) targethelp
endif