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 /default-configs | |
parent | a100107d5612ba568c817f22c628b2c9eeb431bf (diff) | |
download | qemu-0ddfaf7fe4c8453446730328bf348b7c6438e4f8.zip qemu-0ddfaf7fe4c8453446730328bf348b7c6438e4f8.tar.gz qemu-0ddfaf7fe4c8453446730328bf348b7c6438e4f8.tar.bz2 |
hw: move MC146818RTC to hw/timer/, configure via default-configs/
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'default-configs')
-rw-r--r-- | default-configs/alpha-softmmu.mak | 1 | ||||
-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/moxie-softmmu.mak | 1 | ||||
-rw-r--r-- | default-configs/ppc-softmmu.mak | 2 | ||||
-rw-r--r-- | default-configs/ppc64-softmmu.mak | 2 | ||||
-rw-r--r-- | default-configs/ppcemb-softmmu.mak | 2 | ||||
-rw-r--r-- | default-configs/sparc64-softmmu.mak | 1 | ||||
-rw-r--r-- | default-configs/x86_64-softmmu.mak | 1 |
12 files changed, 15 insertions, 0 deletions
diff --git a/default-configs/alpha-softmmu.mak b/default-configs/alpha-softmmu.mak index 2dbee94..18e5337 100644 --- 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 7dd0669..2ddf670 100644 --- 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 dff6fef..2b48452 100644 --- 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 0968e5f..5713320 100644 --- 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 6f115d4..096dc80 100644 --- 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 e391cf7..5509f0e 100644 --- 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 0a8194a..1a95476 100644 --- 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 cdf82b1..d9ced3a 100644 --- 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 26f74b0..7d62e14 100644 --- 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 806adfd..9d8c5c7 100644 --- 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 2145b6b..3b3dc55 100644 --- 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 0e5ab55..72f9bc7 100644 --- 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 |