Revision 9953b2fc

b/Makefile.objs
153 153
hw-obj-$(CONFIG_SMC91C111) += smc91c111.o
154 154
hw-obj-$(CONFIG_LAN9118) += lan9118.o
155 155

  
156
# IDE
157
hw-obj-$(CONFIG_IDE_QDEV) += ide/qdev.o
158
hw-obj-$(CONFIG_IDE_PCI) += ide/pci.o
159
hw-obj-$(CONFIG_IDE_ISA) += ide/isa.o
160
hw-obj-$(CONFIG_IDE_PIIX) += ide/piix.o
161
hw-obj-$(CONFIG_IDE_CMD646) += ide/cmd646.o
162

  
156 163
# SCSI layer
157 164
hw-obj-y += lsi53c895a.o
158 165
hw-obj-$(CONFIG_ESP) += esp.o
b/Makefile.target
197 197
obj-y += e1000.o
198 198

  
199 199
# Hardware support
200
obj-i386-y = ide/core.o ide/qdev.o ide/isa.o ide/pci.o ide/piix.o
200
obj-i386-y = ide/core.o
201 201
obj-i386-y += pckbd.o $(sound-obj-y) dma.o
202 202
obj-i386-y += vga.o
203 203
obj-i386-y += fdc.o mc146818rtc.o serial.o i8259.o pc.o
......
207 207
obj-i386-y += ne2000-isa.o debugcon.o multiboot.o
208 208

  
209 209
# shared objects
210
obj-ppc-y = ppc.o ide/core.o ide/qdev.o ide/isa.o ide/pci.o ide/macio.o
211
obj-ppc-y += ide/cmd646.o
210
obj-ppc-y = ppc.o ide/core.o ide/macio.o
212 211
obj-ppc-y += vga.o $(sound-obj-y) dma.o openpic.o
213 212
# PREP target
214 213
obj-ppc-y += pckbd.o serial.o i8259.o fdc.o mc146818rtc.o
......
232 231
obj-mips-y += dma.o vga.o serial.o i8259.o rc4030.o
233 232
obj-mips-y += vga-isa-mm.o
234 233
obj-mips-y += g364fb.o jazz_led.o dp8393x.o
235
obj-mips-y += ide/core.o ide/qdev.o ide/isa.o ide/pci.o ide/piix.o
234
obj-mips-y += ide/core.o
236 235
obj-mips-y += gt64xxx.o pckbd.o fdc.o mc146818rtc.o acpi.o ds1225y.o
237 236
obj-mips-y += piix4.o cirrus_vga.o $(sound-obj-y)
238 237
obj-mips-y += mipsnet.o ne2000-isa.o
......
265 264

  
266 265
ifeq ($(TARGET_ARCH), sparc64)
267 266
obj-sparc-y = sun4u.o pckbd.o apb_pci.o
268
obj-sparc-y += ide/core.o ide/qdev.o ide/pci.o ide/cmd646.o
267
obj-sparc-y += ide/core.o
269 268
obj-sparc-y += vga.o
270 269
obj-sparc-y += fdc.o mc146818rtc.o serial.o
271 270
obj-sparc-y += cirrus_vga.o
b/configure
2741 2741
for hwlib in 32 64; do
2742 2742
  d=libhw$hwlib
2743 2743
  mkdir -p $d
2744
  mkdir -p $d/ide
2744 2745
  rm -f $d/Makefile
2745 2746
  ln -s $source_path/Makefile.hw $d/Makefile
2746 2747
  echo "QEMU_CFLAGS+=-DTARGET_PHYS_ADDR_BITS=$hwlib" > $d/config.mak
b/default-configs/i386-softmmu.mak
7 7
CONFIG_I8254=y
8 8
CONFIG_PCSPK=y
9 9
CONFIG_USB_UHCI=y
10
CONFIG_IDE_QDEV=y
11
CONFIG_IDE_PCI=y
12
CONFIG_IDE_ISA=y
13
CONFIG_IDE_PIIX=y
b/default-configs/mips-softmmu.mak
8 8
CONFIG_I8254=y
9 9
CONFIG_PCSPK=y
10 10
CONFIG_USB_UHCI=y
11
CONFIG_IDE_QDEV=y
12
CONFIG_IDE_PCI=y
13
CONFIG_IDE_ISA=y
14
CONFIG_IDE_PIIX=y
b/default-configs/mips64-softmmu.mak
8 8
CONFIG_I8254=y
9 9
CONFIG_PCSPK=y
10 10
CONFIG_USB_UHCI=y
11
CONFIG_IDE_QDEV=y
12
CONFIG_IDE_PCI=y
13
CONFIG_IDE_ISA=y
14
CONFIG_IDE_PIIX=y
b/default-configs/mips64el-softmmu.mak
8 8
CONFIG_I8254=y
9 9
CONFIG_PCSPK=y
10 10
CONFIG_USB_UHCI=y
11
CONFIG_IDE_QDEV=y
12
CONFIG_IDE_PCI=y
13
CONFIG_IDE_ISA=y
14
CONFIG_IDE_PIIX=y
b/default-configs/mipsel-softmmu.mak
8 8
CONFIG_I8254=y
9 9
CONFIG_PCSPK=y
10 10
CONFIG_USB_UHCI=y
11
CONFIG_IDE_QDEV=y
12
CONFIG_IDE_PCI=y
13
CONFIG_IDE_ISA=y
14
CONFIG_IDE_PIIX=y
b/default-configs/ppc-softmmu.mak
7 7
CONFIG_M48T59=y
8 8
CONFIG_VGA_PCI=y
9 9
CONFIG_I8254=y
10
CONFIG_IDE_QDEV=y
11
CONFIG_IDE_PCI=y
12
CONFIG_IDE_ISA=y
13
CONFIG_IDE_CMD646=y
b/default-configs/ppc64-softmmu.mak
7 7
CONFIG_M48T59=y
8 8
CONFIG_VGA_PCI=y
9 9
CONFIG_I8254=y
10
CONFIG_IDE_QDEV=y
11
CONFIG_IDE_PCI=y
12
CONFIG_IDE_ISA=y
13
CONFIG_IDE_CMD646=y
b/default-configs/ppcemb-softmmu.mak
7 7
CONFIG_M48T59=y
8 8
CONFIG_VGA_PCI=y
9 9
CONFIG_I8254=y
10
CONFIG_IDE_QDEV=y
11
CONFIG_IDE_PCI=y
12
CONFIG_IDE_ISA=y
13
CONFIG_IDE_CMD646=y
b/default-configs/sparc64-softmmu.mak
5 5
CONFIG_PTIMER=y
6 6
CONFIG_VGA_PCI=y
7 7
CONFIG_PARALLEL=y
8
CONFIG_IDE_QDEV=y
9
CONFIG_IDE_PCI=y
10
CONFIG_IDE_ISA=y
11
CONFIG_IDE_CMD646=y
b/default-configs/x86_64-softmmu.mak
7 7
CONFIG_I8254=y
8 8
CONFIG_PCSPK=y
9 9
CONFIG_USB_UHCI=y
10
CONFIG_IDE_QDEV=y
11
CONFIG_IDE_PCI=y
12
CONFIG_IDE_ISA=y
13
CONFIG_IDE_PIIX=y

Also available in: Unified diff