diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-01-14 16:00:02 (GMT) |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-01-14 16:00:02 (GMT) |
| commit | a17617d6553369ba72c080128ed8d0b0c33dfc89 (patch) | |
| tree | c8903ddc48e628192c56cc95667f702fd1d77c6e /board/freescale/mx31pdk/mx31pdk.c | |
| parent | 1199c377cf14c240b903e351ab02b3b2cd3800c6 (diff) | |
| parent | 11d80af4876b609832856853b63d06a1011bccf1 (diff) | |
| download | u-boot-a17617d6553369ba72c080128ed8d0b0c33dfc89.tar.xz | |
Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'
Diffstat (limited to 'board/freescale/mx31pdk/mx31pdk.c')
| -rw-r--r-- | board/freescale/mx31pdk/mx31pdk.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/board/freescale/mx31pdk/mx31pdk.c b/board/freescale/mx31pdk/mx31pdk.c index bc60632..895396c 100644 --- a/board/freescale/mx31pdk/mx31pdk.c +++ b/board/freescale/mx31pdk/mx31pdk.c @@ -36,13 +36,6 @@ DECLARE_GLOBAL_DATA_PTR; -#ifdef CONFIG_HW_WATCHDOG -void hw_watchdog_reset(void) -{ - mxc_hw_watchdog_reset(); -} -#endif - int dram_init(void) { /* dram_init must store complete ramsize in gd->ram_size */ @@ -98,7 +91,7 @@ int board_late_init(void) pmic_reg_write(p, REG_POWER_CTL0, val | COINCHEN); pmic_reg_write(p, REG_INT_STATUS1, RTCRSTI); #ifdef CONFIG_HW_WATCHDOG - mxc_hw_watchdog_enable(); + hw_watchdog_init(); #endif return 0; } |