summaryrefslogtreecommitdiff
path: root/target/aarch64
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2014-08-23 22:23:57 (GMT)
committerWaldemar Brodkorb <wbx@openadk.org>2014-08-23 22:24:32 (GMT)
commit07d73ebe33e5c3edf1ae2974d02931401c740588 (patch)
tree5a473092b100c4a5d79dee8f3d0f4b90a06f774e /target/aarch64
parenta039013174a6bb6a35ac06ec031d54fa9ca973f5 (diff)
fix disk boot for qemu-system-aarch64
Diffstat (limited to 'target/aarch64')
-rw-r--r--target/aarch64/Makefile12
1 files changed, 11 insertions, 1 deletions
diff --git a/target/aarch64/Makefile b/target/aarch64/Makefile
index a423be3..f93987f 100644
--- a/target/aarch64/Makefile
+++ b/target/aarch64/Makefile
@@ -15,13 +15,20 @@ ifeq ($(ADK_TARGET_QEMU_WITH_VIRTIO),y)
QEMU_ARGS+=-netdev user,id=eth0 -device virtio-net-device,netdev=eth0
endif
ifeq ($(ADK_TARGET_FS),archive)
-QEMU_ARGS+=-drive file=qemu-${ADK_TARGET_CPU_ARCH}.img,if=virtio,index=0
+QEMU_ARGS+=-device virtio-blk-device,drive=vda -drive file=qemu-${ADK_TARGET_CPU_ARCH}.img,if=none,id=vda
endif
# target helper text
ifeq ($(ADK_TARGET_FS),archive)
targethelp:
@echo "The RootFS tarball is: $(FW_DIR)/$(ROOTFSTARBALL)"
+ifeq ($(ADK_TARGET_QEMU),y)
+ @echo 'The kernel file is: $(FW_DIR)/${TARGET_KERNEL}'
+ @echo "Use following command to create a QEMU Image:"
+ @echo "./scripts/create.sh qemu-${ADK_TARGET_CPU_ARCH}.img $(FW_DIR)/$(ROOTFSTARBALL)"
+ @echo "Start qemu with following options:"
+ @echo 'qemu-system-${ADK_TARGET_CPU_ARCH} ${QEMU_ARGS} -kernel $(FW_DIR)/$(TARGET_KERNEL) qemu-${ADK_TARGET_CPU_ARCH}.img'
+endif
endif
ifeq ($(ADK_TARGET_FS),initramfs)
targethelp:
@@ -51,6 +58,7 @@ endif
endif
kernel-strip:
+ @cp $(KERNEL) $(BUILD_DIR)/$(TARGET_KERNEL)
kernel-install: kernel-strip
ifeq ($(ADK_TARGET_SYSTEM_ARM_FM),y)
@@ -62,6 +70,8 @@ ifeq ($(ADK_TARGET_SYSTEM_ARM_FM),y)
-C package/boot-wrapper-aarch64 package
${CP} ${LINUX_DIR}/linux-system.axf \
$(FW_DIR)/$(TARGET_KERNEL)
+else
+ @cp $(BUILD_DIR)/$(TARGET_KERNEL) $(FW_DIR)/$(TARGET_KERNEL)
endif
# filesystem specific targets