qemu: remove spitz/terrier support, obsolete by upstream

8 files changed, 2 insertions, 144 deletions

diff --git a/target/arm/Makefile b/target/arm/Makefile
index 9ce20ef4f..48343993a 100644
--- a/target/arm/Makefile
+++ b/target/arm/Makefile
@@ -23,12 +23,6 @@ QEMU_ARGS:=${ADK_QEMU_ARGS}
 ifeq ($(ADK_TARGET_SYSTEM_QEMU_ARM_XILINX_ZYNQ),y)
 QEMU_ARGS+=-M xilinx-zynq-a9 -dtb $(FW_DIR)/zynq-zc702.dtb -serial null -serial mon:stdio
 endif
-ifeq ($(ADK_TARGET_SYSTEM_QEMU_ARM_SPITZ),y)
-QEMU_ARGS+=-M spitz
-endif
-ifeq ($(ADK_TARGET_SYSTEM_QEMU_ARM_TERRIER),y)
-QEMU_ARGS+=-M terrier
-endif
 ifeq ($(ADK_TARGET_SYSTEM_QEMU_ARM_REALVIEW_EB_MPCORE),y)
 QEMU_ARGS+=-M realview-eb-mpcore -net user -net nic -dtb $(FW_DIR)/arm-realview-eb-11mp-ctrevb.dtb
 endif
@@ -50,7 +44,7 @@ ifeq ($(ADK_TARGET_FS),archive)
 targethelp:
 	@echo "#################################################"
 	@echo "The RootFS tarball is: $(FW_DIR)/$(ROOTFSTARBALL)"
-ifeq ($(ADK_TARGET_SYSTEM_QEMU_ARM_VEXPRESS_A9)$(ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB)$(ADK_TARGET_SYSTEM_QEMU_ARM_TERRIER)$(ADK_TARGET_SYSTEM_QEMU_ARM_SPITZ),y)
+ifeq ($(ADK_TARGET_SYSTEM_QEMU_ARM_VEXPRESS_A9)$(ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB),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)"
diff --git a/target/arm/kernel/qemu-arm-spitz b/target/arm/kernel/qemu-arm-spitz
deleted file mode 100644
index 09a1d76ff..000000000
--- a/target/arm/kernel/qemu-arm-spitz
+++ /dev/null
@@ -1,46 +0,0 @@
-CONFIG_ARM=y
-CONFIG_ARM_PATCH_PHYS_VIRT=y
-CONFIG_ARCH_PXA=y
-CONFIG_PXA_SHARPSL=y
-CONFIG_PXA_SHARPSL_DETECT_MACH_ID=y
-CONFIG_MACH_SPITZ=y
-CONFIG_PXA27x=y
-CONFIG_PXA_SHARP_Cxx00=y
-CONFIG_SHARPSL_PM=y
-CONFIG_SHARPSL_PM_MAX1111=y
-CONFIG_PXA_SSP=y
-CONFIG_PLAT_PXA=y
-CONFIG_CPU_XSCALE=y
-CONFIG_IWMMXT=y
-CONFIG_XSCALE_PMU=y
-CONFIG_MULTI_IRQ_HANDLER=y
-CONFIG_SHARP_PARAM=y
-CONFIG_SHARP_SCOOP=y
-CONFIG_ATAGS=y
-CONFIG_ATAGS_PROC=y
-CONFIG_I2C=y
-CONFIG_I2C_BOARDINFO=y
-CONFIG_I2C_PXA=y
-CONFIG_SPI=y
-CONFIG_SPI_MASTER=y
-CONFIG_SPI_PXA2XX_DMA=y
-CONFIG_SPI_PXA2XX=y
-CONFIG_GPIO_DEVRES=y
-CONFIG_GPIOLIB=y
-CONFIG_GPIO_PXA=y
-CONFIG_POWER_SUPPLY=y
-CONFIG_PDA_POWER=y
-CONFIG_APM_POWER=y
-CONFIG_SENSORS_MAX1111=y
-CONFIG_BACKLIGHT_LCD_SUPPORT=y
-CONFIG_LCD_CLASS_DEVICE=y
-CONFIG_LCD_CORGI=y
-CONFIG_BACKLIGHT_CLASS_DEVICE=y
-CONFIG_BACKLIGHT_GENERIC=y
-CONFIG_HID=y
-CONFIG_HID_GENERIC=y
-CONFIG_SERIAL_PXA=y
-CONFIG_SERIAL_PXA_NON8250=y
-CONFIG_SERIAL_PXA_CONSOLE=y
-CONFIG_SERIAL_CORE=y
-CONFIG_SERIAL_CORE_CONSOLE=y
diff --git a/target/arm/kernel/qemu-arm-terrier b/target/arm/kernel/qemu-arm-terrier
deleted file mode 100644
index e8a01e232..000000000
--- a/target/arm/kernel/qemu-arm-terrier
+++ /dev/null
@@ -1,46 +0,0 @@
-CONFIG_ARM=y
-CONFIG_ARM_PATCH_PHYS_VIRT=y
-CONFIG_ARCH_PXA=y
-CONFIG_PXA_SHARPSL=y
-CONFIG_PXA_SHARPSL_DETECT_MACH_ID=y
-CONFIG_MACH_BORZOI=y
-CONFIG_PXA27x=y
-CONFIG_PXA_SHARP_Cxx00=y
-CONFIG_SHARPSL_PM=y
-CONFIG_SHARPSL_PM_MAX1111=y
-CONFIG_PXA_SSP=y
-CONFIG_PLAT_PXA=y
-CONFIG_CPU_XSCALE=y
-CONFIG_IWMMXT=y
-CONFIG_XSCALE_PMU=y
-CONFIG_MULTI_IRQ_HANDLER=y
-CONFIG_SHARP_PARAM=y
-CONFIG_SHARP_SCOOP=y
-CONFIG_ATAGS=y
-CONFIG_ATAGS_PROC=y
-CONFIG_I2C=y
-CONFIG_I2C_BOARDINFO=y
-CONFIG_I2C_PXA=y
-CONFIG_SPI=y
-CONFIG_SPI_MASTER=y
-CONFIG_SPI_PXA2XX_DMA=y
-CONFIG_SPI_PXA2XX=y
-CONFIG_GPIO_DEVRES=y
-CONFIG_GPIOLIB=y
-CONFIG_GPIO_PXA=y
-CONFIG_POWER_SUPPLY=y
-CONFIG_PDA_POWER=y
-CONFIG_APM_POWER=y
-CONFIG_SENSORS_MAX1111=y
-CONFIG_BACKLIGHT_LCD_SUPPORT=y
-CONFIG_LCD_CLASS_DEVICE=y
-CONFIG_LCD_CORGI=y
-CONFIG_BACKLIGHT_CLASS_DEVICE=y
-CONFIG_BACKLIGHT_GENERIC=y
-CONFIG_HID=y
-CONFIG_HID_GENERIC=y
-CONFIG_SERIAL_PXA=y
-CONFIG_SERIAL_PXA_NON8250=y
-CONFIG_SERIAL_PXA_CONSOLE=y
-CONFIG_SERIAL_CORE=y
-CONFIG_SERIAL_CORE_CONSOLE=y
diff --git a/target/arm/systems/qemu-arm-spitz b/target/arm/systems/qemu-arm-spitz
deleted file mode 100644
index d97c5868e..000000000
--- a/target/arm/systems/qemu-arm-spitz
+++ /dev/null
@@ -1,11 +0,0 @@
-config ADK_TARGET_SYSTEM_QEMU_ARM_SPITZ
-	bool "Qemu Emulator (Spitz PDA)"
-	depends on ADK_TARGET_OS_LINUX
-	select ADK_TARGET_LITTLE_ENDIAN
-	select ADK_TARGET_CPU_ARM_XSCALE
-	select ADK_TARGET_QEMU
-	select ADK_TARGET_KERNEL_ZIMAGE
-	select ADK_TARGET_KERNEL_WITH_COMPRESSION
-	help
-	  Qemu Emulator for ARM architecture (Spitz PDA).
-
diff --git a/target/arm/systems/qemu-arm-terrier b/target/arm/systems/qemu-arm-terrier
deleted file mode 100644
index 2fe25fc0f..000000000
--- a/target/arm/systems/qemu-arm-terrier
+++ /dev/null
@@ -1,11 +0,0 @@
-config ADK_TARGET_SYSTEM_QEMU_ARM_TERRIER
-	bool "Qemu Emulator (Terrier PDA)"
-	depends on ADK_TARGET_OS_LINUX
-	select ADK_TARGET_LITTLE_ENDIAN
-	select ADK_TARGET_CPU_ARM_XSCALE
-	select ADK_TARGET_QEMU
-	select ADK_TARGET_KERNEL_ZIMAGE
-	select ADK_TARGET_KERNEL_WITH_COMPRESSION
-	help
-	  Qemu Emulator for ARM architecture (Terrier PDA).
-
diff --git a/target/config/Config.in.qemuopts b/target/config/Config.in.qemuopts
index 177fa6756..1e38fa7d7 100644
--- a/target/config/Config.in.qemuopts
+++ b/target/config/Config.in.qemuopts
@@ -4,14 +4,8 @@
 config ADK_QEMU_ARGS
 	string
 	default "-vga std" if ADK_TARGET_QEMU_WITH_GRAPHIC
-	default "" if ADK_TARGET_QEMU_WITH_GRAPHIC_ONLY
 	default "-nographic"
 
-config ADK_TARGET_QEMU_WITH_GRAPHIC_ONLY
-	bool
-	select ADK_TARGET_WITH_VGA
-	depends on ADK_TARGET_SYSTEM_QEMU_ARM_SPITZ || ADK_TARGET_SYSTEM_QEMU_ARM_TERRIER
-
 config ADK_TARGET_QEMU_WITH_BLOCK
 	bool
 	select ADK_TARGET_WITH_BLOCK
@@ -29,8 +23,6 @@ config ADK_TARGET_QEMU_WITH_BLOCK
 	select ADK_LINUX_KERNEL_SCSI_SUNESP if ADK_TARGET_SYSTEM_QEMU_SPARC
 	select ADK_LINUX_KERNEL_PATA_CMD64X if ADK_TARGET_SYSTEM_QEMU_SPARC64
 	select ADK_LINUX_KERNEL_PATA_PLATFORM if ADK_TARGET_SYSTEM_QEMU_SH
-	select ADK_LINUX_KERNEL_PATA_PXA if ADK_TARGET_QEMU_ARM_SPITZ \
-					|| ADK_TARGET_SYSTEM_QEMU_ARM_TERRIER
 	select ADK_LINUX_KERNEL_MMC_ARMMMCI if ADK_TARGET_SYSTEM_QEMU_ARM_VEXPRESS_A9
 	select ADK_LINUX_KERNEL_BLK_DEV_CMD64X if ADK_TARGET_SYSTEM_QEMU_ALPHA
 
diff --git a/target/linux/config/Config.in.graphics b/target/linux/config/Config.in.graphics
index 11e94db68..8d080b377 100644
--- a/target/linux/config/Config.in.graphics
+++ b/target/linux/config/Config.in.graphics
@@ -279,12 +279,8 @@ config ADK_LINUX_KERNEL_FB_PXA
 	select ADK_LINUX_KERNEL_DUMMY_CONSOLE
 	select ADK_LINUX_KERNEL_FRAMEBUFFER_CONSOLE
 	select ADK_LINUX_KERNEL_FRAMEBUFFER_CONSOLE_ROTATION
-	depends on ADK_TARGET_SYSTEM_SHARP_ZAURUS \
-		|| ADK_TARGET_SYSTEM_QEMU_ARM_TERRIER \
-		|| ADK_TARGET_SYSTEM_QEMU_ARM_SPITZ
+	depends on ADK_TARGET_SYSTEM_SHARP_ZAURUS
 	default y if ADK_TARGET_SYSTEM_SHARP_ZAURUS
-	default y if ADK_TARGET_SYSTEM_QEMU_ARM_TERRIER
-	default y if ADK_TARGET_SYSTEM_QEMU_ARM_SPITZ
  	default n
  	help
 	  Framebuffer support for Sharp Zaurus CL Series.
diff --git a/target/linux/config/Config.in.input b/target/linux/config/Config.in.input
index 7d4932e41..1342ccf8b 100644
--- a/target/linux/config/Config.in.input
+++ b/target/linux/config/Config.in.input
@@ -33,8 +33,6 @@ config ADK_LINUX_KERNEL_INPUT
 	default y if ADK_TARGET_SYSTEM_ARANYM_M68K
 	default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
 	default y if ADK_TARGET_SYSTEM_SHARP_ZAURUS
-	default y if ADK_TARGET_SYSTEM_QEMU_ARM_SPITZ
-	default y if ADK_TARGET_SYSTEM_QEMU_ARM_TERRIER
 	default y if ADK_TARGET_MODEL_PCENGINES_ALIX1C
 	default n
 
@@ -57,15 +55,11 @@ config ADK_LINUX_KERNEL_MOUSE_ATARI
 config ADK_LINUX_KERNEL_KEYBOARD_GPIO
 	bool
 	default y if ADK_TARGET_SYSTEM_SHARP_ZAURUS
-	default y if ADK_TARGET_SYSTEM_QEMU_ARM_SPITZ
-	default y if ADK_TARGET_SYSTEM_QEMU_ARM_TERRIER
 	default n
 
 config ADK_LINUX_KERNEL_KEYBOARD_MATRIX
 	bool
 	default y if ADK_TARGET_SYSTEM_SHARP_ZAURUS
-	default y if ADK_TARGET_SYSTEM_QEMU_ARM_SPITZ
-	default y if ADK_TARGET_SYSTEM_QEMU_ARM_TERRIER
 	default n
 
 config ADK_LINUX_KERNEL_INPUT_TOUCHSCREEN
@@ -82,8 +76,6 @@ config ADK_LINUX_KERNEL_INPUT_KEYBOARD
 	default y if ADK_TARGET_SYSTEM_ARANYM_M68K
 	default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
 	default y if ADK_TARGET_SYSTEM_SHARP_ZAURUS
-	default y if ADK_TARGET_SYSTEM_QEMU_ARM_SPITZ
-	default y if ADK_TARGET_SYSTEM_QEMU_ARM_TERRIER
 	default y if ADK_TARGET_MODEL_PCENGINES_ALIX1C
 	default n
 
@@ -92,8 +84,6 @@ config ADK_LINUX_KERNEL_INPUT_MOUSE
 	default y if ADK_TARGET_SYSTEM_ARANYM_M68K
 	default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
 	default y if ADK_TARGET_SYSTEM_SHARP_ZAURUS
-	default y if ADK_TARGET_SYSTEM_QEMU_ARM_SPITZ
-	default y if ADK_TARGET_SYSTEM_QEMU_ARM_TERRIER
 	default y if ADK_TARGET_MODEL_PCENGINES_ALIX1C
 	default n