summaryrefslogtreecommitdiff
path: root/target/arm/Makefile
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2014-02-27 11:21:30 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2014-02-27 11:21:30 +0100
commitfe967bd0b07b9c17a99cc8b31a756d8438a49117 (patch)
tree6363afe246244dd0939fc3c706e9831b3f4d2a83 /target/arm/Makefile
parentef35660027f4556d65f27da7cfe4f3150011f0d1 (diff)
parent9a9fd1b6c5b7b15e6df4848df4ba85d0b3f40ee2 (diff)
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'target/arm/Makefile')
-rw-r--r--target/arm/Makefile12
1 files changed, 10 insertions, 2 deletions
diff --git a/target/arm/Makefile b/target/arm/Makefile
index 080ac4f57..4e07cd664 100644
--- a/target/arm/Makefile
+++ b/target/arm/Makefile
@@ -18,9 +18,13 @@ LOADADDR:=0x20008000
ifeq ($(ADK_TARGET_QEMU_ARM_MODEL_SPITZ),y)
MACH:=spitz
endif
-ifeq ($(ADK_TARGET_QEMU_ARM_MODEL_VERSATILE),y)
+ifeq ($(ADK_TARGET_QEMU_ARM_MODEL_VERSATILEPB),y)
MACH:=versatilepb
-NET:=-net user,hostfwd=tcp::2222-:22 -net nic,model=smc91c111
+NET:=-net user -net nic,model=smc91c111
+endif
+ifeq ($(ADK_TARGET_QEMU_ARM_MODEL_VEXPRESS_A9),y)
+MACH:=vexpress-a9
+NET:=-cpu cortex-a9 -device lan9118,netdev=adk0 -netdev user,id=adk0
endif
kernel-install:
@@ -72,10 +76,14 @@ imageinstall: $(FW_DIR)/$(INITRAMFS)
@echo 'The kernel file is: $(FW_DIR)/${TARGET_KERNEL}'
@echo 'The initramfs image is: ${FW_DIR}/${INITRAMFS}'
ifeq ($(ADK_TARGET_SYSTEM_QEMU_ARM),y)
+ifeq ($(ADK_TARGET_QEMU_WITH_VIRTIO),y)
+ @echo 'qemu-system-arm -nographic -kernel $(FW_DIR)/$(TARGET_KERNEL) -drive file=qemu-${CPU_ARCH}.img,if=virtio,index=0 -net nic,model=virtio -net user'
+else
@echo "Start qemu with following command line:"
@echo 'qemu-system-arm -M $(MACH) -nographic $(NET) -kernel $(FW_DIR)/$(TARGET_KERNEL) -initrd ${FW_DIR}/${INITRAMFS}'
endif
endif
+endif
ifeq ($(ADK_TARGET_FS),initramfs-piggyback)
imageinstall: createinitramfs
@cp $(KERNEL) $(FW_DIR)/$(TARGET_KERNEL)