Difuse/u-boot
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Convert CONFIG_MCFRTC et al to Kconfig

Browse source 
This converts the following to Kconfig:
   CONFIG_MCFRTC
   CONFIG_SYS_MCFRTC_BASE

While at it, remove '#undef RTC_DEBUG' from these config files.

Signed-off-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
Tom Rini 2022-03-23 17:19:51 -04:00
parent b7872641a8
commit 3c205a6e4a
13 changed files with 18 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
arch/m68k/include/asm/immap.h
View file

@ -225,8 +225,6 @@
#define CONFIG_SYS_FEC1_IOBASE (MMAP_FEC1) #define CONFIG_SYS_FEC1_IOBASE (MMAP_FEC1)
#define CONFIG_SYS_UART_BASE (MMAP_UART0 + (CONFIG_SYS_UART_PORT * 0x4000)) #define CONFIG_SYS_UART_BASE (MMAP_UART0 + (CONFIG_SYS_UART_PORT * 0x4000))
#define CONFIG_SYS_MCFRTC_BASE (MMAP_RTC)
/* Timer */ /* Timer */
#ifdef CONFIG_MCFTMR #ifdef CONFIG_MCFTMR
#define CONFIG_SYS_UDELAY_BASE (MMAP_DTMR0) #define CONFIG_SYS_UDELAY_BASE (MMAP_DTMR0)
@ -249,7 +247,6 @@
#define CONFIG_SYS_FEC0_IOBASE (MMAP_FEC) #define CONFIG_SYS_FEC0_IOBASE (MMAP_FEC)
#define CONFIG_SYS_UART_BASE (MMAP_UART0 + (CONFIG_SYS_UART_PORT * 0x4000)) #define CONFIG_SYS_UART_BASE (MMAP_UART0 + (CONFIG_SYS_UART_PORT * 0x4000))
#define CONFIG_SYS_MCFRTC_BASE (MMAP_RTC)
/* Timer */ /* Timer */
#ifdef CONFIG_MCFTMR #ifdef CONFIG_MCFTMR
@ -283,7 +280,6 @@
#endif #endif
#define MMAP_DSPI MMAP_DSPI0 #define MMAP_DSPI MMAP_DSPI0
#define CONFIG_SYS_MCFRTC_BASE (MMAP_RTC)
/* Timer */ /* Timer */
#ifdef CONFIG_MCFTMR #ifdef CONFIG_MCFTMR

2
configs/M53017EVB_defconfig
View file

@ -39,4 +39,6 @@ CONFIG_SYS_FLASH_CFI=y
CONFIG_DM_ETH=y CONFIG_DM_ETH=y
CONFIG_MCFFEC=y CONFIG_MCFFEC=y
CONFIG_MII=y CONFIG_MII=y
CONFIG_MCFRTC=y
CONFIG_SYS_MCFRTC_BASE=0xFC0A8000
CONFIG_MCFUART=y CONFIG_MCFUART=y

2
configs/M5329AFEE_defconfig
View file

@ -41,4 +41,6 @@ CONFIG_MTD_RAW_NAND=y
CONFIG_DM_ETH=y CONFIG_DM_ETH=y
CONFIG_MCFFEC=y CONFIG_MCFFEC=y
CONFIG_MII=y CONFIG_MII=y
CONFIG_MCFRTC=y
CONFIG_SYS_MCFRTC_BASE=0xFC0A8000
CONFIG_MCFUART=y CONFIG_MCFUART=y

2
configs/M5329BFEE_defconfig
View file

@ -41,4 +41,6 @@ CONFIG_MTD_RAW_NAND=y
CONFIG_DM_ETH=y CONFIG_DM_ETH=y
CONFIG_MCFFEC=y CONFIG_MCFFEC=y
CONFIG_MII=y CONFIG_MII=y
CONFIG_MCFRTC=y
CONFIG_SYS_MCFRTC_BASE=0xFC0A8000
CONFIG_MCFUART=y CONFIG_MCFUART=y

2
configs/M5373EVB_defconfig
View file

@ -41,4 +41,6 @@ CONFIG_MTD_RAW_NAND=y
CONFIG_DM_ETH=y CONFIG_DM_ETH=y
CONFIG_MCFFEC=y CONFIG_MCFFEC=y
CONFIG_MII=y CONFIG_MII=y
CONFIG_MCFRTC=y
CONFIG_SYS_MCFRTC_BASE=0xFC0A8000
CONFIG_MCFUART=y CONFIG_MCFUART=y

2
configs/astro_mcf5373l_defconfig
View file

@ -40,5 +40,7 @@ CONFIG_FLASH_CFI_DRIVER=y
CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
CONFIG_SYS_FLASH_PROTECTION=y CONFIG_SYS_FLASH_PROTECTION=y
CONFIG_SYS_FLASH_CFI=y CONFIG_SYS_FLASH_CFI=y
CONFIG_MCFRTC=y
CONFIG_SYS_MCFRTC_BASE=0xFC0A8000
CONFIG_MCFUART=y CONFIG_MCFUART=y
CONFIG_WATCHDOG=y CONFIG_WATCHDOG=y

8
drivers/rtc/Kconfig
View file

@ -168,6 +168,14 @@ config RTC_MC146818
clock with a wide array of features and 50 bytes of general-purpose, 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. battery-backed RAM. The driver supports access to the clock and RAM.
config MCFRTC
bool "Use common CF RTC driver"
depends on M68K
config SYS_MCFRTC_BASE
hex "Base address for RTC in immap.h"
depends on MCFRTC
config RTC_M41T62 config RTC_M41T62
bool "Enable M41T62 driver" bool "Enable M41T62 driver"
help help

4
drivers/rtc/mcfrtc.c
View file

@ -13,10 +13,6 @@
#undef RTC_DEBUG #undef RTC_DEBUG
#ifndef CONFIG_SYS_MCFRTC_BASE
#error RTC_BASE is not defined!
#endif
#define isleap(y) ((((y) % 4) == 0 && ((y) % 100) != 0) || ((y) % 400) == 0) #define isleap(y) ((((y) % 4) == 0 && ((y) % 100) != 0) || ((y) % 400) == 0)
#define STARTOFTIME 1970 #define STARTOFTIME 1970

2
include/configs/M53017EVB.h
View file

@ -36,8 +36,6 @@
# endif /* CONFIG_SYS_DISCOVER_PHY */ # endif /* CONFIG_SYS_DISCOVER_PHY */
#endif #endif
#define CONFIG_MCFRTC
#undef RTC_DEBUG
#define CONFIG_SYS_RTC_CNT (0x8000) #define CONFIG_SYS_RTC_CNT (0x8000)
#define CONFIG_SYS_RTC_SETUP (RTC_OCEN_OSCBYP | RTC_OCEN_CLKEN) #define CONFIG_SYS_RTC_SETUP (RTC_OCEN_OSCBYP | RTC_OCEN_CLKEN)

3
include/configs/M5329EVB.h
View file

@ -33,9 +33,6 @@
# endif /* CONFIG_SYS_DISCOVER_PHY */ # endif /* CONFIG_SYS_DISCOVER_PHY */
#endif #endif
#define CONFIG_MCFRTC
#undef RTC_DEBUG
/* I2C */ /* I2C */
#ifdef CONFIG_MCFFEC #ifdef CONFIG_MCFFEC

3
include/configs/M5373EVB.h
View file

@ -35,9 +35,6 @@
# endif /* CONFIG_SYS_DISCOVER_PHY */ # endif /* CONFIG_SYS_DISCOVER_PHY */
#endif #endif
#define CONFIG_MCFRTC
#undef RTC_DEBUG
/* I2C */ /* I2C */
#ifdef CONFIG_MCFFEC #ifdef CONFIG_MCFFEC

3
include/configs/astro_mcf5373l.h
View file

@ -51,9 +51,6 @@
#define ENABLE_JFFS 1 #define ENABLE_JFFS 1
#endif #endif
#define CONFIG_MCFRTC
#undef RTC_DEBUG
/* I2C */ /* I2C */
/* /*

1
include/configs/stmark2.h
View file

@ -35,7 +35,6 @@
"" ""
/* Realtime clock */ /* Realtime clock */
#undef CONFIG_MCFRTC
#define CONFIG_RTC_MCFRRTC #define CONFIG_RTC_MCFRRTC
#define CONFIG_SYS_MCFRRTC_BASE 0xFC0A8000 #define CONFIG_SYS_MCFRRTC_BASE 0xFC0A8000