diff options
| author | Tom Rini <trini@konsulko.com> | 2017-05-12 22:33:24 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-05-15 10:40:02 -0400 |
| commit | 897f70620053e4da07f1173aea3891637b7bb6a9 (patch) | |
| tree | 8b96aca57f9f3a56e34d9c38b5d6d498487506d1 /include/configs | |
| parent | 25eaa288016beef4e4229a729e1c732f545ee1f7 (diff) | |
| download | u-boot-897f70620053e4da07f1173aea3891637b7bb6a9.tar.gz | |
watchdog: Migrate OMAP_WATCHDOG to Kconfig
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>
Diffstat (limited to 'include/configs')
| -rw-r--r-- | include/configs/brppt1.h | 3 | ||||
| -rw-r--r-- | include/configs/draco.h | 3 | ||||
| -rw-r--r-- | include/configs/etamin.h | 3 | ||||
| -rw-r--r-- | include/configs/pxm2.h | 3 | ||||
| -rw-r--r-- | include/configs/rastaban.h | 3 | ||||
| -rw-r--r-- | include/configs/rut.h | 4 | ||||
| -rw-r--r-- | include/configs/siemens-am33x-common.h | 3 | ||||
| -rw-r--r-- | include/configs/thuban.h | 3 | ||||
| -rw-r--r-- | include/configs/ti_am335x_common.h | 4 |
9 files changed, 0 insertions, 29 deletions
diff --git a/include/configs/brppt1.h b/include/configs/brppt1.h index 0c1a54d7ba..521d097f8a 100644 --- a/include/configs/brppt1.h +++ b/include/configs/brppt1.h @@ -20,9 +20,6 @@ #define CONFIG_LCD_DT_SIMPLEFB #define LCD_BPP LCD_COLOR32 -#define CONFIG_HW_WATCHDOG -#define CONFIG_OMAP_WATCHDOG - /* Bootcount using the RTC block */ #define CONFIG_SYS_BOOTCOUNT_ADDR 0x44E3E000 #define CONFIG_BOOTCOUNT_LIMIT diff --git a/include/configs/draco.h b/include/configs/draco.h index 896d14f99a..ba6a43062a 100644 --- a/include/configs/draco.h +++ b/include/configs/draco.h @@ -45,9 +45,6 @@ #define CONFIG_FACTORYSET -/* Watchdog */ -#define CONFIG_OMAP_WATCHDOG - /* Define own nand partitions */ #define CONFIG_ENV_OFFSET_REDUND 0x2E0000 #define CONFIG_ENV_SIZE_REDUND 0x2000 diff --git a/include/configs/etamin.h b/include/configs/etamin.h index 40c57948cc..a0152a4a43 100644 --- a/include/configs/etamin.h +++ b/include/configs/etamin.h @@ -116,9 +116,6 @@ #define CONFIG_SYS_DCACHE_OFF #endif -/* Watchdog */ -#define CONFIG_OMAP_WATCHDOG - /* Define own nand partitions */ #define CONFIG_ENV_OFFSET_REDUND 0xB80000 #define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE diff --git a/include/configs/pxm2.h b/include/configs/pxm2.h index 57f034f0df..e8e0c7edd8 100644 --- a/include/configs/pxm2.h +++ b/include/configs/pxm2.h @@ -42,9 +42,6 @@ #define CONFIG_FACTORYSET -/* Watchdog */ -#define CONFIG_OMAP_WATCHDOG - #ifndef CONFIG_SPL_BUILD /* Use common default */ diff --git a/include/configs/rastaban.h b/include/configs/rastaban.h index 99fe1616e5..0820f6fc7a 100644 --- a/include/configs/rastaban.h +++ b/include/configs/rastaban.h @@ -49,9 +49,6 @@ #define CONFIG_FACTORYSET -/* Watchdog */ -#define CONFIG_OMAP_WATCHDOG - /* Define own nand partitions */ #define CONFIG_ENV_OFFSET_REDUND 0x2E0000 #define CONFIG_ENV_SIZE_REDUND 0x2000 diff --git a/include/configs/rut.h b/include/configs/rut.h index 8cfb73d781..e676a5acd4 100644 --- a/include/configs/rut.h +++ b/include/configs/rut.h @@ -110,10 +110,6 @@ #endif /* CONFIG_SPL_BUILD */ -#ifdef CONFIG_SPL_BUILD -#undef CONFIG_HW_WATCHDOG -#endif - #if defined(CONFIG_VIDEO) #define CONFIG_VIDEO_DA8XX #define CONFIG_SPLASH_SCREEN diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h index 81586969e2..5bb471c8f6 100644 --- a/include/configs/siemens-am33x-common.h +++ b/include/configs/siemens-am33x-common.h @@ -547,9 +547,6 @@ #endif #endif -/* Watchdog */ -#define CONFIG_HW_WATCHDOG - /* Reboot after 60 sec if bootcmd fails */ #define CONFIG_RESET_TO_RETRY #define CONFIG_BOOT_RETRY_TIME 60 diff --git a/include/configs/thuban.h b/include/configs/thuban.h index 8c37d7cace..cea84acd03 100644 --- a/include/configs/thuban.h +++ b/include/configs/thuban.h @@ -42,9 +42,6 @@ #define CONFIG_FACTORYSET -/* Watchdog */ -#define CONFIG_OMAP_WATCHDOG - /* Define own nand partitions */ #define CONFIG_ENV_OFFSET_REDUND 0x2E0000 #define CONFIG_ENV_SIZE_REDUND 0x2000 diff --git a/include/configs/ti_am335x_common.h b/include/configs/ti_am335x_common.h index e4c3c807f2..bf44121a0f 100644 --- a/include/configs/ti_am335x_common.h +++ b/include/configs/ti_am335x_common.h @@ -47,10 +47,6 @@ */ #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 * area between 0x402F0400 and 0x4030B800 as a download area and |