[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 13/19] hw: Move DS1338 device from hw/timer/ to hw/rtc/ subdirecto
From: |
Laurent Vivier |
Subject: |
[PULL 13/19] hw: Move DS1338 device from hw/timer/ to hw/rtc/ subdirectory |
Date: |
Fri, 25 Oct 2019 10:35:05 +0200 |
From: Philippe Mathieu-Daudé <address@hidden>
The DS1338 is a Real Time Clock, not a timer.
Move it under the hw/rtc/ subdirectory.
Reviewed-by: Alistair Francis <address@hidden>
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
Acked-by: Peter Maydell <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Laurent Vivier <address@hidden>
---
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 dff9d60946af..45daa8d655c9 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 810a38ee7b3d..b195863291d1 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 9357875f285d..a990f9fe35fc 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 23be70b71d32..70b61b69c7a4 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
--
2.21.0
- [PULL 04/19] event_notifier: avoid dandling file descriptor in event_notifier_cleanup, (continued)
- [PULL 04/19] event_notifier: avoid dandling file descriptor in event_notifier_cleanup, Laurent Vivier, 2019/10/25
- [PULL 03/19] util/async: avoid useless cast, Laurent Vivier, 2019/10/25
- [PULL 06/19] hw/timer: Compile devices not target-dependent as common object, Laurent Vivier, 2019/10/25
- [PULL 02/19] pci_bridge: fix a typo in comment, Laurent Vivier, 2019/10/25
- [PULL 01/19] qemu-options.hx: Update for reboot-timeout parameter, Laurent Vivier, 2019/10/25
- [PULL 07/19] hw: Move PL031 device from hw/timer/ to hw/rtc/ subdirectory, Laurent Vivier, 2019/10/25
- [PULL 05/19] qemu-timer: reuse MIN macro in qemu_timeout_ns_to_ms, Laurent Vivier, 2019/10/25
- [PULL 10/19] hw: Move M41T80 device from hw/timer/ to hw/rtc/ subdirectory, Laurent Vivier, 2019/10/25
- [PULL 15/19] hw: Move Exynos4210 RTC from hw/timer/ to hw/rtc/ subdirectory, Laurent Vivier, 2019/10/25
- [PULL 11/19] hw: Move sun4v hypervisor RTC from hw/timer/ to hw/rtc/ subdirectory, Laurent Vivier, 2019/10/25
- [PULL 13/19] hw: Move DS1338 device from hw/timer/ to hw/rtc/ subdirectory,
Laurent Vivier <=
- [PULL 18/19] hw/rtc/xlnx-zynqmp-rtc: Remove unused "ptimer.h" include, Laurent Vivier, 2019/10/25
- [PULL 17/19] hw/rtc/mc146818: Include mc146818rtc_regs.h a bit less, Laurent Vivier, 2019/10/25
- [PULL 08/19] hw: Move MC146818 device from hw/timer/ to hw/rtc/ subdirectory, Laurent Vivier, 2019/10/25
- [PULL 14/19] hw: Move Xilinx ZynqMP RTC from hw/timer/ to hw/rtc/ subdirectory, Laurent Vivier, 2019/10/25
- [PULL 12/19] hw: Move TWL92230 device from hw/timer/ to hw/rtc/ subdirectory, Laurent Vivier, 2019/10/25
- [PULL 16/19] hw: Move Aspeed RTC from hw/timer/ to hw/rtc/ subdirectory, Laurent Vivier, 2019/10/25
- [PULL 09/19] hw: Move M48T59 device from hw/timer/ to hw/rtc/ subdirectory, Laurent Vivier, 2019/10/25
- [PULL 19/19] hw/rtc/aspeed_rtc: Remove unused includes, Laurent Vivier, 2019/10/25
- Re: [PULL 00/19] Trivial branch patches, Peter Maydell, 2019/10/25