Kconfig: Convert CONFIG_RTC_MC146818 to Kconfig

Move this option to Kconfig and tidy up the two boards which use it.

Signed-off-by: Simon Glass <sjg@chromium.org>

diff --git a/configs/edison_defconfig b/configs/edison_defconfig
index f0f3449464cfdae3966e5f486c1605c5dd014896..eb9f9a089f193e486174c8c1f5e4d950f75f6b58 100644 (file)
--- a/configs/edison_defconfig
+++ b/configs/edison_defconfig
@@ -33,6 +33,7 @@ CONFIG_CPU=y
 CONFIG_DFU_MMC=y
 CONFIG_DFU_RAM=y
 CONFIG_DM_PCI_COMPAT=y
+CONFIG_RTC_MC146818=y
 CONFIG_USB_DWC3_GADGET=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_MANUFACTURER="Intel"

diff --git a/configs/malta64_defconfig b/configs/malta64_defconfig
index c509581ee8099e9845c0c2255a7feff4e52cb105..995032601152787557448300bd9f794f423c1731 100644 (file)
--- a/configs/malta64_defconfig
+++ b/configs/malta64_defconfig
@@ -23,4 +23,5 @@ CONFIG_DEFAULT_DEVICE_TREE="mti,malta"
 CONFIG_ENV_IS_IN_FLASH=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_PCI=y
+CONFIG_RTC_MC146818=y
 CONFIG_SYS_NS16550=y

diff --git a/configs/malta64el_defconfig b/configs/malta64el_defconfig
index 992c855579d34c3b5f57ada91e9a9e0bbf748f20..63989ce2888807f7712b071c74b731826e8fd4c0 100644 (file)
--- a/configs/malta64el_defconfig
+++ b/configs/malta64el_defconfig
@@ -24,4 +24,5 @@ CONFIG_DEFAULT_DEVICE_TREE="mti,malta"
 CONFIG_ENV_IS_IN_FLASH=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_PCI=y
+CONFIG_RTC_MC146818=y
 CONFIG_SYS_NS16550=y

diff --git a/configs/malta_defconfig b/configs/malta_defconfig
index 585440584ee8c2441390467a62a16c21baab743c..8265daec8e788d74e4541f215fd5c9a1f2246532 100644 (file)
--- a/configs/malta_defconfig
+++ b/configs/malta_defconfig
@@ -22,4 +22,5 @@ CONFIG_DEFAULT_DEVICE_TREE="mti,malta"
 CONFIG_ENV_IS_IN_FLASH=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_PCI=y
+CONFIG_RTC_MC146818=y
 CONFIG_SYS_NS16550=y

diff --git a/configs/maltael_defconfig b/configs/maltael_defconfig
index 9cba7229f1a910e9c1da9855196f26b987a8ef26..c9c4c8fd4bdde15a64699d7e317e903fe9530aa6 100644 (file)
--- a/configs/maltael_defconfig
+++ b/configs/maltael_defconfig
@@ -23,4 +23,5 @@ CONFIG_DEFAULT_DEVICE_TREE="mti,malta"
 CONFIG_ENV_IS_IN_FLASH=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_PCI=y
+CONFIG_RTC_MC146818=y
 CONFIG_SYS_NS16550=y

diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig
index 54365092ec4ae805415e7f257e7c59fcc1a15d2b..97cf7d84dfac0e29536df7240fa705c3fff40a46 100644 (file)
--- a/drivers/rtc/Kconfig
+++ b/drivers/rtc/Kconfig
@@ -68,4 +68,12 @@ config RTC_S35392A
        help
          Enable s35392a driver which provides rtc get and set function.
 
+config RTC_MC146818
+       bool "Enable MC146818 driver"
+       help
+         This is a widely used real-time clock chip originally by Motorola
+         and now available from NXP. It includes a battery-backed real-time
+         clock with a wide array of features and 50 bytes of general-purpose,
+         battery-backed RAM. The driver supports access to the clock and RAM.
+
 endmenu

diff --git a/include/configs/edison.h b/include/configs/edison.h
index 476f5e38b4bbbdecdfe2c092e248ca9794f022a6..86c584d73dc528f5cb89da21150488508e40ac50 100644 (file)
--- a/include/configs/edison.h
+++ b/include/configs/edison.h
@@ -48,6 +48,5 @@
 
 /* RTC */
 #define CONFIG_SYS_ISA_IO_BASE_ADDRESS 0
-#define CONFIG_RTC_MC146818
 
 #endif

diff --git a/include/configs/malta.h b/include/configs/malta.h
index ba3639d177e60556fca43ed0beb0e8d3ac050008..520b9870601a51ba20587e8da5db67cc6cb3cc57 100644 (file)
--- a/include/configs/malta.h
+++ b/include/configs/malta.h
@@ -19,7 +19,6 @@
 #define CONFIG_PCNET_79C973
 #define PCNET_HAS_PROM
 
-#define CONFIG_RTC_MC146818
 #define CONFIG_SYS_ISA_IO_BASE_ADDRESS 0
 
 /*

diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index e805b1e6b36c03fc5a98d6422fada5ff84b5bb4a..b85c35b7af3174052ec7d67e9272969b0be04049 100644 (file)
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -1673,7 +1673,6 @@ CONFIG_RTC_IMXDI
 CONFIG_RTC_M41T11
 CONFIG_RTC_M41T62
 CONFIG_RTC_MC13XXX
-CONFIG_RTC_MC146818
 CONFIG_RTC_MCFRRTC
 CONFIG_RTC_MCP79411
 CONFIG_RTC_MXS