diff options
| author | Tom Rini <trini@konsulko.com> | 2021-12-12 22:12:27 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-12-27 08:41:38 -0500 |
| commit | 3847ba94f0207cca171d728aca1637b16e1210a9 (patch) | |
| tree | f58a825131948d2760aae11c88dea378f8c27a12 /configs | |
| parent | 954a2f81775096fc5066632c979b0d8d83683b87 (diff) | |
| download | u-boot-3847ba94f0207cca171d728aca1637b16e1210a9.tar.gz | |
Finish converting CONFIG_WATCHDOG, HW_WATCHDOG and WDT to Kconfig
Because of how these symbols work, and the remaining board config.h file
uses, we need to do these at the same time. In some cases we just get
to move rather directly to the defconfigs. A few cases require manual
intervention.
For the case of the eb_cpu5282 we need to select HW_WATCHDOG for the
target, given how it's implemented.
For the cases of m53menlo, dh_imx6, display5, and display5_factory we
disable SPL watchdog support as the particular combination of options
they want would require either more symbols or enabling SPL_DM.
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'configs')
| -rw-r--r-- | configs/astro_mcf5373l_defconfig | 1 | ||||
| -rw-r--r-- | configs/dh_imx6_defconfig | 1 | ||||
| -rw-r--r-- | configs/display5_defconfig | 1 | ||||
| -rw-r--r-- | configs/display5_factory_defconfig | 1 | ||||
| -rw-r--r-- | configs/ids8313_defconfig | 1 | ||||
| -rw-r--r-- | configs/m53menlo_defconfig | 1 |
6 files changed, 2 insertions, 4 deletions
diff --git a/configs/astro_mcf5373l_defconfig b/configs/astro_mcf5373l_defconfig index d26628aa2ba..a97c4ffd488 100644 --- a/configs/astro_mcf5373l_defconfig +++ b/configs/astro_mcf5373l_defconfig @@ -40,3 +40,4 @@ CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y CONFIG_SYS_FLASH_PROTECTION=y CONFIG_SYS_FLASH_CFI=y CONFIG_MCFUART=y +CONFIG_WATCHDOG=y diff --git a/configs/dh_imx6_defconfig b/configs/dh_imx6_defconfig index 1f63bc8467d..d62bd961dec 100644 --- a/configs/dh_imx6_defconfig +++ b/configs/dh_imx6_defconfig @@ -37,7 +37,6 @@ CONFIG_BOOTDELAY=3 CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y CONFIG_SPL_SPI_LOAD=y CONFIG_SYS_SPI_U_BOOT_OFFS=0x11400 -CONFIG_SPL_WATCHDOG=y CONFIG_CMD_MEMTEST=y CONFIG_CMD_UNZIP=y CONFIG_CMD_DFU=y diff --git a/configs/display5_defconfig b/configs/display5_defconfig index 145b28ee981..26af4a6bfee 100644 --- a/configs/display5_defconfig +++ b/configs/display5_defconfig @@ -45,7 +45,6 @@ CONFIG_SPL_I2C=y CONFIG_SPL_OS_BOOT=y CONFIG_SPL_SPI_LOAD=y CONFIG_SYS_SPI_U_BOOT_OFFS=0x20000 -CONFIG_SPL_WATCHDOG=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="display5 > " CONFIG_CMD_BOOTZ=y diff --git a/configs/display5_factory_defconfig b/configs/display5_factory_defconfig index e0b36f4cdbf..218a33d9a02 100644 --- a/configs/display5_factory_defconfig +++ b/configs/display5_factory_defconfig @@ -43,7 +43,6 @@ CONFIG_SYS_SPI_U_BOOT_OFFS=0x20000 CONFIG_SPL_USB_HOST=y CONFIG_SPL_USB_GADGET=y CONFIG_SPL_USB_SDP_SUPPORT=y -CONFIG_SPL_WATCHDOG=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="display5 factory > " CONFIG_CMD_BOOTZ=y diff --git a/configs/ids8313_defconfig b/configs/ids8313_defconfig index 4f77fd7fe3d..006c80cc7a0 100644 --- a/configs/ids8313_defconfig +++ b/configs/ids8313_defconfig @@ -199,4 +199,5 @@ CONFIG_TSEC_ENET=y # CONFIG_PCI is not set CONFIG_RTC_PCF8563=y CONFIG_SYS_NS16550=y +CONFIG_WATCHDOG=y CONFIG_OF_LIBFDT=y diff --git a/configs/m53menlo_defconfig b/configs/m53menlo_defconfig index 2e5105053a5..ac5afe6b1a8 100644 --- a/configs/m53menlo_defconfig +++ b/configs/m53menlo_defconfig @@ -36,7 +36,6 @@ CONFIG_PREBOOT="run try_bootscript" CONFIG_BOARD_LATE_INIT=y CONFIG_SPL_BOARD_INIT=y CONFIG_SPL_NAND_SUPPORT=y -CONFIG_SPL_WATCHDOG=y CONFIG_HUSH_PARSER=y CONFIG_CMD_ASKENV=y CONFIG_CMD_GREPENV=y |