diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2013-02-05 12:30:44 +0100 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2013-04-08 18:13:13 +0200 |
| commit | 0ddfaf7fe4c8453446730328bf348b7c6438e4f8 (patch) | |
| tree | b477612ce554244d9daa8f1a263c4a48a745707b /hw | |
| parent | a100107d5612ba568c817f22c628b2c9eeb431bf (diff) | |
hw: move MC146818RTC to hw/timer/, configure via default-configs/
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/alpha/Makefile.objs | 1 | ||||
| -rw-r--r-- | hw/i386/Makefile.objs | 1 | ||||
| -rw-r--r-- | hw/mips/Makefile.objs | 2 | ||||
| -rw-r--r-- | hw/moxie/Makefile.objs | 3 | ||||
| -rw-r--r-- | hw/ppc/Makefile.objs | 2 | ||||
| -rw-r--r-- | hw/sparc64/Makefile.objs | 1 | ||||
| -rw-r--r-- | hw/timer/Makefile.objs | 2 | ||||
| -rw-r--r-- | hw/timer/mc146818rtc.c (renamed from hw/mc146818rtc.c) | 0 |
8 files changed, 3 insertions, 9 deletions
diff --git a/hw/alpha/Makefile.objs b/hw/alpha/Makefile.objs index db868d2ea6..5dfea7aaa1 100644 --- a/hw/alpha/Makefile.objs +++ b/hw/alpha/Makefile.objs @@ -1,4 +1,3 @@ -obj-y = mc146818rtc.o obj-y += alpha_typhoon.o obj-y := $(addprefix ../,$(obj-y)) diff --git a/hw/i386/Makefile.objs b/hw/i386/Makefile.objs index 5559a8ba5c..80132d8f40 100644 --- a/hw/i386/Makefile.objs +++ b/hw/i386/Makefile.objs @@ -1,4 +1,3 @@ -obj-y += mc146818rtc.o obj-y += apic_common.o apic.o obj-y += sga.o ioapic_common.o ioapic.o piix_pci.o obj-y += vmport.o diff --git a/hw/mips/Makefile.objs b/hw/mips/Makefile.objs index 1e3bca1c37..e173a2d793 100644 --- a/hw/mips/Makefile.objs +++ b/hw/mips/Makefile.objs @@ -1,4 +1,4 @@ -obj-y += gt64xxx.o mc146818rtc.o +obj-y += gt64xxx.o obj-$(CONFIG_FULONG) += bonito.o vt82c686.o obj-y := $(addprefix ../,$(obj-y)) diff --git a/hw/moxie/Makefile.objs b/hw/moxie/Makefile.objs index f5e04e80ff..bfc90012fd 100644 --- a/hw/moxie/Makefile.objs +++ b/hw/moxie/Makefile.objs @@ -1,5 +1,2 @@ # moxie boards -obj-y = mc146818rtc.o - -obj-y := $(addprefix ../,$(obj-y)) obj-y += moxiesim.o diff --git a/hw/ppc/Makefile.objs b/hw/ppc/Makefile.objs index ef1d9edc1a..b22a6f1ce4 100644 --- a/hw/ppc/Makefile.objs +++ b/hw/ppc/Makefile.objs @@ -1,5 +1,3 @@ -# PREP target -obj-y += mc146818rtc.o # IBM pSeries (sPAPR) obj-$(CONFIG_PSERIES) += spapr_vty.o spapr_llan.o spapr_vscsi.o obj-$(CONFIG_PSERIES) += spapr_pci.o diff --git a/hw/sparc64/Makefile.objs b/hw/sparc64/Makefile.objs index 4df0d90ec2..178464ba54 100644 --- a/hw/sparc64/Makefile.objs +++ b/hw/sparc64/Makefile.objs @@ -1,5 +1,4 @@ obj-y = apb_pci.o -obj-y += mc146818rtc.o obj-y := $(addprefix ../,$(obj-y)) diff --git a/hw/timer/Makefile.objs b/hw/timer/Makefile.objs index 12781dd2a3..a1ef26cf34 100644 --- a/hw/timer/Makefile.objs +++ b/hw/timer/Makefile.objs @@ -8,3 +8,5 @@ common-obj-$(CONFIG_PL031) += pl031.o common-obj-$(CONFIG_PUV3) += puv3_ost.o common-obj-$(CONFIG_TWL92230) += twl92230.o common-obj-$(CONFIG_XILINX) += xilinx_timer.o + +obj-$(CONFIG_MC146818RTC) += mc146818rtc.o diff --git a/hw/mc146818rtc.c b/hw/timer/mc146818rtc.c index 69e6844ff4..69e6844ff4 100644 --- a/hw/mc146818rtc.c +++ b/hw/timer/mc146818rtc.c |