OSDN Git Service

hw: move MC146818RTC to hw/timer/, configure via default-configs/
authorPaolo Bonzini <pbonzini@redhat.com>
Tue, 5 Feb 2013 11:30:44 +0000 (12:30 +0100)
committerPaolo Bonzini <pbonzini@redhat.com>
Mon, 8 Apr 2013 16:13:13 +0000 (18:13 +0200)
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
20 files changed:
default-configs/alpha-softmmu.mak
default-configs/i386-softmmu.mak
default-configs/mips-softmmu.mak
default-configs/mips64-softmmu.mak
default-configs/mips64el-softmmu.mak
default-configs/mipsel-softmmu.mak
default-configs/moxie-softmmu.mak
default-configs/ppc-softmmu.mak
default-configs/ppc64-softmmu.mak
default-configs/ppcemb-softmmu.mak
default-configs/sparc64-softmmu.mak
default-configs/x86_64-softmmu.mak
hw/alpha/Makefile.objs
hw/i386/Makefile.objs
hw/mips/Makefile.objs
hw/moxie/Makefile.objs
hw/ppc/Makefile.objs
hw/sparc64/Makefile.objs
hw/timer/Makefile.objs
hw/timer/mc146818rtc.c [moved from hw/mc146818rtc.c with 100% similarity]

index 2dbee94..18e5337 100644 (file)
@@ -13,3 +13,4 @@ CONFIG_IDE_QDEV=y
 CONFIG_VMWARE_VGA=y
 CONFIG_IDE_CMD646=y
 CONFIG_I8259=y
+CONFIG_MC146818RTC=y
index 7dd0669..2ddf670 100644 (file)
@@ -29,4 +29,5 @@ CONFIG_PFLASH_CFI01=y
 CONFIG_TPM_TIS=y
 CONFIG_TPM_PASSTHROUGH=y
 CONFIG_PCI_HOTPLUG=y
+CONFIG_MC146818RTC=y
 CONFIG_WDT_IB700=y
index dff6fef..2b48452 100644 (file)
@@ -32,3 +32,4 @@ CONFIG_PFLASH_CFI01=y
 CONFIG_G364FB=y
 CONFIG_I8259=y
 CONFIG_JAZZ_LED=y
+CONFIG_MC146818RTC=y
index 0968e5f..5713320 100644 (file)
@@ -32,3 +32,4 @@ CONFIG_PFLASH_CFI01=y
 CONFIG_G364FB=y
 CONFIG_I8259=y
 CONFIG_JAZZ_LED=y
+CONFIG_MC146818RTC=y
index 6f115d4..096dc80 100644 (file)
@@ -34,3 +34,4 @@ CONFIG_FULONG=y
 CONFIG_G364FB=y
 CONFIG_I8259=y
 CONFIG_JAZZ_LED=y
+CONFIG_MC146818RTC=y
index e391cf7..5509f0e 100644 (file)
@@ -32,3 +32,4 @@ CONFIG_PFLASH_CFI01=y
 CONFIG_G364FB=y
 CONFIG_I8259=y
 CONFIG_JAZZ_LED=y
+CONFIG_MC146818RTC=y
index 0a8194a..1a95476 100644 (file)
@@ -1,4 +1,5 @@
 # Default configuration for moxie-softmmu
 
+CONFIG_MC146818RTC=y
 CONFIG_SERIAL=y
 CONFIG_VGA=y
index cdf82b1..d9ced3a 100644 (file)
@@ -41,3 +41,5 @@ CONFIG_PTIMER=y
 CONFIG_I8259=y
 CONFIG_XILINX=y
 CONFIG_E500=$(CONFIG_FDT)
+# For PReP
+CONFIG_MC146818RTC=y
index 26f74b0..7d62e14 100644 (file)
@@ -44,3 +44,5 @@ CONFIG_PSERIES=$(CONFIG_FDT)
 CONFIG_E500=$(CONFIG_FDT)
 # For pSeries
 CONFIG_PCI_HOTPLUG=y
+# For PReP
+CONFIG_MC146818RTC=y
index 806adfd..9d8c5c7 100644 (file)
@@ -36,3 +36,5 @@ CONFIG_PTIMER=y
 CONFIG_I8259=y
 CONFIG_XILINX=y
 CONFIG_E500=$(CONFIG_FDT)
+# For PReP
+CONFIG_MC146818RTC=y
index 2145b6b..3b3dc55 100644 (file)
@@ -13,3 +13,4 @@ CONFIG_PCKBD=y
 CONFIG_FDC=y
 CONFIG_IDE_ISA=y
 CONFIG_IDE_CMD646=y
+CONFIG_MC146818RTC=y
index 0e5ab55..72f9bc7 100644 (file)
@@ -29,4 +29,5 @@ CONFIG_PFLASH_CFI01=y
 CONFIG_TPM_TIS=y
 CONFIG_TPM_PASSTHROUGH=y
 CONFIG_PCI_HOTPLUG=y
+CONFIG_MC146818RTC=y
 CONFIG_WDT_IB700=y
index db868d2..5dfea7a 100644 (file)
@@ -1,4 +1,3 @@
-obj-y = mc146818rtc.o
 obj-y += alpha_typhoon.o
 
 obj-y := $(addprefix ../,$(obj-y))
index 5559a8b..80132d8 100644 (file)
@@ -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
index 1e3bca1..e173a2d 100644 (file)
@@ -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))
index f5e04e8..bfc9001 100644 (file)
@@ -1,5 +1,2 @@
 # moxie boards
-obj-y = mc146818rtc.o
-
-obj-y := $(addprefix ../,$(obj-y))
 obj-y += moxiesim.o
index ef1d9ed..b22a6f1 100644 (file)
@@ -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
index 4df0d90..178464b 100644 (file)
@@ -1,5 +1,4 @@
 obj-y = apb_pci.o
-obj-y += mc146818rtc.o
 
 obj-y := $(addprefix ../,$(obj-y))
 
index 12781dd..a1ef26c 100644 (file)
@@ -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
similarity index 100%
rename from hw/mc146818rtc.c
rename to hw/timer/mc146818rtc.c