Enable the watchdog before jumping to the linux kernel.
Change-Id: I0c6f3d77797e722bf18b849097bbc1deac5b73ce
diff --git a/board/mv_feroceon/mv_kw2/kw2_family/boardEnv/mvBoardEnvSpec.c b/board/mv_feroceon/mv_kw2/kw2_family/boardEnv/mvBoardEnvSpec.c
index ef83280..2cf5baa 100644
--- a/board/mv_feroceon/mv_kw2/kw2_family/boardEnv/mvBoardEnvSpec.c
+++ b/board/mv_feroceon/mv_kw2/kw2_family/boardEnv/mvBoardEnvSpec.c
@@ -1162,6 +1162,16 @@
/***************************************************************************
+** Used by both gflt110 and gflt200 configs.
+****************************************************************************/
+static MV_VOID gfltConfigWatchDog()
+{
+ mvCpuIfEnableWatchdogReset();
+ mvCntmrWrite(WATCHDOG, 0xffffffff);
+ mvCntmrEnable(WATCHDOG);
+}
+
+/***************************************************************************
** gflt200 prism
****************************************************************************/
/* NAND not supported */
@@ -1329,10 +1339,7 @@
SPI_FLASH_LOCK_WRITE|SPI_FLASH_LOCK_DOWN);
spi_flash_lock(flash, SYSVAR_RO_OFFSET1, SYSVAR_BLOCK_SIZE,
SPI_FLASH_LOCK_WRITE|SPI_FLASH_LOCK_DOWN);
-
- mvCpuIfEnableWatchdogReset();
- mvCntmrWrite(WATCHDOG, 0xffffffff);
- mvCntmrEnable(WATCHDOG);
+ gfltConfigWatchDog();
}
MV_BOARD_INFO gflt200Info = {
@@ -1472,9 +1479,15 @@
mvEthPhyRegWrite(0, 22, 0);
}
+static MV_VOID gflt110BoardPreBootOs(MV_BOARD_INFO *pBoardInfo)
+{
+ gfltConfigWatchDog();
+}
+
MV_BOARD_INFO gflt110Info = {
.boardName = "GFLT110",
.pBoardEgigaPhyInit = gflt110BoardEgigaPhyInit,
+ .pBoardPreBootOs = gflt110BoardPreBootOs,
.numBoardMppTypeValue = MV_ARRAY_SIZE(gflt110InfoBoardMppTypeInfo),
.pBoardMppTypeValue = gflt110InfoBoardMppTypeInfo,
.numBoardMppConfigValue = MV_ARRAY_SIZE(gflt110InfoBoardMppConfigValue),
