fix qemu spitz emulation, add emulation for terrier

5 files changed, 25 insertions, 10 deletions

diff --git a/target/config/Config.in.kernel b/target/config/Config.in.kernel
index cd1007a91..15edab364 100644
--- a/target/config/Config.in.kernel
+++ b/target/config/Config.in.kernel
@@ -37,6 +37,7 @@ config ADK_TARGET_KERNEL_MINICONFIG
 	default "qemu-arm-versatilepb" if ADK_TARGET_QEMU_ARM_MODEL_VERSATILEPB
 	default "qemu-arm-vexpress-a9" if ADK_TARGET_QEMU_ARM_MODEL_VEXPRESS_A9
 	default "qemu-arm-spitz" if ADK_TARGET_QEMU_ARM_MODEL_SPITZ
+	default "qemu-arm-terrier" if ADK_TARGET_QEMU_ARM_MODEL_TERRIER
 	default "qemu-mips" if ADK_TARGET_SYSTEM_QEMU_MIPS
 	default "qemu-mips64" if ADK_TARGET_SYSTEM_QEMU_MIPS64
 	default "qemu-ppc" if ADK_TARGET_SYSTEM_QEMU_PPC
diff --git a/target/config/Config.in.qemu b/target/config/Config.in.qemu
index b4593f2f4..ae4a02a05 100644
--- a/target/config/Config.in.qemu
+++ b/target/config/Config.in.qemu
@@ -28,12 +28,20 @@ config ADK_TARGET_QEMU_ARM_MODEL_VERSATILEPB
 	select ADK_CPU_ARM926EJ_S
 	depends on ADK_TARGET_ARM_SOFT_FLOAT
 
+config ADK_TARGET_QEMU_ARM_MODEL_TERRIER
+	boolean "Xscale PXA270 Terrier PDA"
+	select ADK_soft_float
+	select ADK_eabi
+	select ADK_CPU_XSCALE
+	select ADK_TARGET_QEMU_WITH_GRAPHIC_ONLY
+	depends on ADK_TARGET_ARM_SOFT_FLOAT
+
 config ADK_TARGET_QEMU_ARM_MODEL_SPITZ
 	boolean "Xscale PXA270 Spitz PDA"
 	select ADK_soft_float
 	select ADK_eabi
 	select ADK_CPU_XSCALE
-	select ADK_TARGET_QEMU_WITH_GRAPHIC
+	select ADK_TARGET_QEMU_WITH_GRAPHIC_ONLY
 	depends on ADK_TARGET_ARM_SOFT_FLOAT
 
 endchoice
diff --git a/target/config/Config.in.qemuopts b/target/config/Config.in.qemuopts
index d1dcca976..f6438ccd6 100644
--- a/target/config/Config.in.qemuopts
+++ b/target/config/Config.in.qemuopts
@@ -7,8 +7,13 @@ depends on ADK_TARGET_QEMU
 config ADK_QEMU_ARGS
 	string
 	default "" if ADK_TARGET_QEMU_WITH_GRAPHIC
+	default "" if ADK_TARGET_QEMU_WITH_GRAPHIC_ONLY
 	default "-nographic"
 
+config ADK_TARGET_QEMU_WITH_GRAPHIC_ONLY
+	boolean
+	depends on ADK_TARGET_QEMU_ARM_MODEL_SPITZ || ADK_TARGET_QEMU_ARM_MODEL_TERRIER
+
 choice 
 prompt "Use a Bootloader"
 depends on ADK_TARGET_SYSTEM_QEMU_X86_64 || ADK_TARGET_SYSTEM_QEMU_X86
@@ -46,8 +51,7 @@ endchoice
 
 choice
 prompt "Qemu Emulation with graphical output"
-depends on ADK_TARGET_SYSTEM_QEMU_X86_64 || ADK_TARGET_SYSTEM_QEMU_X86 || ADK_TARGET_QEMU_ARM_MODEL_SPITZ || ADK_TARGET_SYSTEM_QEMU_SH4
-default ADK_TARGET_QEMU_WITH_GRAPHIC if ADK_TARGET_QEMU_ARM_MODEL_SPITZ
+depends on ADK_TARGET_SYSTEM_QEMU_X86_64 || ADK_TARGET_SYSTEM_QEMU_X86 || ADK_TARGET_SYSTEM_QEMU_SH4
 
 config ADK_TARGET_QEMU_WITHOUT_GRAPHIC
 	boolean "disabled"
@@ -62,7 +66,6 @@ config ADK_TARGET_QEMU_WITH_GRAPHIC
 	select ADK_KERNEL_FRAMEBUFFER_CONSOLE
 	select ADK_KERNEL_FB_SM501 if ADK_TARGET_SYSTEM_QEMU_SH4
 	select ADK_KERNEL_FB_CIRRUS if ADK_TARGET_SYSTEM_QEMU_X86 || ADK_TARGET_SYSTEM_QEMU_X86_64
-	select ADK_KERNEL_FB_PXA if ADK_TARGET_QEMU_ARM_MODEL_SPITZ
 	select ADK_KERNEL_INPUT
 	select ADK_KERNEL_INPUT_KEYBOARD
 	select ADK_KERNEL_KEYBOARD_ATKBD if ADK_TARGET_SYSTEM_QEMU_X86 || ADK_TARGET_SYSTEM_QEMU_X86_64
diff --git a/target/config/Config.in.runtime b/target/config/Config.in.runtime
index fdcc3fa6b..29ec49b2e 100644
--- a/target/config/Config.in.runtime
+++ b/target/config/Config.in.runtime
@@ -56,11 +56,11 @@ config ADK_QUIET_KERNEL
 
 choice
 prompt "bootup messages from initscripts"
-default ADK_RUNTIME_VERBOSE_INIT_VGA if ADK_TARGET_WITH_VGA
+default ADK_RUNTIME_VERBOSE_INIT_VGA if ADK_TARGET_WITH_VGA || ADK_TARGET_QEMU_WITH_GRAPHIC || ADK_TARGET_QEMU_WITH_GRAPHIC_ONLY
 default ADK_RUNTIME_VERBOSE_INIT_SERIAL
 
 config ADK_RUNTIME_VERBOSE_INIT_VGA
-	depends on ADK_TARGET_WITH_VGA
+	depends on ADK_TARGET_WITH_VGA || ADK_TARGET_QEMU_WITH_GRAPHIC || ADK_TARGET_QEMU_WITH_GRAPHIC_ONLY
 	boolean "output via VGA"
 
 config ADK_RUNTIME_VERBOSE_INIT_SERIAL
@@ -91,6 +91,7 @@ endchoice
 config ADK_RUNTIME_GETTY_VGA
 	boolean "start getty on VGA console (tty1-tty6)"
 	depends on ADK_RUNTIME_GETTY
+	default y if ADK_TARGET_QEMU_WITH_GRAPHIC_ONLY
 	default y if ADK_TARGET_QEMU_WITH_GRAPHIC
 	default y if ADK_TARGET_SYSTEM_RASPBERRY_PI
 	default y if ADK_TARGET_SYSTEM_CUBOX_I
@@ -104,6 +105,8 @@ config ADK_RUNTIME_GETTY_VGA
 config ADK_RUNTIME_GETTY_SERIAL
 	boolean "start getty on serial console"
 	depends on ADK_RUNTIME_GETTY
+	default n if ADK_TARGET_QEMU_WITH_GRAPHIC_ONLY
+	default n if ADK_TARGET_QEMU_WITH_GRAPHIC
 	default n if ADK_TARGET_SYSTEM_RASPBERRY_PI
 	default n if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
 	default n if ADK_TARGET_SYSTEM_IBM_X40
diff --git a/target/config/Config.in.target b/target/config/Config.in.target
index 4742f9226..433542235 100644
--- a/target/config/Config.in.target
+++ b/target/config/Config.in.target
@@ -47,7 +47,7 @@ config ADK_TARGET_CMDLINE
 	default "console=ttyS0,38400" if ADK_TARGET_SYSTEM_PCENGINES_WRAP
 	default "console=ttyS0,115200 console=tty0 geodewdt.nowayout=1" if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C
 	default "console=ttyS0,115200 console=tty0" if ADK_TARGET_SYSTEM_VBOX_I686
-	default "console=ttyS0,115200" if ADK_TARGET_QEMU_ARM_MODEL_SPITZ
+	default "console=tty0" if ADK_TARGET_QEMU_ARM_MODEL_SPITZ || ADK_TARGET_QEMU_ARM_MODEL_TERRIER
 	default "console=ttyAMA0" if ADK_TARGET_QEMU_ARM_MODEL_VERSATILEPB
 	default "console=ttyAMA0" if ADK_TARGET_QEMU_ARM_MODEL_VEXPRESS_A9
 	default "console=ttyUL0" if ADK_TARGET_QEMU_MICROBLAZE_MODEL_S3ADSP1800
@@ -109,7 +109,7 @@ config ADK_TARGET_ROOTFS_SQUASHFS
 	select ADK_HOST_NEED_SQUASHFS
 	select ADK_HOST_NEED_QEMU if ADK_TARGET_QEMU
 	select ADK_TARGET_QEMU_WITH_BLOCK if ADK_TARGET_QEMU
-	depends on ADK_TARGET_WITH_MTD
+	depends on ADK_TARGET_WITH_MTD || ADK_TARGET_SYSTEM_QEMU_MICROBLAZE
 	help
 	  highly compressed read-only filesystem for MTD flash systems.
 
@@ -118,7 +118,7 @@ config ADK_TARGET_ROOTFS_JFFS2
 	select ADK_KERNEL_JFFS2_FS
 	select ADK_HOST_NEED_MTD_UTILS
 	select ADK_TARGET_QEMU_WITH_BLOCK if ADK_TARGET_QEMU
-	depends on ADK_TARGET_WITH_MTD
+	depends on ADK_TARGET_WITH_MTD || ADK_TARGET_SYSTEM_QEMU_MICROBLAZE
 	help
 	  compressed read-write filesystem for MTD flash systems.
 
@@ -128,8 +128,8 @@ config ADK_TARGET_ROOTFS_YAFFS
 	select ADK_KERNEL_YAFFS_FS
 	select ADK_KERNEL_YAFFS_YAFFS2
 	select ADK_KERNEL_YAFFS_AUTO_YAFFS2
-	depends on ADK_TARGET_WITH_NAND
 	select ADK_KERNEL_ADDON_YAFFS2
+	depends on ADK_TARGET_WITH_NAND
 	help
 	  Root filesystem on NAND flash with YAFFS2.