From 30780da8a5b800db825b4fd72c715ca2d8203bd7 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sun, 18 Jun 2017 19:06:18 +0200
Subject: qemu-alpha: add disk support

---
 target/alpha/Makefile          | 6 +++++-
 target/alpha/kernel/qemu-alpha | 3 +--
 2 files changed, 6 insertions(+), 3 deletions(-)

(limited to 'target/alpha')

diff --git a/target/alpha/Makefile b/target/alpha/Makefile
index f80cdec38..2d58e8014 100644
--- a/target/alpha/Makefile
+++ b/target/alpha/Makefile
@@ -10,6 +10,10 @@ KERNEL:=$(LINUX_DIR)/vmlinux
 QEMU_ARGS:=-monitor null
 QEMU_ARGS+=${ADK_QEMU_ARGS}
 
+ifeq ($(ADK_TARGET_QEMU_WITH_BLOCK),y)
+QEMU_ARGS+=-drive file=qemu-alpha.img,format=raw -append "root=/dev/hda1"
+endif
+
 # target helper text
 ifeq ($(ADK_TARGET_FS),archive)
 targethelp:
@@ -19,7 +23,7 @@ ifeq ($(ADK_TARGET_QEMU),y)
 	@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'
+	@echo 'qemu-system-${ADK_TARGET_CPU_ARCH} ${QEMU_ARGS} -kernel $(FW_DIR)/$(TARGET_KERNEL)'
 endif
 endif
 ifeq ($(ADK_TARGET_FS),initramfs)
diff --git a/target/alpha/kernel/qemu-alpha b/target/alpha/kernel/qemu-alpha
index e0f3d0822..ddf62d2fb 100644
--- a/target/alpha/kernel/qemu-alpha
+++ b/target/alpha/kernel/qemu-alpha
@@ -1,6 +1,5 @@
 CONFIG_ALPHA=y
 CONFIG_ALPHA_DP264=y
+CONFIG_ALPHA_QEMU=y
 CONFIG_ISA=y
 CONFIG_ISA_DMA_API=y
-CONFIG_SERIAL_8250=y
-CONFIG_SERIAL_8250_CONSOLE=y
-- 
cgit v1.2.3