| Message ID | 20181001182249.129565-11-sjg@chromium.org |
|---|---|
| State | Accepted |
| Delegated to: | Simon Glass |
| Headers | show |
| Series | Various fixes and improvements | expand |
Move this option to Kconfig and tidy up the two boards which use it.
Signed-off-by: Simon Glass <sjg@chromium.org>
---
configs/edison_defconfig | 1 +
configs/malta_defconfig | 1 +
drivers/rtc/Kconfig | 8 ++++++++
include/configs/edison.h | 1 -
include/configs/malta.h | 1 -
scripts/config_whitelist.txt | 1 -
6 files changed, 10 insertions(+), 3 deletions(-)
Applied to u-boot-dm
diff --git a/configs/edison_defconfig b/configs/edison_defconfig index f0f3449464c..eb9f9a089f1 100644 --- 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/malta_defconfig b/configs/malta_defconfig index 585440584ee..8265daec8e7 100644 --- 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/drivers/rtc/Kconfig b/drivers/rtc/Kconfig index 54365092ec4..97cf7d84dfa 100644 --- 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 476f5e38b4b..86c584d73dc 100644 --- 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 ba3639d177e..520b9870601 100644 --- 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 96d3f75750b..a588dd12a03 100644 --- 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
Move this option to Kconfig and tidy up the two boards which use it. Signed-off-by: Simon Glass <sjg@chromium.org> --- configs/edison_defconfig | 1 + configs/malta_defconfig | 1 + drivers/rtc/Kconfig | 8 ++++++++ include/configs/edison.h | 1 - include/configs/malta.h | 1 - scripts/config_whitelist.txt | 1 - 6 files changed, 10 insertions(+), 3 deletions(-)