[U-Boot] [PATCH] arm: mx5: Enable WDT and bootcounter on M53Menlo

Enable watchdog and bootcounter support on the M53Menlo board.
Signed-off-by: Marek Vasut marex@denx.de Cc: Stefano Babic sbabic@denx.de --- configs/m53menlo_defconfig | 7 +++++++ include/configs/m53menlo.h | 5 +++++ 2 files changed, 12 insertions(+)
diff --git a/configs/m53menlo_defconfig b/configs/m53menlo_defconfig index 795f8a3ebc..8e26431969 100644 --- a/configs/m53menlo_defconfig +++ b/configs/m53menlo_defconfig @@ -20,6 +20,7 @@ CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_VERSION_VARIABLE=y CONFIG_SPL_BOARD_INIT=y CONFIG_SPL_NAND_SUPPORT=y +CONFIG_SPL_WATCHDOG_SUPPORT=y CONFIG_HUSH_PARSER=y CONFIG_CMD_ASKENV=y CONFIG_CMD_GREPENV=y @@ -33,6 +34,7 @@ CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y CONFIG_CMD_BMP=y +CONFIG_CMD_BOOTCOUNT=y CONFIG_CMD_DATE=y CONFIG_CMD_BTRFS=y CONFIG_CMD_EXT4=y @@ -44,6 +46,11 @@ CONFIG_MTDIDS_DEFAULT="nand0=mxc_nand" CONFIG_MTDPARTS_DEFAULT="mtdparts=mxc_nand:1m(u-boot),512k(env1),512k(env2),-(ubi)" CONFIG_CMD_UBI=y CONFIG_ENV_IS_IN_NAND=y +CONFIG_BOOTCOUNT_LIMIT=y +CONFIG_BOOTCOUNT_BOOTLIMIT=3 +CONFIG_SYS_BOOTCOUNT_SINGLEWORD=y +CONFIG_SYS_BOOTCOUNT_ADDR=0x53FA401C +CONFIG_SYS_BOOTCOUNT_MAGIC=0x0B01C041 CONFIG_FSL_ESDHC=y CONFIG_NAND=y CONFIG_NAND_MXC=y diff --git a/include/configs/m53menlo.h b/include/configs/m53menlo.h index 94214b135d..bef0c9b31d 100644 --- a/include/configs/m53menlo.h +++ b/include/configs/m53menlo.h @@ -158,6 +158,11 @@ /* IIM Fuses */ #define CONFIG_FSL_IIM
+/* Watchdog */ +#define CONFIG_HW_WATCHDOG +#define CONFIG_IMX_WATCHDOG +#define CONFIG_WATCHDOG_TIMEOUT_MSECS 8000 + /* * Boot Linux */

On Mon, Dec 03, 2018 at 11:12:54PM +0100, Marek Vasut wrote:
Enable watchdog and bootcounter support on the M53Menlo board.
Signed-off-by: Marek Vasut marex@denx.de Cc: Stefano Babic sbabic@denx.de
configs/m53menlo_defconfig | 7 +++++++ include/configs/m53menlo.h | 5 +++++ 2 files changed, 12 insertions(+)
diff --git a/configs/m53menlo_defconfig b/configs/m53menlo_defconfig index 795f8a3ebc..8e26431969 100644 --- a/configs/m53menlo_defconfig +++ b/configs/m53menlo_defconfig @@ -20,6 +20,7 @@ CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_VERSION_VARIABLE=y CONFIG_SPL_BOARD_INIT=y CONFIG_SPL_NAND_SUPPORT=y +CONFIG_SPL_WATCHDOG_SUPPORT=y CONFIG_HUSH_PARSER=y CONFIG_CMD_ASKENV=y CONFIG_CMD_GREPENV=y @@ -33,6 +34,7 @@ CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y CONFIG_CMD_BMP=y +CONFIG_CMD_BOOTCOUNT=y CONFIG_CMD_DATE=y CONFIG_CMD_BTRFS=y CONFIG_CMD_EXT4=y @@ -44,6 +46,11 @@ CONFIG_MTDIDS_DEFAULT="nand0=mxc_nand" CONFIG_MTDPARTS_DEFAULT="mtdparts=mxc_nand:1m(u-boot),512k(env1),512k(env2),-(ubi)" CONFIG_CMD_UBI=y CONFIG_ENV_IS_IN_NAND=y +CONFIG_BOOTCOUNT_LIMIT=y +CONFIG_BOOTCOUNT_BOOTLIMIT=3 +CONFIG_SYS_BOOTCOUNT_SINGLEWORD=y +CONFIG_SYS_BOOTCOUNT_ADDR=0x53FA401C +CONFIG_SYS_BOOTCOUNT_MAGIC=0x0B01C041 CONFIG_FSL_ESDHC=y CONFIG_NAND=y CONFIG_NAND_MXC=y diff --git a/include/configs/m53menlo.h b/include/configs/m53menlo.h index 94214b135d..bef0c9b31d 100644 --- a/include/configs/m53menlo.h +++ b/include/configs/m53menlo.h @@ -158,6 +158,11 @@ /* IIM Fuses */ #define CONFIG_FSL_IIM
+/* Watchdog */ +#define CONFIG_HW_WATCHDOG +#define CONFIG_IMX_WATCHDOG
At least these two symbols are in Kconfig today, please use them (and maybe some guard symbol is missing), thanks.
+#define CONFIG_WATCHDOG_TIMEOUT_MSECS 8000
This one isn't migrated yet, so I can't complain, only beg for a migration :)

On 12/06/2018 09:30 PM, Tom Rini wrote:
On Mon, Dec 03, 2018 at 11:12:54PM +0100, Marek Vasut wrote:
Enable watchdog and bootcounter support on the M53Menlo board.
Signed-off-by: Marek Vasut marex@denx.de Cc: Stefano Babic sbabic@denx.de
configs/m53menlo_defconfig | 7 +++++++ include/configs/m53menlo.h | 5 +++++ 2 files changed, 12 insertions(+)
diff --git a/configs/m53menlo_defconfig b/configs/m53menlo_defconfig index 795f8a3ebc..8e26431969 100644 --- a/configs/m53menlo_defconfig +++ b/configs/m53menlo_defconfig @@ -20,6 +20,7 @@ CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_VERSION_VARIABLE=y CONFIG_SPL_BOARD_INIT=y CONFIG_SPL_NAND_SUPPORT=y +CONFIG_SPL_WATCHDOG_SUPPORT=y CONFIG_HUSH_PARSER=y CONFIG_CMD_ASKENV=y CONFIG_CMD_GREPENV=y @@ -33,6 +34,7 @@ CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y CONFIG_CMD_BMP=y +CONFIG_CMD_BOOTCOUNT=y CONFIG_CMD_DATE=y CONFIG_CMD_BTRFS=y CONFIG_CMD_EXT4=y @@ -44,6 +46,11 @@ CONFIG_MTDIDS_DEFAULT="nand0=mxc_nand" CONFIG_MTDPARTS_DEFAULT="mtdparts=mxc_nand:1m(u-boot),512k(env1),512k(env2),-(ubi)" CONFIG_CMD_UBI=y CONFIG_ENV_IS_IN_NAND=y +CONFIG_BOOTCOUNT_LIMIT=y +CONFIG_BOOTCOUNT_BOOTLIMIT=3 +CONFIG_SYS_BOOTCOUNT_SINGLEWORD=y +CONFIG_SYS_BOOTCOUNT_ADDR=0x53FA401C +CONFIG_SYS_BOOTCOUNT_MAGIC=0x0B01C041 CONFIG_FSL_ESDHC=y CONFIG_NAND=y CONFIG_NAND_MXC=y diff --git a/include/configs/m53menlo.h b/include/configs/m53menlo.h index 94214b135d..bef0c9b31d 100644 --- a/include/configs/m53menlo.h +++ b/include/configs/m53menlo.h @@ -158,6 +158,11 @@ /* IIM Fuses */ #define CONFIG_FSL_IIM
+/* Watchdog */ +#define CONFIG_HW_WATCHDOG +#define CONFIG_IMX_WATCHDOG
At least these two symbols are in Kconfig today, please use them (and maybe some guard symbol is missing), thanks.
Fixed
+#define CONFIG_WATCHDOG_TIMEOUT_MSECS 8000
This one isn't migrated yet, so I can't complain, only beg for a migration :)
Should be doable by running the script, there don't seem to be any intricacies involved with this one.

On Fri, Dec 07, 2018 at 02:35:23AM +0100, Marek Vasut wrote:
On 12/06/2018 09:30 PM, Tom Rini wrote:
On Mon, Dec 03, 2018 at 11:12:54PM +0100, Marek Vasut wrote:
Enable watchdog and bootcounter support on the M53Menlo board.
Signed-off-by: Marek Vasut marex@denx.de Cc: Stefano Babic sbabic@denx.de
configs/m53menlo_defconfig | 7 +++++++ include/configs/m53menlo.h | 5 +++++ 2 files changed, 12 insertions(+)
diff --git a/configs/m53menlo_defconfig b/configs/m53menlo_defconfig index 795f8a3ebc..8e26431969 100644 --- a/configs/m53menlo_defconfig +++ b/configs/m53menlo_defconfig @@ -20,6 +20,7 @@ CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_VERSION_VARIABLE=y CONFIG_SPL_BOARD_INIT=y CONFIG_SPL_NAND_SUPPORT=y +CONFIG_SPL_WATCHDOG_SUPPORT=y CONFIG_HUSH_PARSER=y CONFIG_CMD_ASKENV=y CONFIG_CMD_GREPENV=y @@ -33,6 +34,7 @@ CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y CONFIG_CMD_BMP=y +CONFIG_CMD_BOOTCOUNT=y CONFIG_CMD_DATE=y CONFIG_CMD_BTRFS=y CONFIG_CMD_EXT4=y @@ -44,6 +46,11 @@ CONFIG_MTDIDS_DEFAULT="nand0=mxc_nand" CONFIG_MTDPARTS_DEFAULT="mtdparts=mxc_nand:1m(u-boot),512k(env1),512k(env2),-(ubi)" CONFIG_CMD_UBI=y CONFIG_ENV_IS_IN_NAND=y +CONFIG_BOOTCOUNT_LIMIT=y +CONFIG_BOOTCOUNT_BOOTLIMIT=3 +CONFIG_SYS_BOOTCOUNT_SINGLEWORD=y +CONFIG_SYS_BOOTCOUNT_ADDR=0x53FA401C +CONFIG_SYS_BOOTCOUNT_MAGIC=0x0B01C041 CONFIG_FSL_ESDHC=y CONFIG_NAND=y CONFIG_NAND_MXC=y diff --git a/include/configs/m53menlo.h b/include/configs/m53menlo.h index 94214b135d..bef0c9b31d 100644 --- a/include/configs/m53menlo.h +++ b/include/configs/m53menlo.h @@ -158,6 +158,11 @@ /* IIM Fuses */ #define CONFIG_FSL_IIM
+/* Watchdog */ +#define CONFIG_HW_WATCHDOG +#define CONFIG_IMX_WATCHDOG
At least these two symbols are in Kconfig today, please use them (and maybe some guard symbol is missing), thanks.
Fixed
+#define CONFIG_WATCHDOG_TIMEOUT_MSECS 8000
This one isn't migrated yet, so I can't complain, only beg for a migration :)
Should be doable by running the script, there don't seem to be any intricacies involved with this one.
Thanks.
participants (2)
-
Marek Vasut
-
Tom Rini