diff options
author | Simon Glass <sjg@chromium.org> | 2021-07-10 21:14:28 -0600 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2021-07-28 14:27:54 -0400 |
commit | 078111b9c04764114c04f70969e84a01ffb487c0 (patch) | |
tree | 2e42667e41c9857bf9f0f14fe8a711fffdbc113b /include | |
parent | 89ddb0bfeb6c3ce1b1cd8014a111abac3fb5ad39 (diff) | |
download | u-boot-078111b9c04764114c04f70969e84a01ffb487c0.zip u-boot-078111b9c04764114c04f70969e84a01ffb487c0.tar.gz u-boot-078111b9c04764114c04f70969e84a01ffb487c0.tar.bz2 |
Rename SPL_WATCHDOG_SUPPORT to SPL_WATCHDOG
Rename this option so that CONFIG_IS_ENABLED can be used with it.
Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'include')
-rw-r--r-- | include/configs/imx8mq_evk.h | 2 | ||||
-rw-r--r-- | include/configs/imx8mq_phanbell.h | 2 | ||||
-rw-r--r-- | include/configs/ls1021aiot.h | 2 | ||||
-rw-r--r-- | include/configs/ls1046a_common.h | 2 | ||||
-rw-r--r-- | include/configs/pico-imx8mq.h | 2 | ||||
-rw-r--r-- | include/watchdog.h | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/include/configs/imx8mq_evk.h b/include/configs/imx8mq_evk.h index 302c458..bf385be 100644 --- a/include/configs/imx8mq_evk.h +++ b/include/configs/imx8mq_evk.h @@ -19,7 +19,7 @@ #ifdef CONFIG_SPL_BUILD /*#define CONFIG_ENABLE_DDR_TRAINING_DEBUG*/ -#define CONFIG_SPL_WATCHDOG_SUPPORT +#define CONFIG_SPL_WATCHDOG #define CONFIG_SPL_DRIVERS_MISC_SUPPORT #define CONFIG_SPL_POWER #define CONFIG_SPL_I2C_SUPPORT diff --git a/include/configs/imx8mq_phanbell.h b/include/configs/imx8mq_phanbell.h index 4077ad8..27e3cbb 100644 --- a/include/configs/imx8mq_phanbell.h +++ b/include/configs/imx8mq_phanbell.h @@ -16,7 +16,7 @@ #ifdef CONFIG_SPL_BUILD /*#define CONFIG_ENABLE_DDR_TRAINING_DEBUG*/ -#define CONFIG_SPL_WATCHDOG_SUPPORT +#define CONFIG_SPL_WATCHDOG #define CONFIG_SPL_DRIVERS_MISC_SUPPORT #define CONFIG_SPL_POWER #define CONFIG_SPL_I2C_SUPPORT diff --git a/include/configs/ls1021aiot.h b/include/configs/ls1021aiot.h index e2ae6e4..cc227c3 100644 --- a/include/configs/ls1021aiot.h +++ b/include/configs/ls1021aiot.h @@ -66,7 +66,7 @@ #define CONFIG_SPL_ENV_SUPPORT #define CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT #define CONFIG_SPL_I2C_SUPPORT -#define CONFIG_SPL_WATCHDOG_SUPPORT +#define CONFIG_SPL_WATCHDOG #define CONFIG_SPL_MMC_SUPPORT #define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR 0xe8 diff --git a/include/configs/ls1046a_common.h b/include/configs/ls1046a_common.h index 11e1a18..4618244 100644 --- a/include/configs/ls1046a_common.h +++ b/include/configs/ls1046a_common.h @@ -106,7 +106,7 @@ #define CONFIG_SPL_LIBCOMMON_SUPPORT #define CONFIG_SPL_LIBGENERIC_SUPPORT #define CONFIG_SPL_ENV_SUPPORT -#define CONFIG_SPL_WATCHDOG_SUPPORT +#define CONFIG_SPL_WATCHDOG #define CONFIG_SPL_I2C_SUPPORT #define CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT diff --git a/include/configs/pico-imx8mq.h b/include/configs/pico-imx8mq.h index d980553..df4542e 100644 --- a/include/configs/pico-imx8mq.h +++ b/include/configs/pico-imx8mq.h @@ -16,7 +16,7 @@ #ifdef CONFIG_SPL_BUILD /*#define CONFIG_ENABLE_DDR_TRAINING_DEBUG*/ -#define CONFIG_SPL_WATCHDOG_SUPPORT +#define CONFIG_SPL_WATCHDOG #define CONFIG_SPL_DRIVERS_MISC_SUPPORT #define CONFIG_SPL_POWER #define CONFIG_SPL_I2C_SUPPORT diff --git a/include/watchdog.h b/include/watchdog.h index a4a4e8e..14fa5fd 100644 --- a/include/watchdog.h +++ b/include/watchdog.h @@ -53,7 +53,7 @@ int init_func_watchdog_reset(void); #else /* Don't require the watchdog to be enabled in SPL */ #if defined(CONFIG_SPL_BUILD) && \ - !defined(CONFIG_SPL_WATCHDOG_SUPPORT) + !defined(CONFIG_SPL_WATCHDOG) #define WATCHDOG_RESET() {} #else extern void watchdog_reset(void); |