| Message ID | 20191003230404.19384-9-philmd@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | hw: Split RTC devices from hw/timer/ to hw/rtc/ | expand |
Le 04/10/2019 à 01:03, Philippe Mathieu-Daudé a écrit : > The DS1338 is a Real Time Clock, not a timer. > Move it under the hw/rtc/ subdirectory. > > Reviewed-by: Alistair Francis <alistair.francis@wdc.com> > Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> > --- > hw/rtc/Kconfig | 4 ++++ > hw/rtc/Makefile.objs | 1 + > hw/{timer => rtc}/ds1338.c | 0 > hw/timer/Kconfig | 4 ---- > hw/timer/Makefile.objs | 1 - > 5 files changed, 5 insertions(+), 5 deletions(-) > rename hw/{timer => rtc}/ds1338.c (100%) > > diff --git a/hw/rtc/Kconfig b/hw/rtc/Kconfig > index dff9d60946..45daa8d655 100644 > --- a/hw/rtc/Kconfig > +++ b/hw/rtc/Kconfig > @@ -1,3 +1,7 @@ > +config DS1338 > + bool > + depends on I2C > + > config M41T80 > bool > depends on I2C > diff --git a/hw/rtc/Makefile.objs b/hw/rtc/Makefile.objs > index 810a38ee7b..b195863291 100644 > --- a/hw/rtc/Makefile.objs > +++ b/hw/rtc/Makefile.objs > @@ -1,3 +1,4 @@ > +common-obj-$(CONFIG_DS1338) += ds1338.o > common-obj-$(CONFIG_M41T80) += m41t80.o > common-obj-$(CONFIG_M48T59) += m48t59.o > ifeq ($(CONFIG_ISA_BUS),y) > diff --git a/hw/timer/ds1338.c b/hw/rtc/ds1338.c > similarity index 100% > rename from hw/timer/ds1338.c > rename to hw/rtc/ds1338.c > diff --git a/hw/timer/Kconfig b/hw/timer/Kconfig > index 9357875f28..a990f9fe35 100644 > --- a/hw/timer/Kconfig > +++ b/hw/timer/Kconfig > @@ -9,10 +9,6 @@ config ARM_MPTIMER > config A9_GTIMER > bool > > -config DS1338 > - bool > - depends on I2C > - > config HPET > bool > default y if PC > diff --git a/hw/timer/Makefile.objs b/hw/timer/Makefile.objs > index 23be70b71d..70b61b69c7 100644 > --- a/hw/timer/Makefile.objs > +++ b/hw/timer/Makefile.objs > @@ -3,7 +3,6 @@ common-obj-$(CONFIG_ARM_MPTIMER) += arm_mptimer.o > common-obj-$(CONFIG_ARM_V7M) += armv7m_systick.o > common-obj-$(CONFIG_A9_GTIMER) += a9gtimer.o > common-obj-$(CONFIG_CADENCE) += cadence_ttc.o > -common-obj-$(CONFIG_DS1338) += ds1338.o > common-obj-$(CONFIG_HPET) += hpet.o > common-obj-$(CONFIG_I8254) += i8254_common.o i8254.o > common-obj-$(CONFIG_PUV3) += puv3_ost.o > Applied to my trivial-patches branch. Thanks, Laurent
diff --git a/hw/rtc/Kconfig b/hw/rtc/Kconfig index dff9d60946..45daa8d655 100644 --- a/hw/rtc/Kconfig +++ b/hw/rtc/Kconfig @@ -1,3 +1,7 @@ +config DS1338 + bool + depends on I2C + config M41T80 bool depends on I2C diff --git a/hw/rtc/Makefile.objs b/hw/rtc/Makefile.objs index 810a38ee7b..b195863291 100644 --- a/hw/rtc/Makefile.objs +++ b/hw/rtc/Makefile.objs @@ -1,3 +1,4 @@ +common-obj-$(CONFIG_DS1338) += ds1338.o common-obj-$(CONFIG_M41T80) += m41t80.o common-obj-$(CONFIG_M48T59) += m48t59.o ifeq ($(CONFIG_ISA_BUS),y) diff --git a/hw/timer/ds1338.c b/hw/rtc/ds1338.c similarity index 100% rename from hw/timer/ds1338.c rename to hw/rtc/ds1338.c diff --git a/hw/timer/Kconfig b/hw/timer/Kconfig index 9357875f28..a990f9fe35 100644 --- a/hw/timer/Kconfig +++ b/hw/timer/Kconfig @@ -9,10 +9,6 @@ config ARM_MPTIMER config A9_GTIMER bool -config DS1338 - bool - depends on I2C - config HPET bool default y if PC diff --git a/hw/timer/Makefile.objs b/hw/timer/Makefile.objs index 23be70b71d..70b61b69c7 100644 --- a/hw/timer/Makefile.objs +++ b/hw/timer/Makefile.objs @@ -3,7 +3,6 @@ common-obj-$(CONFIG_ARM_MPTIMER) += arm_mptimer.o common-obj-$(CONFIG_ARM_V7M) += armv7m_systick.o common-obj-$(CONFIG_A9_GTIMER) += a9gtimer.o common-obj-$(CONFIG_CADENCE) += cadence_ttc.o -common-obj-$(CONFIG_DS1338) += ds1338.o common-obj-$(CONFIG_HPET) += hpet.o common-obj-$(CONFIG_I8254) += i8254_common.o i8254.o common-obj-$(CONFIG_PUV3) += puv3_ost.o