arm: at91: wdt: Convert watchdog config to Kconfig
PATCH v2 2/2 arm: at91: wdt: Convert watchdog config to Kconfig
Convert "CONFIG_AT91SAM9_WATCHDOG" to new "CONFIG_WDT_AT91" Kconfig option to support driver model and device tree.
Signed-off-by Prasanthi Chellakumar <[email protected]>
--- README | 3 --- arch/arm/dts/at91sam9260-smartweb.dts | 1 + arch/arm/dts/at91sam9g20-taurus.dts | 1 + arch/arm/mach-at91/spl.c | 2 +- arch/arm/mach-at91/spl_at91.c | 2 +- arch/arm/mach-at91/spl_atmel.c | 2 +- common/board_f.c | 2 +- configs/picosam9g45_defconfig | 2 ++ configs/smartweb_defconfig | 2 ++ configs/taurus_defconfig | 2 ++ doc/README.at91 | 2 +- doc/README.watchdog | 2 +- include/configs/picosam9g45.h | 4 ---- include/configs/smartweb.h | 7 ------- include/configs/taurus.h | 7 ------- scripts/config_whitelist.txt | 2 -- 16 files changed, 14 insertions(+), 29 deletions(-)
README +0 -3
@@ -802,9 +802,6 @@ The following options need to be configured: SoC, then define this variable and provide board specific code for the "hw_watchdog_reset" function. - CONFIG_AT91_HW_WDT_TIMEOUT - specify the timeout in seconds. default 2 seconds. - - Real-Time Clock: When CONFIG_CMD_DATE is selected, the type of the RTC
arch/arm/dts/at91sam9260-smartweb.dts +1 -0
@@ -89,6 +89,7 @@ }; watchdog at fffffd40 { + timeout-sec = <15>; status = "okay"; };
arch/arm/dts/at91sam9g20-taurus.dts +1 -0
@@ -98,6 +98,7 @@ }; watchdog at fffffd40 { + timeout-sec = <15>; status = "okay"; };
arch/arm/mach-at91/spl.c +1 -1
@@ -11,7 +11,7 @@#include <asm/arch/clk.h> #include <spl.h> -#if !defined(CONFIG_AT91SAM9_WATCHDOG ) +#if !defined(CONFIG_WDT_AT91 )void at91_disable_wdt (void ) {struct at91_wdt *wdt = (struct at91_wdt *)ATMEL_BASE_WDT ;
arch/arm/mach-at91/spl_at91.c +1 -1
@@ -76,7 +76,7 @@ void __weak spl_board_init(void)void board_init_f (ulong dummy) {lowlevel_clock_init (); -#if !defined(CONFIG_AT91SAM9_WATCHDOG ) +#if !defined(CONFIG_WDT_AT91 )at91_disable_wdt ();#endif
arch/arm/mach-at91/spl_atmel.c +1 -1
@@ -98,7 +98,7 @@ void board_init_f(ulong dummy)configure_2nd_sram_as_l2_cache ();#endif -#if !defined(CONFIG_AT91SAM9_WATCHDOG ) +#if !defined(CONFIG_WDT_AT91 )/* disable watchdog */ at91_disable_wdt ();#endif
common/board_f.c +1 -1
@@ -89,7 +89,7 @@ static int init_func_watchdog_init(void) {# if defined(CONFIG_HW_WATCHDOG ) && \ (defined(CONFIG_M68K ) || defined(CONFIG_MICROBLAZE ) || \ - defined(CONFIG_SH ) || defined(CONFIG_AT91SAM9_WATCHDOG ) || \ + defined(CONFIG_SH ) || \ defined(CONFIG_DESIGNWARE_WATCHDOG ) || \ defined(CONFIG_IMX_WATCHDOG ))hw_watchdog_init ();
configs/picosam9g45_defconfig +2 -0
@@ -39,3 +39,5 @@ CONFIG_USB_EHCI_HCD=y CONFIG_USB_STORAGE=y CONFIG_LCD=y CONFIG_OF_LIBFDT=y +CONFIG_WDT=y +CONFIG_WDT_AT91=y
configs/smartweb_defconfig +2 -0
@@ -60,3 +60,5 @@ CONFIG_USB_ETHER_ASIX=y CONFIG_USB_ETHER_MCS7830=y CONFIG_SPL_TINY_MEMSET=y # CONFIG_EFI_LOADER is not set +CONFIG_WDT=y +CONFIG_WDT_AT91=y
configs/taurus_defconfig +2 -0
@@ -62,3 +62,5 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x0908 CONFIG_USB_GADGET_PRODUCT_NUM=0x02d2 CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_USE_TINY_PRINTF=y +CONFIG_WDT=y +CONFIG_WDT_AT91=y
doc/README.at91 +1 -1
@@ -171,4 +171,4 @@ III. Watchdog support your code (make sure not to disable it in AT91Bootstrap for instance). In the U-Boot configuration, the AT91 watchdog support is enabled using - the CONFIG_AT91SAM9_WATCHDOG and CONFIG_HW_WATCHDOG options. + the CONFIG_WDT and CONFIG_WDT_AT91 options.
doc/README.watchdog +1 -1
@@ -14,7 +14,7 @@ CONFIG_WATCHDOG_TIMEOUT_MSECS If not given, will default to maximum timeout. This would be 128000 msec for i.mx31/35/5x/6x. -CONFIG_AT91SAM9_WATCHDOG +CONFIG_WDT_AT91 Available for AT91SAM9 to service the watchdog. CONFIG_FTWDT010_WATCHDOG
include/configs/picosam9g45.h +0 -4
@@ -57,10 +57,6 @@*/ #define CONFIG_BOOTP_BOOTFILESIZE -/* Enable the watchdog */ -#define CONFIG_AT91SAM9_WATCHDOG -#define CONFIG_HW_WATCHDOG -/* * Command line configuration. */
include/configs/smartweb.h +0 -7
@@ -112,13 +112,6 @@"root=/dev/nfs ip=dhcp nfsroot=${serverip}:/srv/nfs/rootfs; " \ "dhcp" -/* Enable the watchdog */ -#define CONFIG_AT91SAM9_WATCHDOG -#if !defined(CONFIG_SPL_BUILD ) -#define CONFIG_HW_WATCHDOG -#endif -#define CONFIG_AT91_HW_WDT_TIMEOUT 15 -#if !defined(CONFIG_SPL_BUILD )/* USB configuration */ #define CONFIG_USB_ATMEL
include/configs/taurus.h +0 -7
@@ -85,13 +85,6 @@#define CONFIG_RMII #define CONFIG_AT91_WANTS_COMMON_PHY -#define CONFIG_AT91SAM9_WATCHDOG -#define CONFIG_AT91_HW_WDT_TIMEOUT 15 -#if !defined(CONFIG_SPL_BUILD ) -/* Enable the watchdog */ -#define CONFIG_HW_WATCHDOG -#endif -/* USB */ #if defined(CONFIG_BOARD_TAURUS )#define CONFIG_USB_ATMEL
scripts/config_whitelist.txt +0 -2
@@ -82,11 +82,9 @@ CONFIG_AT91SAM9G20EK_2MMC CONFIG_AT91SAM9G45EKES CONFIG_AT91SAM9G45_LCD_BASE CONFIG_AT91SAM9M10G45EK -CONFIG_AT91SAM9_WATCHDOG CONFIG_AT91_CAN CONFIG_AT91_EFLASH CONFIG_AT91_GPIO_PULLUP -CONFIG_AT91_HW_WDT_TIMEOUT CONFIG_AT91_LED CONFIG_AT91_WANTS_COMMON_PHY CONFIG_ATAPI
Signature · 1 line
2.7.4
PATCH v2 2/2 arm: at91: wdt: Convert watchdog config to Kconfig
Hi Prasanthi,
Quoted 14 lines
Convert "
CONFIG_AT91SAM9_WATCHDOG" to new "CONFIG_WDT_AT91"Kconfigoption to support driver model and device tree.Signed-off-by Prasanthi Chellakumar <[email protected]>--- README | 3 --- arch/arm/dts/at91sam9260-smartweb.dts | 1 + arch/arm/dts/at91sam9g20-taurus.dts | 1 + arch/arm/mach-at91/spl.c | 2 +- arch/arm/mach-at91/spl_at91.c | 2 +- arch/arm/mach-at91/spl_atmel.c | 2 +- common/board_f.c | 2 +- configs/picosam9g45_defconfig | 2 ++ configs/smartweb_defconfig | 2 ++
Quoted 8 lines
configs/taurus_defconfig | 2 ++ doc/README.at91 | 2 +- doc/README.watchdog | 2 +- include/configs/picosam9g45.h | 4 ---- include/configs/smartweb.h | 7 ------- include/configs/taurus.h | 7 ------- scripts/config_whitelist.txt | 2 -- 16 files changed, 14 insertions(+), 29 deletions(-)
Your patch breaks arm926ejs and atmel.
Second you send twice, but it's the same.
https://travis-ci.org/pevik/u-boot/builds/430613730
https://travis-ci.org/pevik/u-boot/builds/430613525
Kind regards,
Petr