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

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

diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmmu.mak
index 9d852ff2d82c13e0fc050f8d97977256d132ab67..717c8f452f3b2dab965e309638c9b074241791e6 100644 (file)
--- 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 2b48452475df75dedffa8ab374ec2b4addd069d6..b764360a555c8ae82c819253078a03901200f524 100644 (file)
--- 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 57133203691b8f4d1d469558912a96add65a08f4..0e4e65d5ebe544d40ec31fdf8bce3aabcb88f510 100644 (file)
--- 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 096dc8055fd66ff451d6eef24ffa956a21c34cb8..0a6c4f7ba23ff4b4cadb4c830cbacdc21f277a0d 100644 (file)
--- 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 5509f0e0c2fe44803a9f45e19182557fdd993d1e..9f9c6daa562a8f91a01aefe17ebd1de0382d3ecc 100644 (file)
--- 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 760d51e663ef9db9cccdabc7ada005f1f95df176..31de9453a9210c17f41e5a095607df8059d4222f 100644 (file)
--- 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 5e91d1e669b7d58882057be2259c10a6d917a79d..af7f4b1fe59e7680388e3d3a532a51a6808291f9 100644 (file)
--- 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 ad3643bd422f2f348f46d8c14713ac1ea0f84d58..193746a73e1942be672e305b15111736e642b9be 100644 (file)
--- 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
similarity index 100%
rename from hw/lpc_ich9.c
rename to hw/isa/lpc_ich9.c

diff --git a/hw/vt82c686.c b/hw/isa/vt82c686.c
similarity index 100%
rename from hw/vt82c686.c
rename to hw/isa/vt82c686.c

diff --git a/hw/mips/Makefile.objs b/hw/mips/Makefile.objs
index e173a2d793d66c95990ea03d92f58db21ab2adfe..af4d1f947b36284ac0fa8eb5fcca0c2a12336fcc 100644 (file)
--- 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))