diff options
| -rw-r--r-- | Makefile.objs | 1 | ||||
| -rw-r--r-- | Makefile.target | 6 | ||||
| -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/ppc-softmmu.mak | 1 | ||||
| -rw-r--r-- | default-configs/ppc64-softmmu.mak | 1 | ||||
| -rw-r--r-- | default-configs/ppcemb-softmmu.mak | 1 | ||||
| -rw-r--r-- | default-configs/x86_64-softmmu.mak | 1 |
11 files changed, 13 insertions, 3 deletions
diff --git a/Makefile.objs b/Makefile.objs index b0e5010701..17feeb0f7c 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -138,6 +138,7 @@ hw-obj-$(CONFIG_M48T59) += m48t59.o hw-obj-$(CONFIG_ESCC) += escc.o hw-obj-$(CONFIG_PARALLEL) += parallel.o +hw-obj-$(CONFIG_I8254) += i8254.o # PCI watchdog devices hw-obj-y += wdt_i6300esb.o diff --git a/Makefile.target b/Makefile.target index e543f60963..378b1ac3f1 100644 --- a/Makefile.target +++ b/Makefile.target @@ -200,7 +200,7 @@ obj-y += e1000.o obj-i386-y = ide/core.o ide/qdev.o ide/isa.o ide/pci.o ide/piix.o obj-i386-y += pckbd.o $(sound-obj-y) dma.o obj-i386-y += vga.o vga-isa.o -obj-i386-y += fdc.o mc146818rtc.o serial.o i8259.o i8254.o pcspk.o pc.o +obj-i386-y += fdc.o mc146818rtc.o serial.o i8259.o pcspk.o pc.o obj-i386-y += cirrus_vga.o apic.o ioapic.o acpi.o piix_pci.o obj-i386-y += usb-uhci.o vmmouse.o vmport.o vmware_vga.o hpet.o obj-i386-y += device-hotplug.o pci-hotplug.o smbios.o wdt_ib700.o @@ -211,7 +211,7 @@ 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 += vga.o $(sound-obj-y) dma.o openpic.o # PREP target -obj-ppc-y += pckbd.o serial.o i8259.o i8254.o fdc.o mc146818rtc.o +obj-ppc-y += pckbd.o serial.o i8259.o fdc.o mc146818rtc.o obj-ppc-y += prep_pci.o ppc_prep.o ne2000-isa.o # Mac shared devices obj-ppc-y += macio.o cuda.o adb.o mac_nvram.o mac_dbdma.o @@ -229,7 +229,7 @@ obj-ppc-$(CONFIG_FDT) += device_tree.o obj-mips-y = mips_r4k.o mips_jazz.o mips_malta.o mips_mipssim.o obj-mips-y += mips_addr.o mips_timer.o mips_int.o -obj-mips-y += dma.o vga.o serial.o i8254.o i8259.o rc4030.o +obj-mips-y += dma.o vga.o serial.o i8259.o rc4030.o obj-mips-y += vga-isa.o 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 diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmmu.mak index 3d3892e311..ea5039754d 100644 --- a/default-configs/i386-softmmu.mak +++ b/default-configs/i386-softmmu.mak @@ -3,3 +3,4 @@ CONFIG_USB_OHCI=y CONFIG_VGA_PCI=y CONFIG_PARALLEL=y +CONFIG_I8254=y diff --git a/default-configs/mips-softmmu.mak b/default-configs/mips-softmmu.mak index 56045a89b6..1778262793 100644 --- a/default-configs/mips-softmmu.mak +++ b/default-configs/mips-softmmu.mak @@ -4,3 +4,4 @@ CONFIG_ISA_MMIO=y CONFIG_ESP=y CONFIG_VGA_PCI=y CONFIG_PARALLEL=y +CONFIG_I8254=y diff --git a/default-configs/mips64-softmmu.mak b/default-configs/mips64-softmmu.mak index f3955a8368..e672e0b3aa 100644 --- a/default-configs/mips64-softmmu.mak +++ b/default-configs/mips64-softmmu.mak @@ -4,3 +4,4 @@ CONFIG_ISA_MMIO=y CONFIG_ESP=y CONFIG_VGA_PCI=y CONFIG_PARALLEL=y +CONFIG_I8254=y diff --git a/default-configs/mips64el-softmmu.mak b/default-configs/mips64el-softmmu.mak index 4e6830c64b..641db27b17 100644 --- a/default-configs/mips64el-softmmu.mak +++ b/default-configs/mips64el-softmmu.mak @@ -4,3 +4,4 @@ CONFIG_ISA_MMIO=y CONFIG_ESP=y CONFIG_VGA_PCI=y CONFIG_PARALLEL=y +CONFIG_I8254=y diff --git a/default-configs/mipsel-softmmu.mak b/default-configs/mipsel-softmmu.mak index b6ec53fd36..d054572fdf 100644 --- a/default-configs/mipsel-softmmu.mak +++ b/default-configs/mipsel-softmmu.mak @@ -4,3 +4,4 @@ CONFIG_ISA_MMIO=y CONFIG_ESP=y CONFIG_VGA_PCI=y CONFIG_PARALLEL=y +CONFIG_I8254=y diff --git a/default-configs/ppc-softmmu.mak b/default-configs/ppc-softmmu.mak index 9afe485e20..927149259e 100644 --- a/default-configs/ppc-softmmu.mak +++ b/default-configs/ppc-softmmu.mak @@ -6,3 +6,4 @@ CONFIG_ISA_MMIO=y CONFIG_ESCC=y CONFIG_M48T59=y CONFIG_VGA_PCI=y +CONFIG_I8254=y diff --git a/default-configs/ppc64-softmmu.mak b/default-configs/ppc64-softmmu.mak index f5b76b6bbc..38d934e966 100644 --- a/default-configs/ppc64-softmmu.mak +++ b/default-configs/ppc64-softmmu.mak @@ -6,3 +6,4 @@ CONFIG_ISA_MMIO=y CONFIG_ESCC=y CONFIG_M48T59=y CONFIG_VGA_PCI=y +CONFIG_I8254=y diff --git a/default-configs/ppcemb-softmmu.mak b/default-configs/ppcemb-softmmu.mak index 0a1a1e219a..e4d314cd0b 100644 --- a/default-configs/ppcemb-softmmu.mak +++ b/default-configs/ppcemb-softmmu.mak @@ -6,3 +6,4 @@ CONFIG_ISA_MMIO=y CONFIG_ESCC=y CONFIG_M48T59=y CONFIG_VGA_PCI=y +CONFIG_I8254=y diff --git a/default-configs/x86_64-softmmu.mak b/default-configs/x86_64-softmmu.mak index 6eb8b3227f..92061de42f 100644 --- a/default-configs/x86_64-softmmu.mak +++ b/default-configs/x86_64-softmmu.mak @@ -3,3 +3,4 @@ CONFIG_USB_OHCI=y CONFIG_VGA_PCI=y CONFIG_PARALLEL=y +CONFIG_I8254=y |