Message ID | 20191003230404.19384-11-philmd@redhat.com |
---|---|
State | New |
Headers | show |
Series | hw: Split RTC devices from hw/timer/ to hw/rtc/ | expand |
Le 04/10/2019 à 01:04, Philippe Mathieu-Daudé a écrit : > Move RTC devices under the hw/rtc/ subdirectory. > > Reviewed-by: Alistair Francis <alistair.francis@wdc.com> > Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> > --- > hw/rtc/Makefile.objs | 1 + > hw/{timer => rtc}/exynos4210_rtc.c | 0 > hw/timer/Makefile.objs | 1 - > 3 files changed, 1 insertion(+), 1 deletion(-) > rename hw/{timer => rtc}/exynos4210_rtc.c (100%) > > diff --git a/hw/rtc/Makefile.objs b/hw/rtc/Makefile.objs > index 543a550a0f..3d4763fc26 100644 > --- a/hw/rtc/Makefile.objs > +++ b/hw/rtc/Makefile.objs > @@ -7,5 +7,6 @@ endif > common-obj-$(CONFIG_PL031) += pl031.o > common-obj-$(CONFIG_TWL92230) += twl92230.o > common-obj-$(CONFIG_XLNX_ZYNQMP) += xlnx-zynqmp-rtc.o > +common-obj-$(CONFIG_EXYNOS4) += exynos4210_rtc.o > obj-$(CONFIG_MC146818RTC) += mc146818rtc.o > common-obj-$(CONFIG_SUN4V_RTC) += sun4v-rtc.o > diff --git a/hw/timer/exynos4210_rtc.c b/hw/rtc/exynos4210_rtc.c > similarity index 100% > rename from hw/timer/exynos4210_rtc.c > rename to hw/rtc/exynos4210_rtc.c > diff --git a/hw/timer/Makefile.objs b/hw/timer/Makefile.objs > index 294465ef47..33191d74cb 100644 > --- a/hw/timer/Makefile.objs > +++ b/hw/timer/Makefile.objs > @@ -19,7 +19,6 @@ common-obj-$(CONFIG_NRF51_SOC) += nrf51_timer.o > common-obj-$(CONFIG_ALTERA_TIMER) += altera_timer.o > common-obj-$(CONFIG_EXYNOS4) += exynos4210_mct.o > common-obj-$(CONFIG_EXYNOS4) += exynos4210_pwm.o > -common-obj-$(CONFIG_EXYNOS4) += exynos4210_rtc.o > common-obj-$(CONFIG_OMAP) += omap_gptimer.o > common-obj-$(CONFIG_OMAP) += omap_synctimer.o > common-obj-$(CONFIG_PXA2XX) += pxa2xx_timer.o > Applied to my trivial-patches branch. Thanks, Laurent
diff --git a/hw/rtc/Makefile.objs b/hw/rtc/Makefile.objs index 543a550a0f..3d4763fc26 100644 --- a/hw/rtc/Makefile.objs +++ b/hw/rtc/Makefile.objs @@ -7,5 +7,6 @@ endif common-obj-$(CONFIG_PL031) += pl031.o common-obj-$(CONFIG_TWL92230) += twl92230.o common-obj-$(CONFIG_XLNX_ZYNQMP) += xlnx-zynqmp-rtc.o +common-obj-$(CONFIG_EXYNOS4) += exynos4210_rtc.o obj-$(CONFIG_MC146818RTC) += mc146818rtc.o common-obj-$(CONFIG_SUN4V_RTC) += sun4v-rtc.o diff --git a/hw/timer/exynos4210_rtc.c b/hw/rtc/exynos4210_rtc.c similarity index 100% rename from hw/timer/exynos4210_rtc.c rename to hw/rtc/exynos4210_rtc.c diff --git a/hw/timer/Makefile.objs b/hw/timer/Makefile.objs index 294465ef47..33191d74cb 100644 --- a/hw/timer/Makefile.objs +++ b/hw/timer/Makefile.objs @@ -19,7 +19,6 @@ common-obj-$(CONFIG_NRF51_SOC) += nrf51_timer.o common-obj-$(CONFIG_ALTERA_TIMER) += altera_timer.o common-obj-$(CONFIG_EXYNOS4) += exynos4210_mct.o common-obj-$(CONFIG_EXYNOS4) += exynos4210_pwm.o -common-obj-$(CONFIG_EXYNOS4) += exynos4210_rtc.o common-obj-$(CONFIG_OMAP) += omap_gptimer.o common-obj-$(CONFIG_OMAP) += omap_synctimer.o common-obj-$(CONFIG_PXA2XX) += pxa2xx_timer.o