From: Claudius Heine <ch@denx.de>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH v2 2/2] ARM: imx6: DHCOM i.MX6 PDK: Enable sysreset driver and wdt command
Date: Fri, 29 Nov 2019 08:59:03 +0100 [thread overview]
Message-ID: <20191129075906.1724-3-ch@denx.de> (raw)
In-Reply-To: <20191129075906.1724-1-ch@denx.de>
The SPL does not have DM enabled and therefor still needs to use the
hardware watchdog interface provided by the imx-watchdog driver.
Fixes: broken reset command after f2929d11a639 ("watchdog: imx: Use
immediate reset bits for expire_now")
Signed-off-by: Claudius Heine <ch@denx.de>
---
configs/dh_imx6_defconfig | 3 +++
include/configs/dh_imx6.h | 5 +++++
2 files changed, 8 insertions(+)
diff --git a/configs/dh_imx6_defconfig b/configs/dh_imx6_defconfig
index 4055812007..e5c44381b2 100644
--- a/configs/dh_imx6_defconfig
+++ b/configs/dh_imx6_defconfig
@@ -37,6 +37,7 @@ CONFIG_CMD_MMC=y
CONFIG_CMD_SATA=y
CONFIG_CMD_USB=y
CONFIG_CMD_USB_MASS_STORAGE=y
+CONFIG_CMD_WDT=y
CONFIG_CMD_CACHE=y
CONFIG_CMD_TIME=y
CONFIG_CMD_EXT4_WRITE=y
@@ -77,6 +78,8 @@ CONFIG_DM_SCSI=y
CONFIG_SPI=y
CONFIG_DM_SPI=y
CONFIG_MXC_SPI=y
+CONFIG_SYSRESET=y
+CONFIG_SYSRESET_WATCHDOG=y
CONFIG_USB=y
CONFIG_DM_USB=y
CONFIG_USB_GADGET=y
diff --git a/include/configs/dh_imx6.h b/include/configs/dh_imx6.h
index d4bd88f511..77074aaa06 100644
--- a/include/configs/dh_imx6.h
+++ b/include/configs/dh_imx6.h
@@ -87,6 +87,11 @@
#endif
/* Watchdog */
+#if defined(CONFIG_SPL_BUILD)
+#undef CONFIG_WDT
+#undef CONFIG_WATCHDOG
+#define CONFIG_HW_WATCHDOG
+#endif
/* allow to overwrite serial and ethaddr */
#define CONFIG_ENV_OVERWRITE
--
2.21.0
next prev parent reply other threads:[~2019-11-29 7:59 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-29 7:59 [U-Boot] [PATCH v2 0/2] ARM: imx6: DHCOM i.MX6 PDK: Fixing reset Claudius Heine
2019-11-29 7:59 ` [U-Boot] [PATCH v2 1/2] ARM: dts: dh-imx6: add u-boot specific wdt-reboot node Claudius Heine
2019-12-29 10:24 ` sbabic at denx.de
2019-11-29 7:59 ` Claudius Heine [this message]
2019-12-29 10:24 ` [U-Boot] [PATCH v2 2/2] ARM: imx6: DHCOM i.MX6 PDK: Enable sysreset driver and wdt command sbabic at denx.de
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191129075906.1724-3-ch@denx.de \
--to=ch@denx.de \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox