diff options
| author | Philippe Mathieu-Daudé <philmd@redhat.com> | 2019-10-04 01:03:55 +0200 |
|---|---|---|
| committer | Laurent Vivier <laurent@vivier.eu> | 2019-10-24 20:22:12 +0200 |
| commit | de04c31d31c229220d731462380a4255e7936374 (patch) | |
| tree | a5bb5da293d28953f6c29a3ac0ec2d9f476acf66 /hw | |
| parent | 819ce6b2a598b5c5c6866a3a6d1acb5261592f8a (diff) | |
hw: Move M41T80 device from hw/timer/ to hw/rtc/ subdirectory
The M41T80 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>
Message-Id: <20191003230404.19384-6-philmd@redhat.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/rtc/Kconfig | 4 | ||||
| -rw-r--r-- | hw/rtc/Makefile.objs | 1 | ||||
| -rw-r--r-- | hw/rtc/m41t80.c (renamed from hw/timer/m41t80.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 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 index 914ecac8f4..914ecac8f4 100644 --- a/hw/timer/m41t80.c +++ b/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 |