Convert CONFIG_WATCHDOG et al to Kconfig
PATCH 1/1 Convert CONFIG_WATCHDOG et al to Kconfig
This converts the following to Kconfig:
CONFIG_WATCHDOG
CONFIG_WATCHDOG_TIMEOUT
CONFIG_WDT
CONFIG_HW_WATCHDOG
CONFIG_DESIGNWARE_WATCHDOG
--- README | 15 --------------- configs/MPC8610HPCD_defconfig | 1 + configs/astro_mcf5373l_defconfig | 1 + configs/ids8313_defconfig | 1 + configs/kmcoge4_defconfig | 1 + include/configs/M5208EVBE.h | 3 --- include/configs/M52277EVB.h | 2 -- include/configs/M5235EVB.h | 3 --- include/configs/M5249EVB.h | 2 -- include/configs/M5253DEMO.h | 2 -- include/configs/M5272C3.h | 3 --- include/configs/M53017EVB.h | 3 --- include/configs/M5329EVB.h | 3 --- include/configs/M5373EVB.h | 3 --- include/configs/M54418TWR.h | 2 -- include/configs/M54451EVB.h | 2 -- include/configs/M54455EVB.h | 2 -- include/configs/M5475EVB.h | 3 --- include/configs/M5485EVB.h | 3 --- include/configs/MPC8315ERDB.h | 2 -- include/configs/MPC8323ERDB.h | 2 -- include/configs/MPC832XEMDS.h | 2 -- include/configs/MPC8349EMDS.h | 2 -- include/configs/MPC8349EMDS_SDRAM.h | 2 -- include/configs/MPC8349ITX.h | 1 - include/configs/MPC837XEMDS.h | 2 -- include/configs/MPC837XERDB.h | 2 -- include/configs/MPC8540ADS.h | 2 -- include/configs/MPC8541CDS.h | 2 -- include/configs/MPC8544DS.h | 2 -- include/configs/MPC8548CDS.h | 2 -- include/configs/MPC8555CDS.h | 2 -- include/configs/MPC8560ADS.h | 2 -- include/configs/MPC8568MDS.h | 2 -- include/configs/MPC8569MDS.h | 2 -- include/configs/MPC8572DS.h | 2 -- include/configs/MPC8610HPCD.h | 1 - include/configs/MPC8641HPCN.h | 2 -- include/configs/P1010RDB.h | 2 -- include/configs/TQM834x.h | 2 -- include/configs/UCP1020.h | 5 ----- include/configs/astro_mcf5373l.h | 11 ----------- include/configs/caddy2.h | 2 -- include/configs/cobra5272.h | 13 ------------- include/configs/controlcenterd.h | 1 - include/configs/dh_imx6.h | 7 ------- include/configs/display5.h | 7 ------- include/configs/eb_cpu5282.h | 2 -- include/configs/ids8313.h | 1 - include/configs/kmp204x.h | 1 - include/configs/m53menlo.h | 5 ----- include/configs/nokia_rx51.h | 3 --- include/configs/p1_p2_rdb_pc.h | 2 -- include/configs/sbc8349.h | 2 -- include/configs/sbc8548.h | 2 -- include/configs/sbc8641d.h | 2 -- include/configs/socfpga_soc64_common.h | 7 ------- include/configs/socrates.h | 2 -- include/configs/ts4800.h | 2 -- include/configs/vme8349.h | 2 -- scripts/config_whitelist.txt | 1 - 61 files changed, 4 insertions(+), 171 deletions(-)
README +0 -15
@@ -735,21 +735,6 @@ The following options need to be configured: the image. Only boards defining board_fdt_blob_setup() support this option (see include/fdtdec.h file). -- Watchdog: - CONFIG_WATCHDOG - If this variable is defined, it enables watchdog - support for the SoC. There must be support in the SoC - specific code for a watchdog. For the 8xx - CPUs, the SIU Watchdog feature is enabled in the SYPCR - register. When supported for a specific SoC is - available, then no further board specific code should - be needed to use it. - - CONFIG_HW_WATCHDOG - When using a watchdog circuitry external to the used - SoC, then define this variable and provide board - specific code for the "hw_watchdog_reset" function. - - Real-Time Clock: When CONFIG_CMD_DATE is selected, the type of the RTC
configs/MPC8610HPCD_defconfig +1 -0
@@ -34,4 +34,5 @@ CONFIG_SYS_NS16550=y CONFIG_USB=y CONFIG_USB_KEYBOARD=y CONFIG_VIDEO=y +CONFIG_WATCHDOG=y CONFIG_OF_LIBFDT=y
configs/astro_mcf5373l_defconfig +1 -0
@@ -30,3 +30,4 @@ CONFIG_FLASH_CFI_DRIVER=y CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y CONFIG_SYS_FLASH_PROTECTION=y CONFIG_SYS_FLASH_CFI=y +CONFIG_WATCHDOG=y
configs/ids8313_defconfig +1 -0
@@ -176,4 +176,5 @@ CONFIG_MII=y CONFIG_TSEC_ENET=y # CONFIG_PCI is not set CONFIG_SYS_NS16550=y +CONFIG_WATCHDOG=y CONFIG_OF_LIBFDT=y
configs/kmcoge4_defconfig +1 -0
@@ -65,6 +65,7 @@ CONFIG_SYS_QE_FMAN_FW_IN_SPIFLASH=y CONFIG_SYS_NS16550=y CONFIG_SPI=y CONFIG_FSL_ESPI=y +CONFIG_WATCHDOG=y CONFIG_ADDR_MAP=y CONFIG_SYS_NUM_ADDR_MAP=64 CONFIG_BCH=y
include/configs/M5208EVBE.h +0 -3
@@ -16,9 +16,6 @@#define CONFIG_MCFUART #define CONFIG_SYS_UART_PORT (0) -#undef CONFIG_WATCHDOG -#define CONFIG_WATCHDOG_TIMEOUT 5000 -#ifdef CONFIG_MCFFEC # define CONFIG_MII_INIT 1# define CONFIG_SYS_DISCOVER_PHY
include/configs/M52277EVB.h +0 -2
@@ -23,8 +23,6 @@#define CONFIG_MCFUART #define CONFIG_SYS_UART_PORT (0) -#undef CONFIG_WATCHDOG -#define CONFIG_TIMESTAMP /* Print image info with timestamp */ /*
include/configs/M5235EVB.h +0 -3
@@ -21,9 +21,6 @@#define CONFIG_MCFUART #define CONFIG_SYS_UART_PORT (0) -#undef CONFIG_WATCHDOG -#define CONFIG_WATCHDOG_TIMEOUT 5000/* timeout in milliseconds, max timeout is 6.71sec */ -/* * BOOTP options */
include/configs/M5249EVB.h +0 -2
@@ -22,8 +22,6 @@#define CONFIG_MCFUART #define CONFIG_SYS_UART_PORT (0) -#undef CONFIG_WATCHDOG -#undef CONFIG_MONITOR_IS_IN_RAM/* no pre-loader required!!! ;-) */ /*
include/configs/M5253DEMO.h +0 -2
@@ -13,8 +13,6 @@#define CONFIG_MCFUART #define CONFIG_SYS_UART_PORT (0) -#undef CONFIG_WATCHDOG/* disable watchdog */ -/* Configuration for environment * Environment is embedded in u-boot in the second sector of the flash
include/configs/M5272C3.h +0 -3
@@ -21,9 +21,6 @@#define CONFIG_MCFUART #define CONFIG_SYS_UART_PORT (0) -#undef CONFIG_WATCHDOG -#define CONFIG_WATCHDOG_TIMEOUT 10000/* timeout in milliseconds */ -#undef CONFIG_MONITOR_IS_IN_RAM/* define if monitor is started from a pre-loader */ /* Configuration for environment
include/configs/M53017EVB.h +0 -3
@@ -21,9 +21,6 @@#define CONFIG_MCFUART #define CONFIG_SYS_UART_PORT (0) -#undef CONFIG_WATCHDOG -#define CONFIG_WATCHDOG_TIMEOUT 5000 -#define CONFIG_SYS_UNIFY_CACHE #ifdef CONFIG_MCFFEC
include/configs/M5329EVB.h +0 -3
@@ -21,9 +21,6 @@#define CONFIG_MCFUART #define CONFIG_SYS_UART_PORT (0) -#undef CONFIG_WATCHDOG -#define CONFIG_WATCHDOG_TIMEOUT 5000/* timeout in milliseconds, max timeout is 6.71sec */ -#define CONFIG_SYS_UNIFY_CACHE #ifdef CONFIG_MCFFEC
include/configs/M5373EVB.h +0 -3
@@ -23,9 +23,6 @@#define CONFIG_MCFUART #define CONFIG_SYS_UART_PORT (0) -#undef CONFIG_WATCHDOG -#define CONFIG_WATCHDOG_TIMEOUT 3360/* timeout in ms, max is 3.36 sec */ -#define CONFIG_SYS_UNIFY_CACHE #ifdef CONFIG_MCFFEC
include/configs/M54418TWR.h +0 -2
@@ -26,8 +26,6 @@#define LDS_BOARD_TEXT board/freescale/m54418twr/sbf_dram_init.o (.text*) -#undef CONFIG_WATCHDOG -#define CONFIG_TIMESTAMP /* Print image info with timestamp */ /*
include/configs/M54451EVB.h +0 -2
@@ -26,8 +26,6 @@#define LDS_BOARD_TEXT board/freescale/m54451evb/sbf_dram_init.o (.text*) -#undef CONFIG_WATCHDOG -#define CONFIG_TIMESTAMP /* Print image info with timestamp */ /*
include/configs/M54455EVB.h +0 -2
@@ -26,8 +26,6 @@#define LDS_BOARD_TEXT board/freescale/m54455evb/sbf_dram_init.o (.text*) -#undef CONFIG_WATCHDOG -#define CONFIG_TIMESTAMP /* Print image info with timestamp */ /*
include/configs/M5475EVB.h +0 -3
@@ -21,9 +21,6 @@#define CONFIG_MCFUART #define CONFIG_SYS_UART_PORT (0) -#undef CONFIG_HW_WATCHDOG -#define CONFIG_WATCHDOG_TIMEOUT 5000/* timeout in milliseconds, max timeout is 6.71sec */ -#define CONFIG_SLTTMR #ifdef CONFIG_FSLDMAFEC
include/configs/M5485EVB.h +0 -3
@@ -21,9 +21,6 @@#define CONFIG_MCFUART #define CONFIG_SYS_UART_PORT (0) -#undef CONFIG_HW_WATCHDOG -#define CONFIG_WATCHDOG_TIMEOUT 5000/* timeout in milliseconds, max timeout is 6.71sec */ -#define CONFIG_SLTTMR #ifdef CONFIG_FSLDMAFEC
include/configs/MPC8315ERDB.h +0 -2
@@ -303,8 +303,6 @@*/ #define CONFIG_BOOTP_BOOTFILESIZE -#undef CONFIG_WATCHDOG/* watchdog disabled */ -/* * Miscellaneous configurable options */
include/configs/MPC8323ERDB.h +0 -2
@@ -219,8 +219,6 @@*/ #define CONFIG_BOOTP_BOOTFILESIZE -#undef CONFIG_WATCHDOG/* watchdog disabled */ -/* * Miscellaneous configurable options */
include/configs/MPC832XEMDS.h +0 -2
@@ -243,8 +243,6 @@*/ #define CONFIG_BOOTP_BOOTFILESIZE -#undef CONFIG_WATCHDOG/* watchdog disabled */ -/* * Miscellaneous configurable options */
include/configs/MPC8349EMDS.h +0 -2
@@ -276,8 +276,6 @@*/ #define CONFIG_BOOTP_BOOTFILESIZE -#undef CONFIG_WATCHDOG/* watchdog disabled */ -/* * Miscellaneous configurable options */
include/configs/MPC8349EMDS_SDRAM.h +0 -2
@@ -331,8 +331,6 @@*/ #define CONFIG_BOOTP_BOOTFILESIZE -#undef CONFIG_WATCHDOG/* watchdog disabled */ -/* * Miscellaneous configurable options */
include/configs/MPC8349ITX.h +0 -1
@@ -347,7 +347,6 @@ boards, we say we have two, but don't display a message if we find only one. */#define CONFIG_BOOTP_BOOTFILESIZE /* Watchdog */ -#undef CONFIG_WATCHDOG/* watchdog disabled */ /* * Miscellaneous configurable options
include/configs/MPC837XEMDS.h +0 -2
@@ -303,8 +303,6 @@ extern int board_pci_host_broken(void);*/ #define CONFIG_BOOTP_BOOTFILESIZE -#undef CONFIG_WATCHDOG/* watchdog disabled */ -#ifdef CONFIG_MMC #define CONFIG_FSL_ESDHC_PIN_MUX #define CONFIG_SYS_FSL_ESDHC_ADDR CONFIG_SYS_MPC83xx_ESDHC_ADDR
include/configs/MPC837XERDB.h +0 -2
@@ -322,8 +322,6 @@*/ #define CONFIG_BOOTP_BOOTFILESIZE -#undef CONFIG_WATCHDOG/* watchdog disabled */ -#ifdef CONFIG_MMC #define CONFIG_FSL_ESDHC_PIN_MUX #define CONFIG_SYS_FSL_ESDHC_ADDR CONFIG_SYS_MPC83xx_ESDHC_ADDR
include/configs/MPC8540ADS.h +0 -2
@@ -283,8 +283,6 @@*/ #define CONFIG_BOOTP_BOOTFILESIZE -#undef CONFIG_WATCHDOG/* watchdog disabled */ -/* * Miscellaneous configurable options */
include/configs/MPC8541CDS.h +0 -2
@@ -315,8 +315,6 @@ extern unsigned long get_clock_freq(void);*/ #define CONFIG_BOOTP_BOOTFILESIZE -#undef CONFIG_WATCHDOG/* watchdog disabled */ -/* * Miscellaneous configurable options */
include/configs/MPC8544DS.h +0 -2
@@ -318,8 +318,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);#define CONFIG_PCI_EHCI_DEVICE 0#endif -#undef CONFIG_WATCHDOG/* watchdog disabled */ -/* * Miscellaneous configurable options */
include/configs/MPC8548CDS.h +0 -2
@@ -434,8 +434,6 @@ extern unsigned long get_clock_freq(void);*/ #define CONFIG_BOOTP_BOOTFILESIZE -#undef CONFIG_WATCHDOG/* watchdog disabled */ -/* * Miscellaneous configurable options */
include/configs/MPC8555CDS.h +0 -2
@@ -313,8 +313,6 @@ extern unsigned long get_clock_freq(void);*/ #define CONFIG_BOOTP_BOOTFILESIZE -#undef CONFIG_WATCHDOG/* watchdog disabled */ -/* * Miscellaneous configurable options */
include/configs/MPC8560ADS.h +0 -2
@@ -316,8 +316,6 @@*/ #define CONFIG_BOOTP_BOOTFILESIZE -#undef CONFIG_WATCHDOG/* watchdog disabled */ -/* * Miscellaneous configurable options */
include/configs/MPC8568MDS.h +0 -2
@@ -326,8 +326,6 @@ extern unsigned long get_clock_freq(void);*/ #define CONFIG_BOOTP_BOOTFILESIZE -#undef CONFIG_WATCHDOG/* watchdog disabled */ -/* * Miscellaneous configurable options */
include/configs/MPC8569MDS.h +0 -2
@@ -413,8 +413,6 @@ extern unsigned long get_clock_freq(void);*/ #define CONFIG_BOOTP_BOOTFILESIZE -#undef CONFIG_WATCHDOG/* watchdog disabled */ -#ifdef CONFIG_MMC #define CONFIG_FSL_ESDHC_PIN_MUX #define CONFIG_SYS_FSL_ESDHC_ADDR CONFIG_SYS_MPC85xx_ESDHC_ADDR
include/configs/MPC8572DS.h +0 -2
@@ -506,8 +506,6 @@#define CONFIG_PCI_EHCI_DEVICE 0#endif -#undef CONFIG_WATCHDOG/* watchdog disabled */ -/* * Miscellaneous configurable options */
include/configs/MPC8610HPCD.h +0 -1
@@ -388,7 +388,6 @@*/ #define CONFIG_BOOTP_BOOTFILESIZE -#define CONFIG_WATCHDOG /* watchdog enabled */ #define CONFIG_SYS_WATCHDOG_FREQ 5000/* Feed interval, 5s */ /*
include/configs/MPC8641HPCN.h +0 -2
@@ -545,8 +545,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);*/ #define CONFIG_BOOTP_BOOTFILESIZE -#undef CONFIG_WATCHDOG/* watchdog disabled */ -/* * Miscellaneous configurable options */
include/configs/P1010RDB.h +0 -2
@@ -651,8 +651,6 @@ extern unsigned long get_sdram_size(void);#define CONFIG_LOADS_ECHO /* echo on for serial download */ #define CONFIG_SYS_LOADS_BAUD_CHANGE /* allow baudrate change */ -#undef CONFIG_WATCHDOG/* watchdog disabled */ -#if defined(CONFIG_MMC ) || defined(CONFIG_USB_EHCI_HCD ) \ || defined(CONFIG_FSL_SATA )#endif
include/configs/TQM834x.h +0 -2
@@ -195,8 +195,6 @@*/ #define CONFIG_SYS_LOAD_ADDR 0x2000000/* default load address */ -#undef CONFIG_WATCHDOG/* watchdog disabled */ -/* * For booting Linux, the board info and command line data * have to be in the first 256 MB of memory, since this is
include/configs/UCP1020.h +0 -5
@@ -383,15 +383,10 @@#endif #endif -#undef CONFIG_WATCHDOG/* watchdog disabled */ -#ifdef CONFIG_MMC #define CONFIG_SYS_FSL_ESDHC_ADDR CONFIG_SYS_MPC85xx_ESDHC_ADDR#endif -/* Misc Extra Settings */ -#undef CONFIG_WATCHDOG/* watchdog disabled */ -/* * Miscellaneous configurable options */
include/configs/astro_mcf5373l.h +0 -11
@@ -90,17 +90,6 @@#define CONFIG_SYS_UART_PORT (2)#define CONFIG_SYS_UART2_ALT3_GPIO -/* -* Watchdog configuration; Watchdog is disabled for running from RAM -* and set to highest possible value else. Beware there is no check -* in the watchdog code to validate the timeout value set here! -*/ - -#ifndef CONFIG_MONITOR_IS_IN_RAM -#define CONFIG_WATCHDOG -#define CONFIG_WATCHDOG_TIMEOUT 3355/* timeout in milliseconds */ -#endif -/* * Configuration for environment * Environment is located in the last sector of the flash
include/configs/caddy2.h +0 -2
@@ -212,8 +212,6 @@/* Pass Ethernet MAC to VxWorks */ #define CONFIG_SYS_VXWORKS_MAC_PTR 0x000043f0 -#undef CONFIG_WATCHDOG/* watchdog disabled */ -/* * Miscellaneous configurable options */
include/configs/cobra5272.h +0 -13
@@ -46,19 +46,6 @@#define CONFIG_MCFUART #define CONFIG_SYS_UART_PORT (0) -/* --- -* set "#if 0" to "#if 1" if (Hardware)-WATCHDOG should be enabled & change -* timeout acc. to your needs -* #define CONFIG_WATCHDOG_TIMEOUT x , x is timeout in milliseconds, e. g. 10000 -* for 10 sec -* --- -*/ - -#if 0 -#define CONFIG_WATCHDOG -#define CONFIG_WATCHDOG_TIMEOUT 10000/* timeout in milliseconds */ -#endif -/* --- * CONFIG_MONITOR_IS_IN_RAM defines if u-boot is started from a different * bootloader residing in flash ('chainloading'); if you want to use
include/configs/controlcenterd.h +0 -1
@@ -281,7 +281,6 @@/* * Miscellaneous configurable options */ -#define CONFIG_HW_WATCHDOG #define CONFIG_LOADS_ECHO #define CONFIG_SYS_LOADS_BAUD_CHANGE
include/configs/dh_imx6.h +0 -7
@@ -81,13 +81,6 @@#endif #endif -/* Watchdog */ -#if defined(CONFIG_SPL_BUILD ) -#undef CONFIG_WDT -#undef CONFIG_WATCHDOG -#define CONFIG_HW_WATCHDOG -#endif -#define CONFIG_LOADADDR 0x12000000#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR
include/configs/display5.h +0 -7
@@ -334,13 +334,6 @@#define CONFIG_SYS_INIT_SP_ADDR \ (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET) -/* Watchdog */ -#if defined(CONFIG_SPL_BUILD ) -#undef CONFIG_WDT -#undef CONFIG_WATCHDOG -#define CONFIG_HW_WATCHDOG -#endif -/* ENV config */ #ifdef CONFIG_ENV_IS_IN_SPI_FLASH /* The 0x120000 value corresponds to above SPI-NOR memory MAP */
include/configs/eb_cpu5282.h +0 -2
@@ -28,8 +28,6 @@#define CONFIG_BOOT_RETRY_TIME -1#define CONFIG_RESET_TO_RETRY -#define CONFIG_HW_WATCHDOG -#define STATUS_LED_ACTIVE 0/*----------------------------------------------------------------------*
include/configs/ids8313.h +0 -1
@@ -157,7 +157,6 @@/* * HW-Watchdog */ -#define CONFIG_WATCHDOG 1#define CONFIG_SYS_WATCHDOG_VALUE 0xFFFF/*
include/configs/kmp204x.h +0 -1
@@ -333,7 +333,6 @@ int get_scl(void);/* * Hardware Watchdog */ -#define CONFIG_WATCHDOG /* enable CPU watchdog */ #define CONFIG_WATCHDOG_PRESC 34/* wdog prescaler 2^(64-34) (~10min) */ #define CONFIG_WATCHDOG_RC WRC_CHIP/* reset chip on watchdog event */
include/configs/m53menlo.h +0 -5
@@ -226,9 +226,4 @@"fi ; " \ "fi\0" -#if defined(CONFIG_SPL_BUILD ) -#undef CONFIG_WATCHDOG -#define CONFIG_HW_WATCHDOG -#endif -#endif /* __M53MENLO_CONFIG_H__ */
include/configs/nokia_rx51.h +0 -3
@@ -91,9 +91,6 @@#define CONFIG_SYS_ONENAND_BASE ONENAND_MAP -/* Watchdog support */ -#define CONFIG_HW_WATCHDOG -/* * Framebuffer */
include/configs/p1_p2_rdb_pc.h +0 -2
@@ -626,8 +626,6 @@#define CONFIG_SYS_FSL_ESDHC_ADDR CONFIG_SYS_MPC85xx_ESDHC_ADDR#endif -#undef CONFIG_WATCHDOG/* watchdog disabled */ -/* * Miscellaneous configurable options */
include/configs/sbc8349.h +0 -2
@@ -230,8 +230,6 @@*/ #define CONFIG_BOOTP_BOOTFILESIZE -#undef CONFIG_WATCHDOG/* watchdog disabled */ -/* * Miscellaneous configurable options */
include/configs/sbc8548.h +0 -2
@@ -464,8 +464,6 @@*/ #define CONFIG_BOOTP_BOOTFILESIZE -#undef CONFIG_WATCHDOG/* watchdog disabled */ -/* * Miscellaneous configurable options */
include/configs/sbc8641d.h +0 -2
@@ -422,8 +422,6 @@#define CONFIG_LOADS_ECHO 1/* echo on for serial download */ #define CONFIG_SYS_LOADS_BAUD_CHANGE 1/* allow baudrate change */ -#undef CONFIG_WATCHDOG/* watchdog disabled */ -/* * Miscellaneous configurable options */
include/configs/socfpga_soc64_common.h +0 -7
@@ -144,13 +144,6 @@ unsigned int cm_get_qspi_controller_clk_hz(void);#define CONFIG_DW_ALTDESCRIPTOR #endif /* CONFIG_CMD_NET */ -/* -* L4 Watchdog -*/ -#ifndef CONFIG_SPL_BUILD -#undef CONFIG_HW_WATCHDOG -#undef CONFIG_DESIGNWARE_WATCHDOG -#endif #define CONFIG_DW_WDT_BASE SOCFPGA_L4WD0_ADDRESS#ifdef CONFIG_TARGET_SOCFPGA_STRATIX10 #ifndef __ASSEMBLY__
include/configs/socrates.h +0 -2
@@ -196,8 +196,6 @@*/ #define CONFIG_BOOTP_BOOTFILESIZE -#undef CONFIG_WATCHDOG/* watchdog disabled */ -/* * Miscellaneous configurable options */
include/configs/ts4800.h +0 -2
@@ -16,8 +16,6 @@#define CONFIG_SKIP_LOWLEVEL_INIT /* U-Boot is a 2nd stage bootloader */ -#define CONFIG_HW_WATCHDOG -#define CONFIG_MACH_TYPE MACH_TYPE_TS48XX/* text base address used when linking */
include/configs/vme8349.h +0 -2
@@ -212,8 +212,6 @@/* Pass Ethernet MAC to VxWorks */ #define CONFIG_SYS_VXWORKS_MAC_PTR 0x000043f0 -#undef CONFIG_WATCHDOG/* watchdog disabled */ -/* * Miscellaneous configurable options */
scripts/config_whitelist.txt +0 -1
@@ -4095,7 +4095,6 @@ CONFIG_VSC9953 CONFIG_WATCHDOG_NOWAYOUT CONFIG_WATCHDOG_PRESC CONFIG_WATCHDOG_RC -CONFIG_WATCHDOG_TIMEOUT CONFIG_WD_PERIOD CONFIG_X600 CONFIG_X86EMU_DEBUG
Signature · 1 line
2.17.1
PATCH 1/1 Convert CONFIG_WATCHDOG et al to Kconfig
Quoted 8 lines · Tom Rini
This converts the following to
Kconfig:
CONFIG_WATCHDOG
CONFIG_WATCHDOG_TIMEOUT
CONFIG_WDT
CONFIG_HW_WATCHDOG
CONFIG_DESIGNWARE_WATCHDOGSigned-off-by Tom Rini <[email protected]>
Before setting this in stone, after much recent personal confusion around the watchdog in u-boot, would it be worth considoring changing CONFIG_WATCHDOG to CONFIG_SW_WATCHDOG, then changing the other options as appropriate.
I say this as everytime I come back to enabling watchdog support on a new board, I always start with CONFIG_WATCHDOG to then find I actually don't need CONFIG_WATCHDOG but CONFIG_WDT + CONFIG_HW_WATCHDOG. It just feels like 3 settings saying the same thing when you're grepping the code to get a grasp on what support to enable.
Slightly off topic, but I then get even more confused around which option is DM enabled and which isn't, it doesn't seem to have a sensible naming barrier between the options like other subsystems do.
I realise this is probably going to cause some bikeshedding but if there is a time to change it, it would be in this series.
Quoted 906 lines
--- README | 15 --------------- configs/MPC8610HPCD_defconfig | 1 + configs/astro_mcf5373l_defconfig | 1 + configs/ids8313_defconfig | 1 + configs/kmcoge4_defconfig | 1 + include/configs/M5208EVBE.h | 3 --- include/configs/M52277EVB.h | 2 -- include/configs/M5235EVB.h | 3 --- include/configs/M5249EVB.h | 2 -- include/configs/M5253DEMO.h | 2 -- include/configs/M5272C3.h | 3 --- include/configs/M53017EVB.h | 3 --- include/configs/M5329EVB.h | 3 --- include/configs/M5373EVB.h | 3 --- include/configs/M54418TWR.h | 2 -- include/configs/M54451EVB.h | 2 -- include/configs/M54455EVB.h | 2 -- include/configs/M5475EVB.h | 3 --- include/configs/M5485EVB.h | 3 --- include/configs/MPC8315ERDB.h | 2 -- include/configs/MPC8323ERDB.h | 2 -- include/configs/MPC832XEMDS.h | 2 -- include/configs/MPC8349EMDS.h | 2 -- include/configs/MPC8349EMDS_SDRAM.h | 2 -- include/configs/MPC8349ITX.h | 1 - include/configs/MPC837XEMDS.h | 2 -- include/configs/MPC837XERDB.h | 2 -- include/configs/MPC8540ADS.h | 2 -- include/configs/MPC8541CDS.h | 2 -- include/configs/MPC8544DS.h | 2 -- include/configs/MPC8548CDS.h | 2 -- include/configs/MPC8555CDS.h | 2 -- include/configs/MPC8560ADS.h | 2 -- include/configs/MPC8568MDS.h | 2 -- include/configs/MPC8569MDS.h | 2 -- include/configs/MPC8572DS.h | 2 -- include/configs/MPC8610HPCD.h | 1 - include/configs/MPC8641HPCN.h | 2 -- include/configs/P1010RDB.h | 2 -- include/configs/TQM834x.h | 2 -- include/configs/UCP1020.h | 5 ----- include/configs/astro_mcf5373l.h | 11 ----------- include/configs/caddy2.h | 2 -- include/configs/cobra5272.h | 13 ------------- include/configs/controlcenterd.h | 1 - include/configs/dh_imx6.h | 7 ------- include/configs/display5.h | 7 ------- include/configs/eb_cpu5282.h | 2 -- include/configs/ids8313.h | 1 - include/configs/kmp204x.h | 1 - include/configs/m53menlo.h | 5 ----- include/configs/nokia_rx51.h | 3 --- include/configs/p1_p2_rdb_pc.h | 2 -- include/configs/sbc8349.h | 2 -- include/configs/sbc8548.h | 2 -- include/configs/sbc8641d.h | 2 -- include/configs/socfpga_soc64_common.h | 7 ------- include/configs/socrates.h | 2 -- include/configs/ts4800.h | 2 -- include/configs/vme8349.h | 2 -- scripts/config_whitelist.txt | 1 - 61 files changed, 4 insertions(+), 171 deletions(-)README +0
-15@@ -735,21 +735,6 @@ The following options need to be configured: the image. Only boards defining board_fdt_blob_setup() support this option (see include/fdtdec.h file). -- Watchdog: - CONFIG_WATCHDOG - If this variable is defined, it enables watchdog - support for the SoC. There must be support in the SoC - specific code for a watchdog. For the 8xx - CPUs, the SIU Watchdog feature is enabled in the SYPCR - register. When supported for a specific SoC is - available, then no further board specific code should - be needed to use it. - - CONFIG_HW_WATCHDOG - When using a watchdog circuitry external to the used - SoC, then define this variable and provide board - specific code for the "hw_watchdog_reset" function. - - Real-Time Clock: When CONFIG_CMD_DATE is selected, the type of the RTCconfigs/MPC8610HPCD_defconfig +1
-0@@ -34,4 +34,5 @@ CONFIG_SYS_NS16550=y CONFIG_USB=y CONFIG_USB_KEYBOARD=y CONFIG_VIDEO=y +CONFIG_WATCHDOG=y CONFIG_OF_LIBFDT=yconfigs/astro_mcf5373l_defconfig +1
-0@@ -30,3 +30,4 @@ CONFIG_FLASH_CFI_DRIVER=y CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y CONFIG_SYS_FLASH_PROTECTION=y CONFIG_SYS_FLASH_CFI=y +CONFIG_WATCHDOG=yconfigs/ids8313_defconfig +1
-0@@ -176,4 +176,5 @@ CONFIG_MII=y CONFIG_TSEC_ENET=y # CONFIG_PCI is not set CONFIG_SYS_NS16550=y +CONFIG_WATCHDOG=y CONFIG_OF_LIBFDT=yconfigs/kmcoge4_defconfig +1
-0@@ -65,6 +65,7 @@ CONFIG_SYS_QE_FMAN_FW_IN_SPIFLASH=y CONFIG_SYS_NS16550=y CONFIG_SPI=y CONFIG_FSL_ESPI=y +CONFIG_WATCHDOG=y CONFIG_ADDR_MAP=y CONFIG_SYS_NUM_ADDR_MAP=64 CONFIG_BCH=yinclude/configs/M5208EVBE.h +0
-3@@ -16,9 +16,6 @@#define CONFIG_MCFUART #define CONFIG_SYS_UART_PORT (0) -#undef CONFIG_WATCHDOG -#define CONFIG_WATCHDOG_TIMEOUT 5000 -#ifdef CONFIG_MCFFEC # define CONFIG_MII_INIT 1# define CONFIG_SYS_DISCOVER_PHY include/configs/M52277EVB.h +0
-2@@ -23,8 +23,6 @@#define CONFIG_MCFUART #define CONFIG_SYS_UART_PORT (0) -#undef CONFIG_WATCHDOG -#define CONFIG_TIMESTAMP /* Print image info with timestamp */ /* include/configs/M5235EVB.h +0
-3@@ -21,9 +21,6 @@#define CONFIG_MCFUART #define CONFIG_SYS_UART_PORT (0) -#undef CONFIG_WATCHDOG -#define CONFIG_WATCHDOG_TIMEOUT 5000/* timeout in milliseconds, max timeout is 6.71sec */ -/* * BOOTP options */ include/configs/M5249EVB.h +0
-2@@ -22,8 +22,6 @@#define CONFIG_MCFUART #define CONFIG_SYS_UART_PORT (0) -#undef CONFIG_WATCHDOG -#undef CONFIG_MONITOR_IS_IN_RAM/* no pre-loader required!!! ;-) */ /* include/configs/M5253DEMO.h +0
-2@@ -13,8 +13,6 @@#define CONFIG_MCFUART #define CONFIG_SYS_UART_PORT (0) -#undef CONFIG_WATCHDOG/* disable watchdog */ -/* Configuration for environment * Environment is embedded in u-boot in the second sector of the flash include/configs/M5272C3.h +0
-3@@ -21,9 +21,6 @@#define CONFIG_MCFUART #define CONFIG_SYS_UART_PORT (0) -#undef CONFIG_WATCHDOG -#define CONFIG_WATCHDOG_TIMEOUT 10000/* timeout in milliseconds */ -#undef CONFIG_MONITOR_IS_IN_RAM/* define if monitor is started from a pre-loader */ /* Configuration for environment include/configs/M53017EVB.h +0
-3@@ -21,9 +21,6 @@#define CONFIG_MCFUART #define CONFIG_SYS_UART_PORT (0) -#undef CONFIG_WATCHDOG -#define CONFIG_WATCHDOG_TIMEOUT 5000 -#define CONFIG_SYS_UNIFY_CACHE #ifdef CONFIG_MCFFEC include/configs/M5329EVB.h +0
-3@@ -21,9 +21,6 @@#define CONFIG_MCFUART #define CONFIG_SYS_UART_PORT (0) -#undef CONFIG_WATCHDOG -#define CONFIG_WATCHDOG_TIMEOUT 5000/* timeout in milliseconds, max timeout is 6.71sec */ -#define CONFIG_SYS_UNIFY_CACHE #ifdef CONFIG_MCFFEC include/configs/M5373EVB.h +0
-3@@ -23,9 +23,6 @@#define CONFIG_MCFUART #define CONFIG_SYS_UART_PORT (0) -#undef CONFIG_WATCHDOG -#define CONFIG_WATCHDOG_TIMEOUT 3360/* timeout in ms, max is 3.36 sec */ -#define CONFIG_SYS_UNIFY_CACHE #ifdef CONFIG_MCFFEC include/configs/M54418TWR.h +0
-2@@ -26,8 +26,6 @@#define LDS_BOARD_TEXT board/freescale/m54418twr/sbf_dram_init.o (.text*) -#undef CONFIG_WATCHDOG -#define CONFIG_TIMESTAMP /* Print image info with timestamp */ /* include/configs/M54451EVB.h +0
-2@@ -26,8 +26,6 @@#define LDS_BOARD_TEXT board/freescale/m54451evb/sbf_dram_init.o (.text*) -#undef CONFIG_WATCHDOG -#define CONFIG_TIMESTAMP /* Print image info with timestamp */ /* include/configs/M54455EVB.h +0
-2@@ -26,8 +26,6 @@#define LDS_BOARD_TEXT board/freescale/m54455evb/sbf_dram_init.o (.text*) -#undef CONFIG_WATCHDOG -#define CONFIG_TIMESTAMP /* Print image info with timestamp */ /* include/configs/M5475EVB.h +0
-3@@ -21,9 +21,6 @@#define CONFIG_MCFUART #define CONFIG_SYS_UART_PORT (0) -#undef CONFIG_HW_WATCHDOG -#define CONFIG_WATCHDOG_TIMEOUT 5000/* timeout in milliseconds, max timeout is 6.71sec */ -#define CONFIG_SLTTMR #ifdef CONFIG_FSLDMAFEC include/configs/M5485EVB.h +0
-3@@ -21,9 +21,6 @@#define CONFIG_MCFUART #define CONFIG_SYS_UART_PORT (0) -#undef CONFIG_HW_WATCHDOG -#define CONFIG_WATCHDOG_TIMEOUT 5000/* timeout in milliseconds, max timeout is 6.71sec */ -#define CONFIG_SLTTMR #ifdef CONFIG_FSLDMAFEC include/configs/MPC8315ERDB.h +0
-2@@ -303,8 +303,6 @@*/ #define CONFIG_BOOTP_BOOTFILESIZE -#undef CONFIG_WATCHDOG/* watchdog disabled */ -/* * Miscellaneous configurable options */ include/configs/MPC8323ERDB.h +0
-2@@ -219,8 +219,6 @@*/ #define CONFIG_BOOTP_BOOTFILESIZE -#undef CONFIG_WATCHDOG/* watchdog disabled */ -/* * Miscellaneous configurable options */ include/configs/MPC832XEMDS.h +0
-2@@ -243,8 +243,6 @@*/ #define CONFIG_BOOTP_BOOTFILESIZE -#undef CONFIG_WATCHDOG/* watchdog disabled */ -/* * Miscellaneous configurable options */ include/configs/MPC8349EMDS.h +0
-2@@ -276,8 +276,6 @@*/ #define CONFIG_BOOTP_BOOTFILESIZE -#undef CONFIG_WATCHDOG/* watchdog disabled */ -/* * Miscellaneous configurable options */ include/configs/MPC8349EMDS_SDRAM.h +0
-2@@ -331,8 +331,6 @@*/ #define CONFIG_BOOTP_BOOTFILESIZE -#undef CONFIG_WATCHDOG/* watchdog disabled */ -/* * Miscellaneous configurable options */ include/configs/MPC8349ITX.h +0
-1@@ -347,7 +347,6 @@ boards, we say we have two, but don't display a message if we find only one. */#define CONFIG_BOOTP_BOOTFILESIZE /* Watchdog */ -#undef CONFIG_WATCHDOG/* watchdog disabled */ /* * Miscellaneous configurable options include/configs/MPC837XEMDS.h +0
-2@@ -303,8 +303,6 @@ extern int board_pci_host_broken(void);*/ #define CONFIG_BOOTP_BOOTFILESIZE -#undef CONFIG_WATCHDOG/* watchdog disabled */ -#ifdef CONFIG_MMC #define CONFIG_FSL_ESDHC_PIN_MUX #define CONFIG_SYS_FSL_ESDHC_ADDR CONFIG_SYS_MPC83xx_ESDHC_ADDRinclude/configs/MPC837XERDB.h +0
-2@@ -322,8 +322,6 @@*/ #define CONFIG_BOOTP_BOOTFILESIZE -#undef CONFIG_WATCHDOG/* watchdog disabled */ -#ifdef CONFIG_MMC #define CONFIG_FSL_ESDHC_PIN_MUX #define CONFIG_SYS_FSL_ESDHC_ADDR CONFIG_SYS_MPC83xx_ESDHC_ADDRinclude/configs/MPC8540ADS.h +0
-2@@ -283,8 +283,6 @@*/ #define CONFIG_BOOTP_BOOTFILESIZE -#undef CONFIG_WATCHDOG/* watchdog disabled */ -/* * Miscellaneous configurable options */ include/configs/MPC8541CDS.h +0
-2@@ -315,8 +315,6 @@ extern unsigned long get_clock_freq(void);*/ #define CONFIG_BOOTP_BOOTFILESIZE -#undef CONFIG_WATCHDOG/* watchdog disabled */ -/* * Miscellaneous configurable options */ include/configs/MPC8544DS.h +0
-2@@ -318,8 +318,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);#define CONFIG_PCI_EHCI_DEVICE 0#endif -#undef CONFIG_WATCHDOG/* watchdog disabled */ -/* * Miscellaneous configurable options */ include/configs/MPC8548CDS.h +0
-2@@ -434,8 +434,6 @@ extern unsigned long get_clock_freq(void);*/ #define CONFIG_BOOTP_BOOTFILESIZE -#undef CONFIG_WATCHDOG/* watchdog disabled */ -/* * Miscellaneous configurable options */ include/configs/MPC8555CDS.h +0
-2@@ -313,8 +313,6 @@ extern unsigned long get_clock_freq(void);*/ #define CONFIG_BOOTP_BOOTFILESIZE -#undef CONFIG_WATCHDOG/* watchdog disabled */ -/* * Miscellaneous configurable options */ include/configs/MPC8560ADS.h +0
-2@@ -316,8 +316,6 @@*/ #define CONFIG_BOOTP_BOOTFILESIZE -#undef CONFIG_WATCHDOG/* watchdog disabled */ -/* * Miscellaneous configurable options */ include/configs/MPC8568MDS.h +0
-2@@ -326,8 +326,6 @@ extern unsigned long get_clock_freq(void);*/ #define CONFIG_BOOTP_BOOTFILESIZE -#undef CONFIG_WATCHDOG/* watchdog disabled */ -/* * Miscellaneous configurable options */ include/configs/MPC8569MDS.h +0
-2@@ -413,8 +413,6 @@ extern unsigned long get_clock_freq(void);*/ #define CONFIG_BOOTP_BOOTFILESIZE -#undef CONFIG_WATCHDOG/* watchdog disabled */ -#ifdef CONFIG_MMC #define CONFIG_FSL_ESDHC_PIN_MUX #define CONFIG_SYS_FSL_ESDHC_ADDR CONFIG_SYS_MPC85xx_ESDHC_ADDRinclude/configs/MPC8572DS.h +0
-2@@ -506,8 +506,6 @@#define CONFIG_PCI_EHCI_DEVICE 0#endif -#undef CONFIG_WATCHDOG/* watchdog disabled */ -/* * Miscellaneous configurable options */ include/configs/MPC8610HPCD.h +0
-1@@ -388,7 +388,6 @@*/ #define CONFIG_BOOTP_BOOTFILESIZE -#define CONFIG_WATCHDOG /* watchdog enabled */ #define CONFIG_SYS_WATCHDOG_FREQ 5000/* Feed interval, 5s */ /* include/configs/MPC8641HPCN.h +0
-2@@ -545,8 +545,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);*/ #define CONFIG_BOOTP_BOOTFILESIZE -#undef CONFIG_WATCHDOG/* watchdog disabled */ -/* * Miscellaneous configurable options */ include/configs/P1010RDB.h +0
-2@@ -651,8 +651,6 @@ extern unsigned long get_sdram_size(void);#define CONFIG_LOADS_ECHO /* echo on for serial download */ #define CONFIG_SYS_LOADS_BAUD_CHANGE /* allow baudrate change */ -#undef CONFIG_WATCHDOG/* watchdog disabled */ -#if defined(CONFIG_MMC ) || defined(CONFIG_USB_EHCI_HCD ) \ || defined(CONFIG_FSL_SATA )#endif include/configs/TQM834x.h +0
-2@@ -195,8 +195,6 @@*/ #define CONFIG_SYS_LOAD_ADDR 0x2000000/* default load address */ -#undef CONFIG_WATCHDOG/* watchdog disabled */ -/* * For booting Linux, the board info and command line data * have to be in the first 256 MB of memory, since this is include/configs/UCP1020.h +0
-5@@ -383,15 +383,10 @@#endif #endif -#undef CONFIG_WATCHDOG/* watchdog disabled */ -#ifdef CONFIG_MMC #define CONFIG_SYS_FSL_ESDHC_ADDR CONFIG_SYS_MPC85xx_ESDHC_ADDR#endif -/* Misc Extra Settings */ -#undef CONFIG_WATCHDOG/* watchdog disabled */ -/* * Miscellaneous configurable options */ include/configs/astro_mcf5373l.h +0
-11@@ -90,17 +90,6 @@#define CONFIG_SYS_UART_PORT (2)#define CONFIG_SYS_UART2_ALT3_GPIO -/* -* Watchdog configuration; Watchdog is disabled for running from RAM -* and set to highest possible value else. Beware there is no check -* in the watchdog code to validate the timeout value set here! -*/ - -#ifndef CONFIG_MONITOR_IS_IN_RAM -#define CONFIG_WATCHDOG -#define CONFIG_WATCHDOG_TIMEOUT 3355/* timeout in milliseconds */ -#endif -/* * Configuration for environment * Environment is located in the last sector of the flash include/configs/caddy2.h +0
-2@@ -212,8 +212,6 @@/* Pass Ethernet MAC to VxWorks */ #define CONFIG_SYS_VXWORKS_MAC_PTR 0x000043f0 -#undef CONFIG_WATCHDOG/* watchdog disabled */ -/* * Miscellaneous configurable options */ include/configs/cobra5272.h +0
-13@@ -46,19 +46,6 @@#define CONFIG_MCFUART #define CONFIG_SYS_UART_PORT (0) -/* --- -* set "#if 0" to "#if 1" if (Hardware)-WATCHDOG should be enabled & change -* timeout acc. to your needs -* #define CONFIG_WATCHDOG_TIMEOUT x , x is timeout in milliseconds, e. g. 10000 -* for 10 sec -* --- -*/ - -#if 0 -#define CONFIG_WATCHDOG -#define CONFIG_WATCHDOG_TIMEOUT 10000/* timeout in milliseconds */ -#endif -/* --- * CONFIG_MONITOR_IS_IN_RAM defines if u-boot is started from a different * bootloader residing in flash ('chainloading'); if you want to use include/configs/controlcenterd.h +0
-1@@ -281,7 +281,6 @@/* * Miscellaneous configurable options */ -#define CONFIG_HW_WATCHDOG #define CONFIG_LOADS_ECHO #define CONFIG_SYS_LOADS_BAUD_CHANGE include/configs/dh_imx6.h +0
-7@@ -81,13 +81,6 @@#endif #endif -/* Watchdog */ -#if defined(CONFIG_SPL_BUILD ) -#undef CONFIG_WDT -#undef CONFIG_WATCHDOG -#define CONFIG_HW_WATCHDOG -#endif -#define CONFIG_LOADADDR 0x12000000#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDRinclude/configs/display5.h +0
-7@@ -334,13 +334,6 @@#define CONFIG_SYS_INIT_SP_ADDR \ (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET) -/* Watchdog */ -#if defined(CONFIG_SPL_BUILD ) -#undef CONFIG_WDT -#undef CONFIG_WATCHDOG -#define CONFIG_HW_WATCHDOG -#endif -/* ENV config */ #ifdef CONFIG_ENV_IS_IN_SPI_FLASH /* The 0x120000 value corresponds to above SPI-NOR memory MAP */ include/configs/eb_cpu5282.h +0
-2@@ -28,8 +28,6 @@#define CONFIG_BOOT_RETRY_TIME -1#define CONFIG_RESET_TO_RETRY -#define CONFIG_HW_WATCHDOG -#define STATUS_LED_ACTIVE 0/*----------------------------------------------------------------------* include/configs/ids8313.h +0
-1@@ -157,7 +157,6 @@/* * HW-Watchdog */ -#define CONFIG_WATCHDOG 1#define CONFIG_SYS_WATCHDOG_VALUE 0xFFFF/* include/configs/kmp204x.h +0
-1@@ -333,7 +333,6 @@ int get_scl(void);/* * Hardware Watchdog */ -#define CONFIG_WATCHDOG /* enable CPU watchdog */ #define CONFIG_WATCHDOG_PRESC 34/* wdog prescaler 2^(64-34) (~10min) */ #define CONFIG_WATCHDOG_RC WRC_CHIP/* reset chip on watchdog event */ include/configs/m53menlo.h +0
-5@@ -226,9 +226,4 @@"fi ; " \ "fi\0" -#if defined(CONFIG_SPL_BUILD ) -#undef CONFIG_WATCHDOG -#define CONFIG_HW_WATCHDOG -#endif -#endif /* __M53MENLO_CONFIG_H__ */ include/configs/nokia_rx51.h +0
-3@@ -91,9 +91,6 @@#define CONFIG_SYS_ONENAND_BASE ONENAND_MAP -/* Watchdog support */ -#define CONFIG_HW_WATCHDOG -/* * Framebuffer */ include/configs/p1_p2_rdb_pc.h +0
-2@@ -626,8 +626,6 @@#define CONFIG_SYS_FSL_ESDHC_ADDR CONFIG_SYS_MPC85xx_ESDHC_ADDR#endif -#undef CONFIG_WATCHDOG/* watchdog disabled */ -/* * Miscellaneous configurable options */ include/configs/sbc8349.h +0
-2@@ -230,8 +230,6 @@*/ #define CONFIG_BOOTP_BOOTFILESIZE -#undef CONFIG_WATCHDOG/* watchdog disabled */ -/* * Miscellaneous configurable options */ include/configs/sbc8548.h +0
-2@@ -464,8 +464,6 @@*/ #define CONFIG_BOOTP_BOOTFILESIZE -#undef CONFIG_WATCHDOG/* watchdog disabled */ -/* * Miscellaneous configurable options */ include/configs/sbc8641d.h +0
-2@@ -422,8 +422,6 @@#define CONFIG_LOADS_ECHO 1/* echo on for serial download */ #define CONFIG_SYS_LOADS_BAUD_CHANGE 1/* allow baudrate change */ -#undef CONFIG_WATCHDOG/* watchdog disabled */ -/* * Miscellaneous configurable options */ include/configs/socfpga_soc64_common.h +0
-7@@ -144,13 +144,6 @@ unsigned int cm_get_qspi_controller_clk_hz(void);#define CONFIG_DW_ALTDESCRIPTOR #endif /* CONFIG_CMD_NET */ -/* -* L4 Watchdog -*/ -#ifndef CONFIG_SPL_BUILD -#undef CONFIG_HW_WATCHDOG -#undef CONFIG_DESIGNWARE_WATCHDOG -#endif #define CONFIG_DW_WDT_BASE SOCFPGA_L4WD0_ADDRESS#ifdef CONFIG_TARGET_SOCFPGA_STRATIX10 #ifndef __ASSEMBLY__include/configs/socrates.h +0
-2@@ -196,8 +196,6 @@*/ #define CONFIG_BOOTP_BOOTFILESIZE -#undef CONFIG_WATCHDOG/* watchdog disabled */ -/* * Miscellaneous configurable options */ include/configs/ts4800.h +0
-2@@ -16,8 +16,6 @@#define CONFIG_SKIP_LOWLEVEL_INIT /* U-Boot is a 2nd stage bootloader */ -#define CONFIG_HW_WATCHDOG -#define CONFIG_MACH_TYPE MACH_TYPE_TS48XX/* text base address used when linking */ include/configs/vme8349.h +0
-2@@ -212,8 +212,6 @@/* Pass Ethernet MAC to VxWorks */ #define CONFIG_SYS_VXWORKS_MAC_PTR 0x000043f0 -#undef CONFIG_WATCHDOG/* watchdog disabled */ -/* * Miscellaneous configurable options */ scripts/config_whitelist.txt +0
-1@@ -4095,7 +4095,6 @@ CONFIG_VSC9953 CONFIG_WATCHDOG_NOWAYOUT CONFIG_WATCHDOG_PRESC CONFIG_WATCHDOG_RC -CONFIG_WATCHDOG_TIMEOUT CONFIG_WD_PERIOD CONFIG_X600 CONFIG_X86EMU_DEBUG
PATCH 1/1 Convert CONFIG_WATCHDOG et al to Kconfig
Quoted 22 lines · Jack Mitchell
Quoted 8 lines · Tom Rini
This converts the following to
Kconfig:
CONFIG_WATCHDOG
CONFIG_WATCHDOG_TIMEOUT
CONFIG_WDT
CONFIG_HW_WATCHDOG
CONFIG_DESIGNWARE_WATCHDOGSigned-off-by Tom Rini <[email protected]>Before setting this in stone, after much recent personal confusion around the watchdog in u-boot, would it be worth considoring changing
CONFIG_WATCHDOGtoCONFIG_SW_WATCHDOG, then changing the other options as appropriate.I say this as everytime I come back to enabling watchdog support on a new board, I always start with
CONFIG_WATCHDOGto then find I actually don't needCONFIG_WATCHDOGbutCONFIG_WDT+CONFIG_HW_WATCHDOG. It just feels like 3 settings saying the same thing when you're grepping the code to get a grasp on what support to enable.
Quoted 6 lines
Slightly off topic, but I then get even more confused around which option is DM enabled and which isn't, it doesn't seem to have a sensible naming barrier between the options like other subsystems do.
I realise this is probably going to cause some bikeshedding but if there is a time to change it, it would be in this series.
I don't disagree with a more consistent set of names. However, this patch right here is just about moving boards that fiddle with a symbol in the config header that you must instead be setting in the defconfig. For example, this drops a "don't build watchdog in SPL" for stratix10 but that wasn't working ever for the board I'm pretty confident and
isn't working now, it's got the watchdog in both cases. To me this is
patch 1 of any series doing more with watchdog related options as getting everyone consistent makes it harder to convert one of the harder cases wrong.
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 659 bytes Desc: not available URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200923/e40bfc5c/attachment.sig>