move pistachio watchdog init to common location

Signed-off-by: Ian Pozella <Ian.Pozella@imgtec.com>
CreatorDev · Dec 5, 2016 · 815fe67 · 815fe67
1 parent 455f049
commit 815fe67
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/board/imgtec/pistachio_bub/pistachio.c b/board/imgtec/pistachio_bub/pistachio.c
@@ -201,9 +201,6 @@ int board_late_init(void)
 		printf("Failed to enable tpm!\n");
 		return 1;
 	}
-#endif
-#ifdef CONFIG_PISTACHIO_WATCHDOG
-	hw_watchdog_init();
 #endif
 	return 0;
 }

diff --git a/common/board_f.c b/common/board_f.c
@@ -115,7 +115,7 @@ static int init_func_watchdog_init(void)
 # if defined(CONFIG_HW_WATCHDOG) && (defined(CONFIG_BLACKFIN) || \
 	defined(CONFIG_M68K) || defined(CONFIG_MICROBLAZE) || \
 	defined(CONFIG_SH) || defined(CONFIG_AT91SAM9_WATCHDOG) || \
-	defined(CONFIG_IMX_WATCHDOG))
+	defined(CONFIG_IMX_WATCHDOG) || defined(CONFIG_PISTACHIO_WATCHDOG))
 	hw_watchdog_init();
 # endif
 	puts("       Watchdog enabled\n");