Skip to content

Commit

Permalink
hw: move MC146818RTC to hw/timer/, configure via default-configs/
Browse files Browse the repository at this point in the history 
Signed-off-by: Paolo Bonzini <[email protected]>
  • Loading branch information
@bonzini
bonzini committed Apr 8, 2013
1 parent a100107 commit 0ddfaf7
Show file tree
Hide file tree
Showing 20 changed files with 18 additions and 9 deletions.
1 change: 1 addition & 0 deletions default-configs/alpha-softmmu.mak
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,4 @@ CONFIG_IDE_QDEV=y
CONFIG_VMWARE_VGA=y
CONFIG_IDE_CMD646=y
CONFIG_I8259=y
CONFIG_MC146818RTC=y
1 change: 1 addition & 0 deletions default-configs/i386-softmmu.mak
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 1 addition & 0 deletions default-configs/mips-softmmu.mak
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,3 +32,4 @@ CONFIG_PFLASH_CFI01=y
CONFIG_G364FB=y
CONFIG_I8259=y
CONFIG_JAZZ_LED=y
CONFIG_MC146818RTC=y
1 change: 1 addition & 0 deletions default-configs/mips64-softmmu.mak
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,3 +32,4 @@ CONFIG_PFLASH_CFI01=y
CONFIG_G364FB=y
CONFIG_I8259=y
CONFIG_JAZZ_LED=y
CONFIG_MC146818RTC=y
1 change: 1 addition & 0 deletions default-configs/mips64el-softmmu.mak
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,3 +34,4 @@ CONFIG_FULONG=y
CONFIG_G364FB=y
CONFIG_I8259=y
CONFIG_JAZZ_LED=y
CONFIG_MC146818RTC=y
1 change: 1 addition & 0 deletions default-configs/mipsel-softmmu.mak
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,3 +32,4 @@ CONFIG_PFLASH_CFI01=y
CONFIG_G364FB=y
CONFIG_I8259=y
CONFIG_JAZZ_LED=y
CONFIG_MC146818RTC=y
1 change: 1 addition & 0 deletions default-configs/moxie-softmmu.mak
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# Default configuration for moxie-softmmu

CONFIG_MC146818RTC=y
CONFIG_SERIAL=y
CONFIG_VGA=y
2 changes: 2 additions & 0 deletions default-configs/ppc-softmmu.mak
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,3 +41,5 @@ CONFIG_PTIMER=y
CONFIG_I8259=y
CONFIG_XILINX=y
CONFIG_E500=$(CONFIG_FDT)
# For PReP
CONFIG_MC146818RTC=y
2 changes: 2 additions & 0 deletions default-configs/ppc64-softmmu.mak
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,3 +44,5 @@ CONFIG_PSERIES=$(CONFIG_FDT)
CONFIG_E500=$(CONFIG_FDT)
# For pSeries
CONFIG_PCI_HOTPLUG=y
# For PReP
CONFIG_MC146818RTC=y
2 changes: 2 additions & 0 deletions default-configs/ppcemb-softmmu.mak
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,3 +36,5 @@ CONFIG_PTIMER=y
CONFIG_I8259=y
CONFIG_XILINX=y
CONFIG_E500=$(CONFIG_FDT)
# For PReP
CONFIG_MC146818RTC=y
1 change: 1 addition & 0 deletions default-configs/sparc64-softmmu.mak
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,4 @@ CONFIG_PCKBD=y
CONFIG_FDC=y
CONFIG_IDE_ISA=y
CONFIG_IDE_CMD646=y
CONFIG_MC146818RTC=y
1 change: 1 addition & 0 deletions default-configs/x86_64-softmmu.mak
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 0 additions & 1 deletion hw/alpha/Makefile.objs
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
obj-y = mc146818rtc.o
obj-y += alpha_typhoon.o

obj-y := $(addprefix ../,$(obj-y))
Expand Down
1 change: 0 additions & 1 deletion hw/i386/Makefile.objs
View file
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion hw/mips/Makefile.objs
View file
Original file line number Diff line number Diff line change
@@ -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))
Expand Down
3 changes: 0 additions & 3 deletions hw/moxie/Makefile.objs
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,2 @@
# moxie boards
obj-y = mc146818rtc.o

obj-y := $(addprefix ../,$(obj-y))
obj-y += moxiesim.o
2 changes: 0 additions & 2 deletions hw/ppc/Makefile.objs
View file
Original file line number Diff line number Diff line change
@@ -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
Expand Down
1 change: 0 additions & 1 deletion hw/sparc64/Makefile.objs
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
obj-y = apb_pci.o
obj-y += mc146818rtc.o

obj-y := $(addprefix ../,$(obj-y))

Expand Down
2 changes: 2 additions & 0 deletions hw/timer/Makefile.objs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
0 hw/mc146818rtc.c → hw/timer/mc146818rtc.c
View file
File renamed without changes.

0 comments on commit 0ddfaf7

Please sign in to comment.