diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-08-24 00:23:57 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-08-24 00:24:32 +0200 |
| commit | 07d73ebe33e5c3edf1ae2974d02931401c740588 (patch) | |
| tree | 5a473092b100c4a5d79dee8f3d0f4b90a06f774e | |
| parent | a039013174a6bb6a35ac06ec031d54fa9ca973f5 (diff) | |
fix disk boot for qemu-system-aarch64
| -rw-r--r-- | target/aarch64/Makefile | 12 | ||||
| -rw-r--r-- | target/config/Config.in.qemuopts | 4 |
2 files changed, 12 insertions, 4 deletions
diff --git a/target/aarch64/Makefile b/target/aarch64/Makefile index a423be3f2..f93987f5c 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 diff --git a/target/config/Config.in.qemuopts b/target/config/Config.in.qemuopts index da389101b..55ea6bcbb 100644 --- a/target/config/Config.in.qemuopts +++ b/target/config/Config.in.qemuopts @@ -29,7 +29,7 @@ endchoice choice prompt "Qemu Emulation with storage device" -depends on ADK_TARGET_QEMU && !ADK_TARGET_SYSTEM_QEMU_XTENSA +depends on ADK_TARGET_QEMU && !ADK_TARGET_SYSTEM_QEMU_XTENSA && !ADK_TARGET_SYSTEM_QEMU_AARCH64 default ADK_TARGET_QEMU_WITH_BLOCK if ADK_TARGET_ROOTFS_ARCHIVE default ADK_TARGET_QEMU_WITH_BLOCK if ADK_TARGET_ROOTFS_SQUASHFS default ADK_TARGET_QEMU_WITH_BLOCK if ADK_TARGET_ROOTFS_JFFS2 @@ -110,6 +110,4 @@ config ADK_TARGET_QEMU_WITH_AUDIO boolean "enabled" endchoice - - endmenu |