hw: move ISA bridges and devices to hw/isa/, configure with default-configs/

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

5 files changed, 4 insertions, 2 deletions

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))