diff options
author | Wolfgang Denk <wd@denx.de> | 2011-04-27 21:48:09 +0200 |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2011-04-27 21:48:09 +0200 |
commit | f38536f9138c253b0c1f9c72093a7ec6808e638f (patch) | |
tree | 43bd82d4f1f96f549821d5fd941dfdc70712b501 /board/davedenx | |
parent | 34b5fc4d8bba594d53a15be970ca78b03db9d7f5 (diff) | |
parent | d32a1a4caa2a2ca7c385f4489167e170bf7fb5c1 (diff) | |
download | u-boot-imx-f38536f9138c253b0c1f9c72093a7ec6808e638f.zip u-boot-imx-f38536f9138c253b0c1f9c72093a7ec6808e638f.tar.gz u-boot-imx-f38536f9138c253b0c1f9c72093a7ec6808e638f.tar.bz2 |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'board/davedenx')
-rw-r--r-- | board/davedenx/qong/fpga.c | 4 | ||||
-rw-r--r-- | board/davedenx/qong/lowlevel_init.S | 2 | ||||
-rw-r--r-- | board/davedenx/qong/qong.c | 16 |
3 files changed, 17 insertions, 5 deletions
diff --git a/board/davedenx/qong/fpga.c b/board/davedenx/qong/fpga.c index 656d5cd..789acf0 100644 --- a/board/davedenx/qong/fpga.c +++ b/board/davedenx/qong/fpga.c @@ -23,8 +23,8 @@ */ #include <common.h> -#include <asm/arch/mx31.h> -#include <asm/arch/mx31-regs.h> +#include <asm/arch/clock.h> +#include <asm/arch/imx-regs.h> #include <mxc_gpio.h> #include <fpga.h> #include <lattice.h> diff --git a/board/davedenx/qong/lowlevel_init.S b/board/davedenx/qong/lowlevel_init.S index 80bed92..85fbfc3 100644 --- a/board/davedenx/qong/lowlevel_init.S +++ b/board/davedenx/qong/lowlevel_init.S @@ -20,7 +20,7 @@ * MA 02111-1307 USA */ -#include <asm/arch/mx31-regs.h> +#include <asm/arch/imx-regs.h> .macro REG reg, val ldr r2, =\reg diff --git a/board/davedenx/qong/qong.c b/board/davedenx/qong/qong.c index 8a81cfc..b1238d5 100644 --- a/board/davedenx/qong/qong.c +++ b/board/davedenx/qong/qong.c @@ -23,16 +23,24 @@ #include <common.h> #include <netdev.h> -#include <asm/arch/mx31.h> -#include <asm/arch/mx31-regs.h> +#include <asm/arch/clock.h> +#include <asm/arch/imx-regs.h> #include <asm/io.h> #include <nand.h> #include <fsl_pmic.h> #include <mxc_gpio.h> #include "qong_fpga.h" +#include <watchdog.h> 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 */ @@ -202,6 +210,10 @@ int board_late_init(void) pmic_reg_write(REG_POWER_CTL0, val | COINCHEN); pmic_reg_write(REG_INT_STATUS1, RTCRSTI); +#ifdef CONFIG_HW_WATCHDOG + mxc_hw_watchdog_enable(); +#endif + return 0; } |