[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-arm] [PATCH 05/13] hw: Move M41T80 device from hw/timer/ to hw/rtc
From: |
Philippe Mathieu-Daudé |
Subject: |
[Qemu-arm] [PATCH 05/13] hw: Move M41T80 device from hw/timer/ to hw/rtc/ subdirectory |
Date: |
Mon, 16 Sep 2019 17:48:39 +0200 |
The M41T80 is a Real Time Clock, not a timer.
Move it under the hw/rtc/ subdirectory.
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
---
MAINTAINERS | 2 +-
hw/rtc/Kconfig | 4 ++++
hw/rtc/Makefile.objs | 1 +
hw/{timer => rtc}/m41t80.c | 0
hw/timer/Kconfig | 4 ----
hw/timer/Makefile.objs | 1 -
6 files changed, 6 insertions(+), 6 deletions(-)
rename hw/{timer => rtc}/m41t80.c (100%)
diff --git a/MAINTAINERS b/MAINTAINERS
index 679b026fe0..fd68b2383a 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1113,7 +1113,7 @@ F: hw/ppc/sam460ex.c
F: hw/ppc/ppc440_pcix.c
F: hw/display/sm501*
F: hw/ide/sii3112.c
-F: hw/timer/m41t80.c
+F: hw/rtc/m41t80.c
F: pc-bios/canyonlands.dt[sb]
F: pc-bios/u-boot-sam460ex-20100605.bin
F: roms/u-boot-sam460ex
diff --git a/hw/rtc/Kconfig b/hw/rtc/Kconfig
index 159c233517..434b20b2b1 100644
--- a/hw/rtc/Kconfig
+++ b/hw/rtc/Kconfig
@@ -1,3 +1,7 @@
+config M41T80
+ bool
+ depends on I2C
+
config M48T59
bool
diff --git a/hw/rtc/Makefile.objs b/hw/rtc/Makefile.objs
index c87f81405e..89e8e48c64 100644
--- a/hw/rtc/Makefile.objs
+++ b/hw/rtc/Makefile.objs
@@ -1,3 +1,4 @@
+common-obj-$(CONFIG_M41T80) += m41t80.o
common-obj-$(CONFIG_M48T59) += m48t59.o
ifeq ($(CONFIG_ISA_BUS),y)
common-obj-$(CONFIG_M48T59) += m48t59-isa.o
diff --git a/hw/timer/m41t80.c b/hw/rtc/m41t80.c
similarity index 100%
rename from hw/timer/m41t80.c
rename to hw/rtc/m41t80.c
diff --git a/hw/timer/Kconfig b/hw/timer/Kconfig
index a57e9b59fc..a6b668b255 100644
--- a/hw/timer/Kconfig
+++ b/hw/timer/Kconfig
@@ -20,10 +20,6 @@ config HPET
config I8254
bool
-config M41T80
- bool
- depends on I2C
-
config TWL92230
bool
depends on I2C
diff --git a/hw/timer/Makefile.objs b/hw/timer/Makefile.objs
index fe2d1fbc40..2fb12162a6 100644
--- a/hw/timer/Makefile.objs
+++ b/hw/timer/Makefile.objs
@@ -6,7 +6,6 @@ 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_M41T80) += m41t80.o
common-obj-$(CONFIG_PUV3) += puv3_ost.o
common-obj-$(CONFIG_TWL92230) += twl92230.o
common-obj-$(CONFIG_XILINX) += xilinx_timer.o
--
2.20.1
- Re: [Qemu-arm] [PATCH 03/13] hw: Move MC146818 device from hw/timer/ to hw/rtc/ subdirectory, (continued)
Re: [Qemu-arm] [Qemu-devel] [PATCH 03/13] hw: Move MC146818 device from hw/timer/ to hw/rtc/ subdirectory, Richard Henderson, 2019/09/17
[Qemu-arm] [PATCH 04/13] hw: Move M48T59 device from hw/timer/ to hw/rtc/ subdirectory, Philippe Mathieu-Daudé, 2019/09/16
[Qemu-arm] [PATCH 05/13] hw: Move M41T80 device from hw/timer/ to hw/rtc/ subdirectory,
Philippe Mathieu-Daudé <=
[Qemu-arm] [PATCH 06/13] hw: Move sun4v hypervisor RTC from hw/timer/ to hw/rtc/ subdirectory, Philippe Mathieu-Daudé, 2019/09/16
[Qemu-arm] [PATCH 07/13] hw: Move TWL92230 device from hw/timer/ to hw/rtc/ subdirectory, Philippe Mathieu-Daudé, 2019/09/16
[Qemu-arm] [PATCH 08/13] hw: Move DS1338 device from hw/timer/ to hw/rtc/ subdirectory, Philippe Mathieu-Daudé, 2019/09/16
[Qemu-arm] [PATCH 09/13] hw: Move Xilinx ZynqMP RTC from hw/timer/ to hw/rtc/ subdirectory, Philippe Mathieu-Daudé, 2019/09/16