diff options
Diffstat (limited to 'target/microblaze/Makefile')
| -rw-r--r-- | target/microblaze/Makefile | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/target/microblaze/Makefile b/target/microblaze/Makefile index 7a411aa95..e9a4a517d 100644 --- a/target/microblaze/Makefile +++ b/target/microblaze/Makefile @@ -9,11 +9,6 @@ include $(TOPDIR)/mk/image.mk KERNEL:=$(LINUX_DIR)/arch/microblaze/boot/$(ADK_TARGET_KERNEL) -tools-compile: - $(MAKE) -C ../tools/mtd-utils all - $(MAKE) -C ../tools/xz all - $(MAKE) -C ../tools/squashfs all - ifeq ($(ADK_TARGET_QEMU_MICROBLAZE_MODEL_ML605),y) MODEL:=petalogix-ml605 DTB:=-dtb target/microblaze/ml605.dtb @@ -24,21 +19,21 @@ DTB:= endif ifeq ($(ADK_TARGET_FS),squashfs) -imageinstall: tools-compile $(BUILD_DIR)/root.squashfs +imageinstall: $(BUILD_DIR)/root.squashfs qemu-img create -f raw $(FW_DIR)/$(ROOTFSSQUASHFS) $(ADK_TARGET_MTD_SIZE) dd conv=notrunc if=$(BUILD_DIR)/root.squashfs of=$(FW_DIR)/$(ROOTFSSQUASHFS) @cp $(KERNEL) $(FW_DIR)/$(TARGET_KERNEL) ifneq ($(ADK_HARDWARE_QEMU),) @echo "Start qemu with following options:" - @echo 'qemu-system-${CPU_ARCH} $(DTB) -M $(MODEL) -nographic -kernel $(FW_DIR)/$(TARGET_KERNEL) -pflash $(FW_DIR)/$(ROOTFSSQUASHFS)' + @echo 'qemu-system-${CPU_ARCH} -M $(MODEL) -nographic -kernel $(FW_DIR)/$(TARGET_KERNEL) -pflash $(FW_DIR)/$(ROOTFSSQUASHFS) $(DTB)' endif endif ifeq ($(ADK_TARGET_FS),jffs2) -imageinstall: tools-compile $(FW_DIR)/$(ROOTFSJFFS2) +imageinstall: $(FW_DIR)/$(ROOTFSJFFS2) @cp $(KERNEL) $(FW_DIR)/$(TARGET_KERNEL) ifneq ($(ADK_HARDWARE_QEMU),) @echo "Start qemu with following options:" - @echo 'qemu-system-${CPU_ARCH} $(DTB) -M $(MODEL) -nographic -kernel $(FW_DIR)/$(TARGET_KERNEL) -pflash $(FW_DIR)/$(ROOTFSJFFS2)' + @echo 'qemu-system-${CPU_ARCH} -M $(MODEL) -nographic -kernel $(FW_DIR)/$(TARGET_KERNEL) -pflash $(FW_DIR)/$(ROOTFSJFFS2) $(DTB)' endif endif ifeq ($(ADK_TARGET_FS),initramfs) @@ -48,7 +43,7 @@ imageinstall: $(FW_DIR)/$(INITRAMFS) @echo 'The initramfs image is: ${FW_DIR}/${INITRAMFS}' ifneq ($(ADK_HARDWARE_QEMU),) @echo "Start qemu with following command line:" - @echo 'qemu-system-${CPU_ARCH} $(DTB) -M $(MODEL) -nographic -kernel $(FW_DIR)/$(TARGET_KERNEL) -initrd ${FW_DIR}/${INITRAMFS}' + @echo 'qemu-system-${CPU_ARCH} -M $(MODEL) -nographic -kernel $(FW_DIR)/$(TARGET_KERNEL) -initrd ${FW_DIR}/${INITRAMFS} $(DTB)' endif endif ifeq ($(ADK_TARGET_FS),initramfs-piggyback) @@ -57,6 +52,6 @@ imageinstall: createinitramfs @echo 'The kernel+initramfs file is: $(FW_DIR)/${TARGET_KERNEL}' ifneq ($(ADK_HARDWARE_QEMU),) @echo "Start qemu with following command line:" - @echo 'qemu-system-${CPU_ARCH} $(DTB) -M $(MODEL) -nographic -kernel $(FW_DIR)/$(TARGET_KERNEL)' + @echo 'qemu-system-${CPU_ARCH} -M $(MODEL) -nographic -kernel $(FW_DIR)/$(TARGET_KERNEL) $(DTB)' endif endif |