diff options
| author | Marek Vasut <marex@denx.de> | 2019-06-09 03:46:21 +0200 |
|---|---|---|
| committer | Stefano Babic <sbabic@denx.de> | 2019-07-19 20:14:50 +0200 |
| commit | 6874cb72204ffbdbe4290baae11d0b9b8ed47ed1 (patch) | |
| tree | 9c210495bec100440da3dc0957afc7bb80a3d509 /include | |
| parent | 41d185d142365625700f2df5d5d7b237da4bc58d (diff) | |
| download | u-boot-6874cb72204ffbdbe4290baae11d0b9b8ed47ed1.tar.gz u-boot-6874cb72204ffbdbe4290baae11d0b9b8ed47ed1.tar.xz u-boot-6874cb72204ffbdbe4290baae11d0b9b8ed47ed1.zip | |
watchdog: Split WDT from SPL_WDT
Use CONFIG_IS_ENABLED(WDT) to permit use of WDT in SPL without DM,
while the full U-Boot can use rich DM/DT WDT driver.
Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Peng Fan <Peng.Fan@freescale.com>
Cc: Stefano Babic <sbabic@denx.de>
Tested-by: Heiko Schocher <hs@denx.de>
Tested-by: Suniel Mahesh <sunil.m@techveda.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-generic/global_data.h | 2 | ||||
| -rw-r--r-- | include/wdt.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-generic/global_data.h b/include/asm-generic/global_data.h index 02a3ed6838..7c2220643b 100644 --- a/include/asm-generic/global_data.h +++ b/include/asm-generic/global_data.h @@ -137,7 +137,7 @@ typedef struct global_data { #if defined(CONFIG_TRANSLATION_OFFSET) fdt_addr_t translation_offset; /* optional translation offset */ #endif -#if defined(CONFIG_WDT) +#if CONFIG_IS_ENABLED(WDT) struct udevice *watchdog_dev; #endif } gd_t; diff --git a/include/wdt.h b/include/wdt.h index aa77d3e9b4..5bcff24ab3 100644 --- a/include/wdt.h +++ b/include/wdt.h @@ -106,7 +106,7 @@ struct wdt_ops { int (*expire_now)(struct udevice *dev, ulong flags); }; -#if defined(CONFIG_WDT) +#if CONFIG_IS_ENABLED(WDT) #ifndef CONFIG_WATCHDOG_TIMEOUT_MSECS #define CONFIG_WATCHDOG_TIMEOUT_MSECS (60 * 1000) #endif |