diff options
| author | Paul Brook <paul@codesourcery.com> | 2010-11-27 00:34:15 +0000 |
|---|---|---|
| committer | Paul Brook <paul@codesourcery.com> | 2010-11-27 00:34:15 +0000 |
| commit | 050e27c8c942151c0685342fe2cbac6a80eb1325 (patch) | |
| tree | deee207ba9d0e015d1aa775f8bb919226d290d9f /default-configs | |
| parent | 01af7daf5596e8860c71e72349e1d539b81d9c80 (diff) | |
| download | qemu-050e27c8c942151c0685342fe2cbac6a80eb1325.tar.gz qemu-050e27c8c942151c0685342fe2cbac6a80eb1325.tar.bz2 qemu-050e27c8c942151c0685342fe2cbac6a80eb1325.zip | |
Fix previous commit
Fix breakage from previous commit (missing pci.mak, and incorrect
include in default-configs/s390x-softmmu.mak).
Signed-off-by: Paul Brook <paul@codesourcery.com>
Diffstat (limited to 'default-configs')
| -rw-r--r-- | default-configs/cris-softmmu.mak | 1 | ||||
| -rw-r--r-- | default-configs/pci.mak | 11 | ||||
| -rw-r--r-- | default-configs/s390x-softmmu.mak | 2 |
3 files changed, 12 insertions, 2 deletions
diff --git a/default-configs/cris-softmmu.mak b/default-configs/cris-softmmu.mak index 5f1fd1e868..1a479cd8d3 100644 --- a/default-configs/cris-softmmu.mak +++ b/default-configs/cris-softmmu.mak @@ -1,6 +1,5 @@ # Default configuration for cris-softmmu -#include pci.mak CONFIG_NAND=y CONFIG_PTIMER=y CONFIG_PFLASH_CFI02=y diff --git a/default-configs/pci.mak b/default-configs/pci.mak new file mode 100644 index 0000000000..0ddfb37fd3 --- /dev/null +++ b/default-configs/pci.mak @@ -0,0 +1,11 @@ +CONFIG_PCI=y +CONFIG_VIRTIO_PCI=y +CONFIG_VIRTIO=y +CONFIG_USB_UHCI=y +CONFIG_USB_OHCI=y +CONFIG_NE2000_PCI=y +CONFIG_EEPRO100_PCI=y +CONFIG_PCNET_PCI=y +CONFIG_LSI_SCSI_PCI=y +CONFIG_RTL8139_PCI=y +CONFIG_E1000_PCI=y diff --git a/default-configs/s390x-softmmu.mak b/default-configs/s390x-softmmu.mak index 16d72590ee..3005729204 100644 --- a/default-configs/s390x-softmmu.mak +++ b/default-configs/s390x-softmmu.mak @@ -1 +1 @@ -include virtio.mak +CONFIG_VIRTIO=y |