hw: move MC146818RTC to hw/timer/, configure via default-configs/

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

diff --git a/default-configs/alpha-softmmu.mak b/default-configs/alpha-softmmu.mak
index 2dbee94c89d8fb26077754d886866a4ba6ccf582..18e5337a774d466c92f09a636934b86e5f4bf739 100644 (file)
--- a/default-configs/alpha-softmmu.mak
+++ b/default-configs/alpha-softmmu.mak
@@ -13,3 +13,4 @@ CONFIG_IDE_QDEV=y
 CONFIG_VMWARE_VGA=y
 CONFIG_IDE_CMD646=y
 CONFIG_I8259=y
+CONFIG_MC146818RTC=y

diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmmu.mak
index 7dd066989339cb1e9a0cb7d43eb6aac427afff35..2ddf670030c2e12624eceaecbd3bb9fc3d19bfd5 100644 (file)
--- a/default-configs/i386-softmmu.mak
+++ b/default-configs/i386-softmmu.mak
@@ -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

diff --git a/default-configs/mips-softmmu.mak b/default-configs/mips-softmmu.mak
index dff6fef8a5be464d046c41bbcfc54cb0786d0ee1..2b48452475df75dedffa8ab374ec2b4addd069d6 100644 (file)
--- a/default-configs/mips-softmmu.mak
+++ b/default-configs/mips-softmmu.mak
@@ -32,3 +32,4 @@ CONFIG_PFLASH_CFI01=y
 CONFIG_G364FB=y
 CONFIG_I8259=y
 CONFIG_JAZZ_LED=y
+CONFIG_MC146818RTC=y

diff --git a/default-configs/mips64-softmmu.mak b/default-configs/mips64-softmmu.mak
index 0968e5facafb8f4e5e3700599d2006753d265bd0..57133203691b8f4d1d469558912a96add65a08f4 100644 (file)
--- a/default-configs/mips64-softmmu.mak
+++ b/default-configs/mips64-softmmu.mak
@@ -32,3 +32,4 @@ CONFIG_PFLASH_CFI01=y
 CONFIG_G364FB=y
 CONFIG_I8259=y
 CONFIG_JAZZ_LED=y
+CONFIG_MC146818RTC=y

diff --git a/default-configs/mips64el-softmmu.mak b/default-configs/mips64el-softmmu.mak
index 6f115d4c42f2f901b10fa8eed8c6592bd6b8b83e..096dc8055fd66ff451d6eef24ffa956a21c34cb8 100644 (file)
--- a/default-configs/mips64el-softmmu.mak
+++ b/default-configs/mips64el-softmmu.mak
@@ -34,3 +34,4 @@ CONFIG_FULONG=y
 CONFIG_G364FB=y
 CONFIG_I8259=y
 CONFIG_JAZZ_LED=y
+CONFIG_MC146818RTC=y

diff --git a/default-configs/mipsel-softmmu.mak b/default-configs/mipsel-softmmu.mak
index e391cf7ba3f3aeb492ea7c89b8b3ed82d538ff7d..5509f0e0c2fe44803a9f45e19182557fdd993d1e 100644 (file)
--- a/default-configs/mipsel-softmmu.mak
+++ b/default-configs/mipsel-softmmu.mak
@@ -32,3 +32,4 @@ CONFIG_PFLASH_CFI01=y
 CONFIG_G364FB=y
 CONFIG_I8259=y
 CONFIG_JAZZ_LED=y
+CONFIG_MC146818RTC=y

diff --git a/default-configs/moxie-softmmu.mak b/default-configs/moxie-softmmu.mak
index 0a8194aafebbf05479e146f43d076d3d6823753c..1a954764f36668142d6f876e38a9bab202ae6af8 100644 (file)
--- a/default-configs/moxie-softmmu.mak
+++ b/default-configs/moxie-softmmu.mak
@@ -1,4 +1,5 @@
 # Default configuration for moxie-softmmu
 
+CONFIG_MC146818RTC=y
 CONFIG_SERIAL=y
 CONFIG_VGA=y

diff --git a/default-configs/ppc-softmmu.mak b/default-configs/ppc-softmmu.mak
index cdf82b10f327903675c3accdde00f24c4c6bf897..d9ced3ada0f2df89a1a8ce5d441c89164f0007ed 100644 (file)
--- a/default-configs/ppc-softmmu.mak
+++ b/default-configs/ppc-softmmu.mak
@@ -41,3 +41,5 @@ CONFIG_PTIMER=y
 CONFIG_I8259=y
 CONFIG_XILINX=y
 CONFIG_E500=$(CONFIG_FDT)
+# For PReP
+CONFIG_MC146818RTC=y

diff --git a/default-configs/ppc64-softmmu.mak b/default-configs/ppc64-softmmu.mak
index 26f74b0eaf9ebc55640d20cc10a32f8cc945e5db..7d62e1495dac2d3a470c8cd97ae82b65ac619de0 100644 (file)
--- a/default-configs/ppc64-softmmu.mak
+++ b/default-configs/ppc64-softmmu.mak
@@ -44,3 +44,5 @@ CONFIG_PSERIES=$(CONFIG_FDT)
 CONFIG_E500=$(CONFIG_FDT)
 # For pSeries
 CONFIG_PCI_HOTPLUG=y
+# For PReP
+CONFIG_MC146818RTC=y

diff --git a/default-configs/ppcemb-softmmu.mak b/default-configs/ppcemb-softmmu.mak
index 806adfd3fe8c7065ff98aa0eebfaa6fbd2351f02..9d8c5c774221c9739997584ca79b89433069ca1f 100644 (file)
--- a/default-configs/ppcemb-softmmu.mak
+++ b/default-configs/ppcemb-softmmu.mak
@@ -36,3 +36,5 @@ CONFIG_PTIMER=y
 CONFIG_I8259=y
 CONFIG_XILINX=y
 CONFIG_E500=$(CONFIG_FDT)
+# For PReP
+CONFIG_MC146818RTC=y

diff --git a/default-configs/sparc64-softmmu.mak b/default-configs/sparc64-softmmu.mak
index 2145b6b29f4232e066ada1ecb79f4c15e096b8b9..3b3dc55cbd907b6dfe8fb0f73364d37916bd60fb 100644 (file)
--- a/default-configs/sparc64-softmmu.mak
+++ b/default-configs/sparc64-softmmu.mak
@@ -13,3 +13,4 @@ CONFIG_PCKBD=y
 CONFIG_FDC=y
 CONFIG_IDE_ISA=y
 CONFIG_IDE_CMD646=y
+CONFIG_MC146818RTC=y

diff --git a/default-configs/x86_64-softmmu.mak b/default-configs/x86_64-softmmu.mak
index 0e5ab554e5b0de094704be053f6ae7e554408daf..72f9bc72afc3d266c70aa95b59d10bffccbdd79d 100644 (file)
--- a/default-configs/x86_64-softmmu.mak
+++ b/default-configs/x86_64-softmmu.mak
@@ -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

diff --git a/hw/alpha/Makefile.objs b/hw/alpha/Makefile.objs
index db868d2ea69fc64be34f58127b82994729ed6d7b..5dfea7aaa1f0b98724bf1ea7e0d7ba042d56e918 100644 (file)
--- 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 5559a8ba5c70d597f414c65d7732d95f5f4b4b13..80132d8f40cb3e45757f1a68941f3352524f9461 100644 (file)
--- 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 1e3bca1c373785a3bf5542eb99a2e261e5a87080..e173a2d793d66c95990ea03d92f58db21ab2adfe 100644 (file)
--- 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 f5e04e80ff16215ee1ea7ec4f9dd0d19c540fdbf..bfc90012fd08e20ea3f446585ed00e3a2c2c87eb 100644 (file)
--- 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 ef1d9edc1a7c6c2aa125c2a0d7ce3c5f5f10fc84..b22a6f1ce41c456d83899f021b45fe2442be49c2 100644 (file)
--- 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 4df0d90ec24cdacc3a294751839bd39c7909dbe6..178464ba5466c6016eb62de58819185e9ebf997d 100644 (file)
--- 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 12781dd2a3a9973864da54e13600b58e382c38e4..a1ef26cf34bf003b161ecfa2f514f3cd78443e41 100644 (file)
--- 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
similarity index 100%
rename from hw/mc146818rtc.c
rename to hw/timer/mc146818rtc.c