summaryrefslogtreecommitdiff
path: root/target/alpha
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2017-06-18 19:06:18 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2017-06-18 19:07:08 +0200
commit30780da8a5b800db825b4fd72c715ca2d8203bd7 (patch)
treeadc35da8af22ee6a92ff1ae9bf1e7c9d6da003f4 /target/alpha
parent1dd518b0f86f96c36d582e5f5c9f78b5c65131e9 (diff)
qemu-alpha: add disk support
Diffstat (limited to 'target/alpha')
-rw-r--r--target/alpha/Makefile6
-rw-r--r--target/alpha/kernel/qemu-alpha3
2 files changed, 6 insertions, 3 deletions
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