GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-21 14:41:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

watchdog: Migrate OMAP_WATCHDOG to Kconfig

Browse source 
Move this entry to Kconfig.  As it is a hardware watchdog, select
HW_WATCHDOG.  While we could default to enabling this for all platforms,
it is currently only enabled by default on AM33XX, so keep that logic
today.

Cc: Roger Meier <r.meier@siemens.com>
Signed-off-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
Tom Rini 2017-05-12 22:33:24 -04:00
parent 25eaa28801
commit 897f706200
19 changed files with 16 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
configs/brppt1_mmc_defconfig
View file

@ -57,4 +57,5 @@ CONFIG_USB_MUSB_HOST=y
CONFIG_USB_STORAGE=y CONFIG_USB_STORAGE=y
CONFIG_SYS_WHITE_ON_BLACK=y CONFIG_SYS_WHITE_ON_BLACK=y
CONFIG_LCD=y CONFIG_LCD=y
CONFIG_OMAP_WATCHDOG=y
CONFIG_OF_LIBFDT=y CONFIG_OF_LIBFDT=y

1
configs/brppt1_nand_defconfig
View file

@ -57,4 +57,5 @@ CONFIG_USB_MUSB_HOST=y
CONFIG_USB_STORAGE=y CONFIG_USB_STORAGE=y
CONFIG_SYS_WHITE_ON_BLACK=y CONFIG_SYS_WHITE_ON_BLACK=y
CONFIG_LCD=y CONFIG_LCD=y
CONFIG_OMAP_WATCHDOG=y
CONFIG_OF_LIBFDT=y CONFIG_OF_LIBFDT=y

1
configs/brppt1_spi_defconfig
View file

@ -65,4 +65,5 @@ CONFIG_USB_MUSB_HOST=y
CONFIG_USB_STORAGE=y CONFIG_USB_STORAGE=y
CONFIG_SYS_WHITE_ON_BLACK=y CONFIG_SYS_WHITE_ON_BLACK=y
CONFIG_LCD=y CONFIG_LCD=y
CONFIG_OMAP_WATCHDOG=y
CONFIG_OF_LIBFDT=y CONFIG_OF_LIBFDT=y

1
configs/draco_defconfig
View file

@ -65,3 +65,4 @@ CONFIG_USB_GADGET_DOWNLOAD=y
CONFIG_G_DNL_MANUFACTURER="Siemens AG" CONFIG_G_DNL_MANUFACTURER="Siemens AG"
CONFIG_G_DNL_VENDOR_NUM=0x0908 CONFIG_G_DNL_VENDOR_NUM=0x0908
CONFIG_G_DNL_PRODUCT_NUM=0x02d2 CONFIG_G_DNL_PRODUCT_NUM=0x02d2
CONFIG_OMAP_WATCHDOG=y

1
configs/etamin_defconfig
View file

@ -65,3 +65,4 @@ CONFIG_USB_GADGET_DOWNLOAD=y
CONFIG_G_DNL_MANUFACTURER="Siemens AG" CONFIG_G_DNL_MANUFACTURER="Siemens AG"
CONFIG_G_DNL_VENDOR_NUM=0x0908 CONFIG_G_DNL_VENDOR_NUM=0x0908
CONFIG_G_DNL_PRODUCT_NUM=0x02d2 CONFIG_G_DNL_PRODUCT_NUM=0x02d2
CONFIG_OMAP_WATCHDOG=y

1
configs/pxm2_defconfig
View file

@ -72,3 +72,4 @@ CONFIG_G_DNL_PRODUCT_NUM=0x02d2
# CONFIG_VIDEO_SW_CURSOR is not set # CONFIG_VIDEO_SW_CURSOR is not set
CONFIG_SYS_CONSOLE_BG_COL=0xff CONFIG_SYS_CONSOLE_BG_COL=0xff
CONFIG_SYS_CONSOLE_FG_COL=0x00 CONFIG_SYS_CONSOLE_FG_COL=0x00
CONFIG_OMAP_WATCHDOG=y

1
configs/rastaban_defconfig
View file

@ -65,3 +65,4 @@ CONFIG_USB_GADGET_DOWNLOAD=y
CONFIG_G_DNL_MANUFACTURER="Siemens AG" CONFIG_G_DNL_MANUFACTURER="Siemens AG"
CONFIG_G_DNL_VENDOR_NUM=0x0908 CONFIG_G_DNL_VENDOR_NUM=0x0908
CONFIG_G_DNL_PRODUCT_NUM=0x02d2 CONFIG_G_DNL_PRODUCT_NUM=0x02d2
CONFIG_OMAP_WATCHDOG=y

1
configs/thuban_defconfig
View file

@ -65,3 +65,4 @@ CONFIG_USB_GADGET_DOWNLOAD=y
CONFIG_G_DNL_MANUFACTURER="Siemens AG" CONFIG_G_DNL_MANUFACTURER="Siemens AG"
CONFIG_G_DNL_VENDOR_NUM=0x0908 CONFIG_G_DNL_VENDOR_NUM=0x0908
CONFIG_G_DNL_PRODUCT_NUM=0x02d2 CONFIG_G_DNL_PRODUCT_NUM=0x02d2
CONFIG_OMAP_WATCHDOG=y

8
drivers/watchdog/Kconfig
View file

@ -12,6 +12,14 @@ config BCM2835_WDT
This provides basic infrastructure to support BCM2835/2836 watchdog This provides basic infrastructure to support BCM2835/2836 watchdog
hardware, with a max timeout of ~15secs. hardware, with a max timeout of ~15secs.
config OMAP_WATCHDOG
bool "TI OMAP watchdog driver"
depends on ARCH_OMAP2PLUS
select HW_WATCHDOG
default y if AM33XX
help
Say Y here to enable the OMAP3+ watchdog driver.
config ULP_WATCHDOG config ULP_WATCHDOG
bool "i.MX7ULP watchdog" bool "i.MX7ULP watchdog"
help help

3
include/configs/brppt1.h
View file

@ -20,9 +20,6 @@
#define CONFIG_LCD_DT_SIMPLEFB #define CONFIG_LCD_DT_SIMPLEFB
#define LCD_BPP LCD_COLOR32 #define LCD_BPP LCD_COLOR32
#define CONFIG_HW_WATCHDOG
#define CONFIG_OMAP_WATCHDOG
/* Bootcount using the RTC block */ /* Bootcount using the RTC block */
#define CONFIG_SYS_BOOTCOUNT_ADDR 0x44E3E000 #define CONFIG_SYS_BOOTCOUNT_ADDR 0x44E3E000
#define CONFIG_BOOTCOUNT_LIMIT #define CONFIG_BOOTCOUNT_LIMIT

3
include/configs/draco.h
View file

@ -45,9 +45,6 @@
#define CONFIG_FACTORYSET #define CONFIG_FACTORYSET
/* Watchdog */
#define CONFIG_OMAP_WATCHDOG
/* Define own nand partitions */ /* Define own nand partitions */
#define CONFIG_ENV_OFFSET_REDUND 0x2E0000 #define CONFIG_ENV_OFFSET_REDUND 0x2E0000
#define CONFIG_ENV_SIZE_REDUND 0x2000 #define CONFIG_ENV_SIZE_REDUND 0x2000

3
include/configs/etamin.h
View file

@ -116,9 +116,6 @@
#define CONFIG_SYS_DCACHE_OFF #define CONFIG_SYS_DCACHE_OFF
#endif #endif
/* Watchdog */
#define CONFIG_OMAP_WATCHDOG
/* Define own nand partitions */ /* Define own nand partitions */
#define CONFIG_ENV_OFFSET_REDUND 0xB80000 #define CONFIG_ENV_OFFSET_REDUND 0xB80000
#define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE #define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE

3
include/configs/pxm2.h
View file

@ -42,9 +42,6 @@
#define CONFIG_FACTORYSET #define CONFIG_FACTORYSET
/* Watchdog */
#define CONFIG_OMAP_WATCHDOG
#ifndef CONFIG_SPL_BUILD #ifndef CONFIG_SPL_BUILD
/* Use common default */ /* Use common default */

3
include/configs/rastaban.h
View file

@ -49,9 +49,6 @@
#define CONFIG_FACTORYSET #define CONFIG_FACTORYSET
/* Watchdog */
#define CONFIG_OMAP_WATCHDOG
/* Define own nand partitions */ /* Define own nand partitions */
#define CONFIG_ENV_OFFSET_REDUND 0x2E0000 #define CONFIG_ENV_OFFSET_REDUND 0x2E0000
#define CONFIG_ENV_SIZE_REDUND 0x2000 #define CONFIG_ENV_SIZE_REDUND 0x2000

4
include/configs/rut.h
View file

@ -110,10 +110,6 @@
#endif /* CONFIG_SPL_BUILD */ #endif /* CONFIG_SPL_BUILD */
#ifdef CONFIG_SPL_BUILD
#undef CONFIG_HW_WATCHDOG
#endif
#if defined(CONFIG_VIDEO) #if defined(CONFIG_VIDEO)
#define CONFIG_VIDEO_DA8XX #define CONFIG_VIDEO_DA8XX
#define CONFIG_SPLASH_SCREEN #define CONFIG_SPLASH_SCREEN

3
include/configs/siemens-am33x-common.h
View file

@ -547,9 +547,6 @@
#endif #endif
#endif #endif
/* Watchdog */
#define CONFIG_HW_WATCHDOG
/* Reboot after 60 sec if bootcmd fails */ /* Reboot after 60 sec if bootcmd fails */
#define CONFIG_RESET_TO_RETRY #define CONFIG_RESET_TO_RETRY
#define CONFIG_BOOT_RETRY_TIME 60 #define CONFIG_BOOT_RETRY_TIME 60

3
include/configs/thuban.h
View file

@ -42,9 +42,6 @@
#define CONFIG_FACTORYSET #define CONFIG_FACTORYSET
/* Watchdog */
#define CONFIG_OMAP_WATCHDOG
/* Define own nand partitions */ /* Define own nand partitions */
#define CONFIG_ENV_OFFSET_REDUND 0x2E0000 #define CONFIG_ENV_OFFSET_REDUND 0x2E0000
#define CONFIG_ENV_SIZE_REDUND 0x2000 #define CONFIG_ENV_SIZE_REDUND 0x2000

4
include/configs/ti_am335x_common.h
View file

@ -47,10 +47,6 @@
*/ */
#define CONFIG_SYS_BOOTCOUNT_ADDR 0x44E3E000 #define CONFIG_SYS_BOOTCOUNT_ADDR 0x44E3E000
/* Enable the HW watchdog, since we can use this with bootcount */
#define CONFIG_HW_WATCHDOG
#define CONFIG_OMAP_WATCHDOG
/* /*
* SPL related defines. The Public RAM memory map the ROM defines the * SPL related defines. The Public RAM memory map the ROM defines the
* area between 0x402F0400 and 0x4030B800 as a download area and * area between 0x402F0400 and 0x4030B800 as a download area and

1
scripts/config_whitelist.txt
View file

@ -1988,7 +1988,6 @@ CONFIG_OMAP_USB2PHY2_HOST
CONFIG_OMAP_USB3PHY1_HOST CONFIG_OMAP_USB3PHY1_HOST
CONFIG_OMAP_USB_PHY CONFIG_OMAP_USB_PHY
CONFIG_OMAP_VC_I2C_HS_MCODE CONFIG_OMAP_VC_I2C_HS_MCODE
CONFIG_OMAP_WATCHDOG
CONFIG_OPTREX_BW CONFIG_OPTREX_BW
CONFIG_ORIGEN CONFIG_ORIGEN
CONFIG_OS1_ENV_ADDR CONFIG_OS1_ENV_ADDR