diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2013-02-05 14:13:04 +0100 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2013-04-08 18:13:14 +0200 |
| commit | 47934d0aadc075b05ce2d9e8a44fa6a46edd1afa (patch) | |
| tree | 5ae8e4302cfc21b6fcf140fcf728e0a5ae4cef6b | |
| parent | 9944d320016914912133b348b6fbbb18c7417035 (diff) | |
hw: move ISA bridges and devices to hw/isa/, configure with default-configs/
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
| -rw-r--r-- | default-configs/i386-softmmu.mak | 1 | ||||
| -rw-r--r-- | default-configs/mips-softmmu.mak | 1 | ||||
| -rw-r--r-- | default-configs/mips64-softmmu.mak | 1 | ||||
| -rw-r--r-- | default-configs/mips64el-softmmu.mak | 1 | ||||
| -rw-r--r-- | default-configs/mipsel-softmmu.mak | 1 | ||||
| -rw-r--r-- | default-configs/x86_64-softmmu.mak | 1 | ||||
| -rw-r--r-- | hw/i386/Makefile.objs | 2 | ||||
| -rw-r--r-- | hw/isa/Makefile.objs | 2 | ||||
| -rw-r--r-- | hw/isa/lpc_ich9.c (renamed from hw/lpc_ich9.c) | 0 | ||||
| -rw-r--r-- | hw/isa/vt82c686.c (renamed from hw/vt82c686.c) | 0 | ||||
| -rw-r--r-- | hw/mips/Makefile.objs | 2 |
11 files changed, 10 insertions, 2 deletions
diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmmu.mak index 9d852ff2d8..717c8f452f 100644 --- a/default-configs/i386-softmmu.mak +++ b/default-configs/i386-softmmu.mak @@ -35,3 +35,4 @@ CONFIG_WDT_IB700=y CONFIG_PC_SYSFW=y CONFIG_XEN_I386=$(CONFIG_XEN) CONFIG_ISA_DEBUG=y +CONFIG_LPC_ICH9=y diff --git a/default-configs/mips-softmmu.mak b/default-configs/mips-softmmu.mak index 2b48452475..b764360a55 100644 --- a/default-configs/mips-softmmu.mak +++ b/default-configs/mips-softmmu.mak @@ -33,3 +33,4 @@ CONFIG_G364FB=y CONFIG_I8259=y CONFIG_JAZZ_LED=y CONFIG_MC146818RTC=y +CONFIG_VT82C686=y diff --git a/default-configs/mips64-softmmu.mak b/default-configs/mips64-softmmu.mak index 5713320369..0e4e65d5eb 100644 --- a/default-configs/mips64-softmmu.mak +++ b/default-configs/mips64-softmmu.mak @@ -33,3 +33,4 @@ CONFIG_G364FB=y CONFIG_I8259=y CONFIG_JAZZ_LED=y CONFIG_MC146818RTC=y +CONFIG_VT82C686=y diff --git a/default-configs/mips64el-softmmu.mak b/default-configs/mips64el-softmmu.mak index 096dc8055f..0a6c4f7ba2 100644 --- a/default-configs/mips64el-softmmu.mak +++ b/default-configs/mips64el-softmmu.mak @@ -35,3 +35,4 @@ CONFIG_G364FB=y CONFIG_I8259=y CONFIG_JAZZ_LED=y CONFIG_MC146818RTC=y +CONFIG_VT82C686=y diff --git a/default-configs/mipsel-softmmu.mak b/default-configs/mipsel-softmmu.mak index 5509f0e0c2..9f9c6daa56 100644 --- a/default-configs/mipsel-softmmu.mak +++ b/default-configs/mipsel-softmmu.mak @@ -33,3 +33,4 @@ CONFIG_G364FB=y CONFIG_I8259=y CONFIG_JAZZ_LED=y CONFIG_MC146818RTC=y +CONFIG_VT82C686=y diff --git a/default-configs/x86_64-softmmu.mak b/default-configs/x86_64-softmmu.mak index 760d51e663..31de9453a9 100644 --- a/default-configs/x86_64-softmmu.mak +++ b/default-configs/x86_64-softmmu.mak @@ -35,3 +35,4 @@ CONFIG_WDT_IB700=y CONFIG_PC_SYSFW=y CONFIG_XEN_I386=$(CONFIG_XEN) CONFIG_ISA_DEBUG=y +CONFIG_LPC_ICH9=y diff --git a/hw/i386/Makefile.objs b/hw/i386/Makefile.objs index 5e91d1e669..af7f4b1fe5 100644 --- a/hw/i386/Makefile.objs +++ b/hw/i386/Makefile.objs @@ -2,7 +2,7 @@ obj-y += apic_common.o apic.o obj-y += sga.o ioapic_common.o ioapic.o piix_pci.o obj-y += vmport.o obj-y += debugexit.o -obj-y += lpc_ich9.o q35.o +obj-y += q35.o obj-y += kvm/ obj-y += pc-testdev.o diff --git a/hw/isa/Makefile.objs b/hw/isa/Makefile.objs index ad3643bd42..193746a73e 100644 --- a/hw/isa/Makefile.objs +++ b/hw/isa/Makefile.objs @@ -4,4 +4,6 @@ common-obj-$(CONFIG_I82378) += i82378.o common-obj-$(CONFIG_ISA_MMIO) += isa_mmio.o common-obj-$(CONFIG_PC87312) += pc87312.o common-obj-$(CONFIG_PIIX4) += piix4.o +common-obj-$(CONFIG_VT82C686) += vt82c686.o +obj-$(CONFIG_LPC_ICH9) += lpc_ich9.o diff --git a/hw/lpc_ich9.c b/hw/isa/lpc_ich9.c index d116075933..d116075933 100644 --- a/hw/lpc_ich9.c +++ b/hw/isa/lpc_ich9.c diff --git a/hw/vt82c686.c b/hw/isa/vt82c686.c index 52619276bd..52619276bd 100644 --- a/hw/vt82c686.c +++ b/hw/isa/vt82c686.c diff --git a/hw/mips/Makefile.objs b/hw/mips/Makefile.objs index e173a2d793..af4d1f947b 100644 --- a/hw/mips/Makefile.objs +++ b/hw/mips/Makefile.objs @@ -1,5 +1,5 @@ obj-y += gt64xxx.o -obj-$(CONFIG_FULONG) += bonito.o vt82c686.o +obj-$(CONFIG_FULONG) += bonito.o obj-y := $(addprefix ../,$(obj-y)) |