bsp/imx: Implement bsp_reset()

Update #3090.

4 files changed, 79 insertions, 1 deletions

diff --git a/c/src/lib/libbsp/arm/imx/Makefile.am b/c/src/lib/libbsp/arm/imx/Makefile.am
index c131edc67a..322df3b097 100644
--- a/c/src/lib/libbsp/arm/imx/Makefile.am
+++ b/c/src/lib/libbsp/arm/imx/Makefile.am
@@ -48,6 +48,7 @@ include_arm_freescale_imx_HEADERS += include/arm/freescale/imx/imx_iomuxreg.h
 include_arm_freescale_imx_HEADERS += include/arm/freescale/imx/imx_iomuxvar.h
 include_arm_freescale_imx_HEADERS += include/arm/freescale/imx/imx_srcreg.h
 include_arm_freescale_imx_HEADERS += include/arm/freescale/imx/imx_uartreg.h
+include_arm_freescale_imx_HEADERS += include/arm/freescale/imx/imx_wdogreg.h
 
 ###############################################################################
 #                  Data                                                       #
diff --git a/c/src/lib/libbsp/arm/imx/include/arm/freescale/imx/imx_wdogreg.h b/c/src/lib/libbsp/arm/imx/include/arm/freescale/imx/imx_wdogreg.h
new file mode 100644
index 0000000000..e26dfb2cc3
--- /dev/null
+++ b/c/src/lib/libbsp/arm/imx/include/arm/freescale/imx/imx_wdogreg.h
@@ -0,0 +1,62 @@
+/*-
+ * Copyright (c) 2012, 2013 The FreeBSD Foundation
+ * All rights reserved.
+ *
+ * This software was developed by Oleksandr Rybalko under sponsorship
+ * from the FreeBSD Foundation.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1.	Redistributions of source code must retain the above copyright
+ *	notice, this list of conditions and the following disclaimer.
+ * 2.	Redistributions in binary form must reproduce the above copyright
+ *	notice, this list of conditions and the following disclaimer in the
+ *	documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * $FreeBSD: head/sys/arm/freescale/imx/imx_wdogreg.h 291367 2015-11-26 17:26:52Z ian $
+ */
+
+#define	WDOG_CLK_FREQ	32768
+
+#define	WDOG_CR_REG	0x00	/* Control Register */
+#define		WDOG_CR_WT_MASK		0xff00	/* Count of 0.5 sec */
+#define		WDOG_CR_WT_SHIFT	8
+#define		WDOG_CR_WDW		(1 << 7) /* Suspend WDog */
+#define		WDOG_CR_WDA		(1 << 5) /* Don't touch ipp_wdog */
+#define		WDOG_CR_SRS		(1 << 4) /* Don't touch sys_reset */
+#define		WDOG_CR_WDT		(1 << 3) /* Assert ipp_wdog on tout */
+#define		WDOG_CR_WDE		(1 << 2) /* WDog Enable */
+#define		WDOG_CR_WDBG		(1 << 1) /* Suspend when DBG mode */
+#define		WDOG_CR_WDZST		(1 << 0) /* Suspend when LP mode */
+
+#define	WDOG_SR_REG	0x02	/* Service Register */
+#define		WDOG_SR_STEP1		0x5555
+#define		WDOG_SR_STEP2		0xaaaa
+
+#define	WDOG_RSR_REG	0x04	/* Reset Status Register */
+#define		WDOG_RSR_POR		(1 << 4) /* Due to Power-On Reset */
+#define		WDOG_RSR_TOUT		(1 << 1) /* Due WDog timeout reset */
+#define		WDOG_RSR_SFTW		(1 << 0) /* Due Soft reset */
+
+#define	WDOG_ICR_REG	0x06	/* Interrupt Control Register */
+#define		WDOG_ICR_WIE		(1 << 15) /* Enable Interrupt */
+#define		WDOG_ICR_WTIS		(1 << 14) /* Interrupt has occurred */
+#define		WDOG_ICR_WTCT_MASK	0x00ff
+#define		WDOG_ICR_WTCT_SHIFT	0	/* Interrupt hold time */
+
+#define	WDOG_MCR_REG	0x08	/* Miscellaneous Control Register */
+#define		WDOG_MCR_PDE		(1 << 0)
+
diff --git a/c/src/lib/libbsp/arm/imx/preinstall.am b/c/src/lib/libbsp/arm/imx/preinstall.am
index a4cff951f8..ca0197600e 100644
--- a/c/src/lib/libbsp/arm/imx/preinstall.am
+++ b/c/src/lib/libbsp/arm/imx/preinstall.am
@@ -163,6 +163,10 @@ $(PROJECT_INCLUDE)/arm/freescale/imx/imx_uartreg.h: include/arm/freescale/imx/im
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/arm/freescale/imx/imx_uartreg.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/arm/freescale/imx/imx_uartreg.h
 
+$(PROJECT_INCLUDE)/arm/freescale/imx/imx_wdogreg.h: include/arm/freescale/imx/imx_wdogreg.h $(PROJECT_INCLUDE)/arm/freescale/imx/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/arm/freescale/imx/imx_wdogreg.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/arm/freescale/imx/imx_wdogreg.h
+
 $(PROJECT_LIB)/start.$(OBJEXT): start.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_LIB)/start.$(OBJEXT)
 TMPINSTALL_FILES += $(PROJECT_LIB)/start.$(OBJEXT)
diff --git a/c/src/lib/libbsp/arm/imx/startup/bspreset.c b/c/src/lib/libbsp/arm/imx/startup/bspreset.c
index 5d0ffe78a4..11eb039ef3 100644
--- a/c/src/lib/libbsp/arm/imx/startup/bspreset.c
+++ b/c/src/lib/libbsp/arm/imx/startup/bspreset.c
@@ -14,7 +14,18 @@
 
 #include <bsp/bootcard.h>
 
+#include <arm/freescale/imx/imx_wdogreg.h>
+
 void bsp_reset(void)
 {
-  /* TODO */
+  volatile uint16_t *pcr;
+
+  pcr = (volatile uint16_t *) 0x30280000;
+  *pcr &= ~WDOG_CR_SRS;
+  *pcr &= ~WDOG_CR_SRS;
+  *pcr &= ~WDOG_CR_SRS;
+
+  while (true) {
+    /* Wait */
+  }
 }