arm: mx5: Enable WDT and bootcounter on M53Menlo

PATCH New Marek Vasut 2 participants 4 messages Dec 3, 2018 – Dec 7, 2018

lore

Share & tools

lore

Marek Vasut

author

2018-12-03 22:12 UTC #0 lore raw

PATCH 1/1 arm: mx5: Enable WDT and bootcounter on M53Menlo

Enable watchdog and bootcounter support on the M53Menlo board.

Signed-off-by Marek Vasut <[email protected]>

Cc Stefano Babic <[email protected]>

---
 configs/m53menlo_defconfig | 7 +++++++
 include/configs/m53menlo.h | 5 +++++
 2 files changed, 12 insertions(+)

configs/m53menlo_defconfig +7 -0

index 795f8a3ebc..8e26431969 100644
@@ -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

include/configs/m53menlo.h +5 -0

index 94214b135d..bef0c9b31d 100644
@@ -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
  */

Signature · 1 line

2.18.0

Tom Rini

2018-12-06 20:30 UTC #1 lore raw

PATCH 1/1 arm: mx5: Enable WDT and bootcounter on M53Menlo

Quoted 46 lines · Marek Vasut

Enable watchdog and bootcounter support on the M53Menlo board.

Signed-off-by Marek Vasut <[email protected]>

Cc Stefano Babic <[email protected]>

---
 configs/m53menlo_defconfig | 7 +++++++
 include/configs/m53menlo.h | 5 +++++
 2 files changed, 12 insertions(+)

configs/m53menlo_defconfig +7 -0

index 795f8a3ebc..8e26431969 100644
@@ -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

include/configs/m53menlo.h +0 -0

index 94214b135d..bef0c9b31d 100644

include/configs/m53menlo.h line 163

Quoted 6 lines

include/configs/m53menlo.h +3 -0

@@ -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.

include/configs/m53menlo.h line 164

Quoted 1 line

include/configs/m53menlo.h +1 -0
+#define CONFIG_WATCHDOG_TIMEOUT_MSECS 8000

This one isn't migrated yet, so I can't complain, only beg for a migration :)

Signature · 8 lines

Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20181206/b0b1bdaa/attachment.sig>

Marek Vasut

author

2018-12-07 01:35 UTC #2 lore raw

PATCH 1/1 arm: mx5: Enable WDT and bootcounter on M53Menlo

Quoted 50 lines · Tom Rini

Quoted 49 lines · Marek Vasut

Enable watchdog and bootcounter support on the M53Menlo board.

Signed-off-by Marek Vasut <[email protected]>

Cc Stefano Babic <[email protected]>

---
 configs/m53menlo_defconfig | 7 +++++++
 include/configs/m53menlo.h | 5 +++++
 2 files changed, 12 insertions(+)

configs/m53menlo_defconfig +7 -0

index 795f8a3ebc..8e26431969 100644
@@ -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

include/configs/m53menlo.h +0 -0

index 94214b135d..bef0c9b31d 100644
@@ -158,6 +158,11 @@
 /* IIM Fuses */
 #define CONFIG_FSL_IIM

Quoted 6 lines

include/configs/m53menlo.h line 163
Quoted 3 lines
include/configs/m53menlo.h +3 -0
+/* 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

Quoted 4 lines

include/configs/m53menlo.h line 164
Quoted 1 line
include/configs/m53menlo.h +1 -0
+#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.

Signature · 2 lines

Best regards,
Marek Vasut

Tom Rini

2018-12-07 12:17 UTC #3 lore raw

PATCH 1/1 arm: mx5: Enable WDT and bootcounter on M53Menlo

Quoted 60 lines · Marek Vasut

Quoted 50 lines · Tom Rini

Quoted 49 lines · Marek Vasut

Enable watchdog and bootcounter support on the M53Menlo board.

Signed-off-by Marek Vasut <[email protected]>

Cc Stefano Babic <[email protected]>

---
 configs/m53menlo_defconfig | 7 +++++++
 include/configs/m53menlo.h | 5 +++++
 2 files changed, 12 insertions(+)

configs/m53menlo_defconfig +7 -0

index 795f8a3ebc..8e26431969 100644
@@ -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

include/configs/m53menlo.h +0 -0

index 94214b135d..bef0c9b31d 100644
@@ -158,6 +158,11 @@
 /* IIM Fuses */
 #define CONFIG_FSL_IIM

Quoted 6 lines

include/configs/m53menlo.h line 163
Quoted 3 lines
include/configs/m53menlo.h +3 -0
+/* 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

Quoted 7 lines

Quoted 4 lines
include/configs/m53menlo.h line 164
Quoted 1 line
include/configs/m53menlo.h +1 -0
+#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.

Signature · 8 lines

Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20181207/115d2dc1/attachment.sig>