Merge branch 'master' of git+ssh://openadk.org/git/openadk

4 files changed, 31 insertions, 6 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 a302bedab..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
@@ -45,6 +45,7 @@ config ADK_TARGET_QEMU_WITH_BLOCK
 	select ADK_KERNEL_PATA_MACIO if ADK_TARGET_SYSTEM_QEMU_PPC
 	select ADK_KERNEL_SCSI_IBMVSCSI if ADK_TARGET_SYSTEM_QEMU_PPC64
 	select ADK_KERNEL_SCSI_SUNESP if ADK_TARGET_SYSTEM_QEMU_SPARC
+	select ADK_KERNEL_PATA_CMD64X if ADK_TARGET_SYSTEM_QEMU_SPARC64
 	select ADK_KERNEL_PATA_PLATFORM if ADK_TARGET_SYSTEM_QEMU_SH
 	select ADK_KERNEL_PATA_PXA if ADK_TARGET_QEMU_ARM_MODEL_SPITZ || ADK_TARGET_QEMU_ARM_MODEL_TERRIER
 
@@ -84,7 +85,6 @@ depends on ADK_TARGET_SYSTEM_QEMU_SPARC64 || \
 		ADK_TARGET_SYSTEM_QEMU_AARCH64 || \
 		ADK_TARGET_SYSTEM_QEMU_X86 || \
 		ADK_TARGET_SYSTEM_QEMU_X86_64
-default ADK_TARGET_QEMU_WITH_VIRTIO if ADK_TARGET_SYSTEM_QEMU_SPARC64
 default ADK_TARGET_QEMU_WITH_VIRTIO if ADK_TARGET_SYSTEM_QEMU_AARCH64
 
 config ADK_TARGET_QEMU_WITHOUT_VIRTIO
@@ -110,6 +110,4 @@ config ADK_TARGET_QEMU_WITH_AUDIO
 	boolean "enabled"
 
 endchoice
-
-
 endmenu
diff --git a/target/linux/config/Config.in.block b/target/linux/config/Config.in.block
index cfe24f9ef..63d8a03db 100644
--- a/target/linux/config/Config.in.block
+++ b/target/linux/config/Config.in.block
@@ -216,6 +216,22 @@ config ADK_KERNEL_PATA_IMX
 	depends on ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
 	default y if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
 	default n
+	help
+	  eSATA driver for cubox-i
+
+config ADK_KERNEL_PATA_CMD64X
+	prompt "CMD64x PATA driver"
+	tristate
+	select ADK_KERNEL_SCSI
+	select ADK_KERNEL_ATA
+	select ADK_KERNEL_ATA_SFF
+	select ADK_KERNEL_ATA_BMDMA
+	select ADK_KERNEL_BLK_DEV
+	select ADK_KERNEL_BLK_DEV_SD
+	depends on ADK_TARGET_SYSTEM_QEMU_SPARC64
+	default n
+	help
+	  Driver for CMD64x chipsets.
 
 config ADK_KERNEL_PATA_PXA
 	prompt "PATA driver for Sharp Zaurus"
diff --git a/target/linux/config/Config.in.ethernet b/target/linux/config/Config.in.ethernet
index 982d1cd76..84474ba33 100644
--- a/target/linux/config/Config.in.ethernet
+++ b/target/linux/config/Config.in.ethernet
@@ -154,7 +154,8 @@ config ADK_KERNEL_NE2K_PCI
 	select ADK_KERNEL_NET_VENDOR_NATSEMI
 	select ADK_KERNEL_NET_VENDOR_8390
 	select ADK_KERNEL_MII
-	depends on ADK_TARGET_WITH_PCI
+	depends on ADK_TARGET_WITH_PCI || ADK_TARGET_SYSTEM_QEMU_SPARC64
+	default y if ADK_TARGET_SYSTEM_QEMU_SPARC64
 	default n
 	help
 	  NE2000 PCI driver