From 9953b2fc28448a2f237402b5af6ec90bd5fe10b0 Mon Sep 17 00:00:00 2001 From: Blue Swirl Date: Sun, 21 Mar 2010 19:47:05 +0000 Subject: [PATCH] Compile most IDE devices only once Signed-off-by: Blue Swirl --- Makefile.objs | 7 +++++++ Makefile.target | 9 ++++----- configure | 1 + default-configs/i386-softmmu.mak | 4 ++++ default-configs/mips-softmmu.mak | 4 ++++ default-configs/mips64-softmmu.mak | 4 ++++ default-configs/mips64el-softmmu.mak | 4 ++++ default-configs/mipsel-softmmu.mak | 4 ++++ default-configs/ppc-softmmu.mak | 4 ++++ default-configs/ppc64-softmmu.mak | 4 ++++ default-configs/ppcemb-softmmu.mak | 4 ++++ default-configs/sparc64-softmmu.mak | 4 ++++ default-configs/x86_64-softmmu.mak | 4 ++++ 13 files changed, 52 insertions(+), 5 deletions(-) diff --git a/Makefile.objs b/Makefile.objs index fb7b780636..8b4036bd18 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -153,6 +153,13 @@ hw-obj-y += ne2000.o hw-obj-$(CONFIG_SMC91C111) += smc91c111.o hw-obj-$(CONFIG_LAN9118) += lan9118.o +# IDE +hw-obj-$(CONFIG_IDE_QDEV) += ide/qdev.o +hw-obj-$(CONFIG_IDE_PCI) += ide/pci.o +hw-obj-$(CONFIG_IDE_ISA) += ide/isa.o +hw-obj-$(CONFIG_IDE_PIIX) += ide/piix.o +hw-obj-$(CONFIG_IDE_CMD646) += ide/cmd646.o + # SCSI layer hw-obj-y += lsi53c895a.o hw-obj-$(CONFIG_ESP) += esp.o diff --git a/Makefile.target b/Makefile.target index f545630e1b..dd5539b344 100644 --- a/Makefile.target +++ b/Makefile.target @@ -197,7 +197,7 @@ obj-y += rtl8139.o obj-y += e1000.o # Hardware support -obj-i386-y = ide/core.o ide/qdev.o ide/isa.o ide/pci.o ide/piix.o +obj-i386-y = ide/core.o obj-i386-y += pckbd.o $(sound-obj-y) dma.o obj-i386-y += vga.o obj-i386-y += fdc.o mc146818rtc.o serial.o i8259.o pc.o @@ -207,8 +207,7 @@ obj-i386-y += device-hotplug.o pci-hotplug.o smbios.o wdt_ib700.o obj-i386-y += ne2000-isa.o debugcon.o multiboot.o # shared objects -obj-ppc-y = ppc.o ide/core.o ide/qdev.o ide/isa.o ide/pci.o ide/macio.o -obj-ppc-y += ide/cmd646.o +obj-ppc-y = ppc.o ide/core.o ide/macio.o obj-ppc-y += vga.o $(sound-obj-y) dma.o openpic.o # PREP target obj-ppc-y += pckbd.o serial.o i8259.o fdc.o mc146818rtc.o @@ -232,7 +231,7 @@ obj-mips-y += mips_addr.o mips_timer.o mips_int.o obj-mips-y += dma.o vga.o serial.o i8259.o rc4030.o obj-mips-y += vga-isa-mm.o obj-mips-y += g364fb.o jazz_led.o dp8393x.o -obj-mips-y += ide/core.o ide/qdev.o ide/isa.o ide/pci.o ide/piix.o +obj-mips-y += ide/core.o obj-mips-y += gt64xxx.o pckbd.o fdc.o mc146818rtc.o acpi.o ds1225y.o obj-mips-y += piix4.o cirrus_vga.o $(sound-obj-y) obj-mips-y += mipsnet.o ne2000-isa.o @@ -265,7 +264,7 @@ obj-cris-y += pflash_cfi02.o ifeq ($(TARGET_ARCH), sparc64) obj-sparc-y = sun4u.o pckbd.o apb_pci.o -obj-sparc-y += ide/core.o ide/qdev.o ide/pci.o ide/cmd646.o +obj-sparc-y += ide/core.o obj-sparc-y += vga.o obj-sparc-y += fdc.o mc146818rtc.o serial.o obj-sparc-y += cirrus_vga.o diff --git a/configure b/configure index 0182b95a6d..6bc40a388d 100755 --- a/configure +++ b/configure @@ -2741,6 +2741,7 @@ done for hwlib in 32 64; do d=libhw$hwlib mkdir -p $d + mkdir -p $d/ide rm -f $d/Makefile ln -s $source_path/Makefile.hw $d/Makefile echo "QEMU_CFLAGS+=-DTARGET_PHYS_ADDR_BITS=$hwlib" > $d/config.mak diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmmu.mak index 0f532bb8b7..fd4d969c86 100644 --- a/default-configs/i386-softmmu.mak +++ b/default-configs/i386-softmmu.mak @@ -7,3 +7,7 @@ CONFIG_PARALLEL=y CONFIG_I8254=y CONFIG_PCSPK=y CONFIG_USB_UHCI=y +CONFIG_IDE_QDEV=y +CONFIG_IDE_PCI=y +CONFIG_IDE_ISA=y +CONFIG_IDE_PIIX=y diff --git a/default-configs/mips-softmmu.mak b/default-configs/mips-softmmu.mak index c0fe54ee5f..0583dd9a2c 100644 --- a/default-configs/mips-softmmu.mak +++ b/default-configs/mips-softmmu.mak @@ -8,3 +8,7 @@ CONFIG_PARALLEL=y CONFIG_I8254=y CONFIG_PCSPK=y CONFIG_USB_UHCI=y +CONFIG_IDE_QDEV=y +CONFIG_IDE_PCI=y +CONFIG_IDE_ISA=y +CONFIG_IDE_PIIX=y diff --git a/default-configs/mips64-softmmu.mak b/default-configs/mips64-softmmu.mak index 1543c4fc55..4707ce39cb 100644 --- a/default-configs/mips64-softmmu.mak +++ b/default-configs/mips64-softmmu.mak @@ -8,3 +8,7 @@ CONFIG_PARALLEL=y CONFIG_I8254=y CONFIG_PCSPK=y CONFIG_USB_UHCI=y +CONFIG_IDE_QDEV=y +CONFIG_IDE_PCI=y +CONFIG_IDE_ISA=y +CONFIG_IDE_PIIX=y diff --git a/default-configs/mips64el-softmmu.mak b/default-configs/mips64el-softmmu.mak index acf06048d3..4be19a57c5 100644 --- a/default-configs/mips64el-softmmu.mak +++ b/default-configs/mips64el-softmmu.mak @@ -8,3 +8,7 @@ CONFIG_PARALLEL=y CONFIG_I8254=y CONFIG_PCSPK=y CONFIG_USB_UHCI=y +CONFIG_IDE_QDEV=y +CONFIG_IDE_PCI=y +CONFIG_IDE_ISA=y +CONFIG_IDE_PIIX=y diff --git a/default-configs/mipsel-softmmu.mak b/default-configs/mipsel-softmmu.mak index f1878fcfa1..6fd5a5e080 100644 --- a/default-configs/mipsel-softmmu.mak +++ b/default-configs/mipsel-softmmu.mak @@ -8,3 +8,7 @@ CONFIG_PARALLEL=y CONFIG_I8254=y CONFIG_PCSPK=y CONFIG_USB_UHCI=y +CONFIG_IDE_QDEV=y +CONFIG_IDE_PCI=y +CONFIG_IDE_ISA=y +CONFIG_IDE_PIIX=y diff --git a/default-configs/ppc-softmmu.mak b/default-configs/ppc-softmmu.mak index 927149259e..2bdf957a28 100644 --- a/default-configs/ppc-softmmu.mak +++ b/default-configs/ppc-softmmu.mak @@ -7,3 +7,7 @@ CONFIG_ESCC=y CONFIG_M48T59=y CONFIG_VGA_PCI=y CONFIG_I8254=y +CONFIG_IDE_QDEV=y +CONFIG_IDE_PCI=y +CONFIG_IDE_ISA=y +CONFIG_IDE_CMD646=y diff --git a/default-configs/ppc64-softmmu.mak b/default-configs/ppc64-softmmu.mak index 38d934e966..7e2481cdfa 100644 --- a/default-configs/ppc64-softmmu.mak +++ b/default-configs/ppc64-softmmu.mak @@ -7,3 +7,7 @@ CONFIG_ESCC=y CONFIG_M48T59=y CONFIG_VGA_PCI=y CONFIG_I8254=y +CONFIG_IDE_QDEV=y +CONFIG_IDE_PCI=y +CONFIG_IDE_ISA=y +CONFIG_IDE_CMD646=y diff --git a/default-configs/ppcemb-softmmu.mak b/default-configs/ppcemb-softmmu.mak index e4d314cd0b..edb94dcb7a 100644 --- a/default-configs/ppcemb-softmmu.mak +++ b/default-configs/ppcemb-softmmu.mak @@ -7,3 +7,7 @@ CONFIG_ESCC=y CONFIG_M48T59=y CONFIG_VGA_PCI=y CONFIG_I8254=y +CONFIG_IDE_QDEV=y +CONFIG_IDE_PCI=y +CONFIG_IDE_ISA=y +CONFIG_IDE_CMD646=y diff --git a/default-configs/sparc64-softmmu.mak b/default-configs/sparc64-softmmu.mak index d7c3065825..12155cdbe3 100644 --- a/default-configs/sparc64-softmmu.mak +++ b/default-configs/sparc64-softmmu.mak @@ -5,3 +5,7 @@ CONFIG_M48T59=y CONFIG_PTIMER=y CONFIG_VGA_PCI=y CONFIG_PARALLEL=y +CONFIG_IDE_QDEV=y +CONFIG_IDE_PCI=y +CONFIG_IDE_ISA=y +CONFIG_IDE_CMD646=y diff --git a/default-configs/x86_64-softmmu.mak b/default-configs/x86_64-softmmu.mak index 115051203f..99be394492 100644 --- a/default-configs/x86_64-softmmu.mak +++ b/default-configs/x86_64-softmmu.mak @@ -7,3 +7,7 @@ CONFIG_PARALLEL=y CONFIG_I8254=y CONFIG_PCSPK=y CONFIG_USB_UHCI=y +CONFIG_IDE_QDEV=y +CONFIG_IDE_PCI=y +CONFIG_IDE_ISA=y +CONFIG_IDE_PIIX=y