summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2014-05-31 20:32:58 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2014-05-31 20:33:05 +0200
commited6eb853fe4cc825f96b60ca30b7ebd69a2cbe1c (patch)
tree197086a253276305d7af80c90d5c6c1170645ffd
parent7e8ca9795ba14c47e78cb1e69e5464cc89162baa (diff)
add disk support to qemu-arm spitz and terrier
-rw-r--r--mk/rootfs.mk2
-rw-r--r--target/arm/Makefile2
-rw-r--r--target/config/Config.in.qemuopts1
-rw-r--r--target/linux/config/Config.in.block5
-rw-r--r--target/linux/config/Config.in.graphics4
-rw-r--r--target/linux/config/Config.in.pcmcia10
6 files changed, 13 insertions, 11 deletions
diff --git a/mk/rootfs.mk b/mk/rootfs.mk
index dd0516a3e..29b2a9d60 100644
--- a/mk/rootfs.mk
+++ b/mk/rootfs.mk
@@ -14,7 +14,7 @@ ifeq ($(ADK_TARGET_ROOTFS_ARCHIVE),y)
ifeq ($(ADK_TARGET_QEMU_WITH_VIRTIO),y)
ROOTFS:= root=/dev/vda1
else
-ROOTFS:= root=/dev/sda1
+ROOTFS:= root=/dev/sda1 rootwait
endif
endif
endif
diff --git a/target/arm/Makefile b/target/arm/Makefile
index 47fa758e0..b1bded531 100644
--- a/target/arm/Makefile
+++ b/target/arm/Makefile
@@ -36,7 +36,7 @@ endif
ifeq ($(ADK_TARGET_FS),archive)
targethelp:
@echo "The RootFS tarball is: $(FW_DIR)/$(ROOTFSTARBALL)"
-ifeq ($(ADK_TARGET_QEMU_ARM_MODEL_VERSATILEPB),y)
+ifeq ($(ADK_TARGET_QEMU_ARM_MODEL_VERSATILEPB)$(ADK_TARGET_QEMU_ARM_MODEL_TERRIER)$(ADK_TARGET_QEMU_ARM_MODEL_SPITZ),y)
@echo 'The kernel file is: $(FW_DIR)/${TARGET_KERNEL}'
@echo "Use following command to create a QEMU Image:"
@echo "./scripts/create.sh qemu-${CPU_ARCH}.img $(FW_DIR)/$(ROOTFSTARBALL)"
diff --git a/target/config/Config.in.qemuopts b/target/config/Config.in.qemuopts
index f6438ccd6..92a0a61c7 100644
--- a/target/config/Config.in.qemuopts
+++ b/target/config/Config.in.qemuopts
@@ -46,6 +46,7 @@ config ADK_TARGET_QEMU_WITH_BLOCK
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_PLATFORM if ADK_TARGET_SYSTEM_QEMU_SH4
+ select ADK_KERNEL_PATA_PXA if ADK_TARGET_QEMU_ARM_MODEL_SPITZ || ADK_TARGET_QEMU_ARM_MODEL_TERRIER
endchoice
diff --git a/target/linux/config/Config.in.block b/target/linux/config/Config.in.block
index 04db38e94..7aa2b0f19 100644
--- a/target/linux/config/Config.in.block
+++ b/target/linux/config/Config.in.block
@@ -188,6 +188,8 @@ config ADK_KERNEL_PATA_PLATFORM
default n
config ADK_KERNEL_PATA_PCMCIA
+ select ADK_KERNEL_PCCARD
+ select ADK_KERNEL_PCMCIA
tristate
config ADK_KERNEL_PATA_IMX
@@ -217,7 +219,8 @@ config ADK_KERNEL_PATA_PXA
select ADK_KERNEL_BLK_DEV
select ADK_KERNEL_BLK_DEV_SD
select ADK_KERNEL_PATA_PCMCIA
- depends on ADK_TARGET_SYSTEM_SHARP_ZAURUS
+ select ADK_KERNEL_PCMCIA_PXA2XX
+ depends on ADK_TARGET_SYSTEM_SHARP_ZAURUS || ADK_TARGET_QEMU_ARM_MODEL_TERRIER || ADK_TARGET_QEMU_ARM_MODEL_SPITZ
default y if ADK_TARGET_SYSTEM_SHARP_ZAURUS
default n
help
diff --git a/target/linux/config/Config.in.graphics b/target/linux/config/Config.in.graphics
index 04ddea5d5..2aa4e5f89 100644
--- a/target/linux/config/Config.in.graphics
+++ b/target/linux/config/Config.in.graphics
@@ -192,11 +192,11 @@ config ADK_KERNEL_FB_PXA
select ADK_KERNEL_DUMMY_CONSOLE
select ADK_KERNEL_FRAMEBUFFER_CONSOLE
select ADK_KERNEL_FRAMEBUFFER_CONSOLE_ROTATION
+ depends on ADK_TARGET_SYSTEM_SHARP_ZAURUS || ADK_TARGET_QEMU_ARM_MODEL_TERRIER || ADK_TARGET_QEMU_ARM_MODEL_SPITZ
default y if ADK_TARGET_SYSTEM_SHARP_ZAURUS
default y if ADK_TARGET_QEMU_ARM_MODEL_TERRIER
default y if ADK_TARGET_QEMU_ARM_MODEL_SPITZ
default n
- depends on ADK_TARGET_SYSTEM_SHARP_ZAURUS || ADK_TARGET_QEMU_ARM_MODEL_TERRIER || ADK_TARGET_QEMU_ARM_MODEL_SPITZ
help
Framebuffer support for Sharp Zaurus CL Series.
@@ -206,9 +206,9 @@ config ADK_KERNEL_FB_GEODE_LX
select ADK_KERNEL_FB
select ADK_KERNEL_FRAMEBUFFER_CONSOLE
select ADK_KERNEL_FB_GEODE
+ depends on ADK_TARGET_SYSTEM_PCENGINES_ALIX1C
default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C
default n
- depends on ADK_TARGET_SYSTEM_PCENGINES_ALIX1C
help
Framebuffer support for ALIX boards with VGA.
diff --git a/target/linux/config/Config.in.pcmcia b/target/linux/config/Config.in.pcmcia
index f5e1f13e5..102ce2cef 100644
--- a/target/linux/config/Config.in.pcmcia
+++ b/target/linux/config/Config.in.pcmcia
@@ -1,10 +1,5 @@
menu "PCMCIA/CardBus support"
-depends on ADK_TARGET_WITH_CARDBUS || ADK_TARGET_WITH_PCMCIA
-
-config ADK_KERNEL_PCMCIA_PXA2XX
- boolean
- default y if ADK_TARGET_SYSTEM_SHARP_ZAURUS
- default n
+depends on ADK_TARGET_WITH_CARDBUS || ADK_TARGET_WITH_PCMCIA || ADK_TARGET_QEMU
config ADK_KERNEL_CARDBUS
boolean
@@ -19,6 +14,9 @@ config ADK_KERNEL_SERIAL_8250_SHARE_IRQ
boolean
select ADK_KERNEL_SERIAL_8250_EXTENDED
+config ADK_KERNEL_PCMCIA_PXA2XX
+ boolean
+
config ADK_KERNEL_PCCARD
prompt "PCCARD support"
tristate