diff options
| author | Philippe Mathieu-Daudé | 2019-10-04 01:03:58 +0200 |
|---|---|---|
| committer | Laurent Vivier | 2019-10-24 20:26:35 +0200 |
| commit | 64e85ffde832120be59f1621d2d1f34de2e347bd (patch) | |
| tree | 55f0f2e214846dbb8f0958100543789af31760cc | |
| parent | hw: Move TWL92230 device from hw/timer/ to hw/rtc/ subdirectory (diff) | |
| download | qemu-64e85ffde832120be59f1621d2d1f34de2e347bd.tar.gz qemu-64e85ffde832120be59f1621d2d1f34de2e347bd.tar.xz qemu-64e85ffde832120be59f1621d2d1f34de2e347bd.zip | |
hw: Move DS1338 device from hw/timer/ to hw/rtc/ subdirectory
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>
Acked-by: Peter Maydell <peter.maydell@linaro.org>
Message-Id: <20191003230404.19384-9-philmd@redhat.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
| -rw-r--r-- | hw/rtc/Kconfig | 4 | ||||
| -rw-r--r-- | hw/rtc/Makefile.objs | 1 | ||||
| -rw-r--r-- | hw/rtc/ds1338.c (renamed from hw/timer/ds1338.c) | 0 | ||||
| -rw-r--r-- | hw/timer/Kconfig | 4 | ||||
| -rw-r--r-- | hw/timer/Makefile.objs | 1 |
5 files changed, 5 insertions, 5 deletions
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 index 588a9ba9be..588a9ba9be 100644 --- a/hw/timer/ds1338.c +++ b/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 |