diff options
author | Wolfgang Denk <wd@denx.de> | 2008-04-29 16:11:33 +0200 |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2008-04-29 16:11:33 +0200 |
commit | fd2d2d1025b3cafa1d5846c4e4a8cda63b539160 (patch) | |
tree | 9ee1bac8ccda439c86c9e0f502d9a95c5912b622 | |
parent | 0e715a7a3fe24b293c19bfff07f813b9ce51f0a9 (diff) | |
parent | b2d527a8b9fb50afccbaf79b5540952585cdc760 (diff) | |
download | u-boot-imx-fd2d2d1025b3cafa1d5846c4e4a8cda63b539160.zip u-boot-imx-fd2d2d1025b3cafa1d5846c4e4a8cda63b539160.tar.gz u-boot-imx-fd2d2d1025b3cafa1d5846c4e4a8cda63b539160.tar.bz2 |
Merge branch 'master' of git+ssh://10.10.0.7/home/wd/git/u-boot/master
-rw-r--r-- | include/configs/lwmon5.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/configs/lwmon5.h b/include/configs/lwmon5.h index 690584a..1f669aa 100644 --- a/include/configs/lwmon5.h +++ b/include/configs/lwmon5.h @@ -91,9 +91,9 @@ /* Additional registers for watchdog timer post test */ -#define CFG_DSPIC_TEST_ADDR (CFG_PERIPHERAL_BASE + GPT0_MASK1) #define CFG_WATCHDOG_TIME_ADDR (CFG_PERIPHERAL_BASE + GPT0_MASK2) #define CFG_WATCHDOG_FLAGS_ADDR (CFG_PERIPHERAL_BASE + GPT0_MASK1) +#define CFG_DSPIC_TEST_ADDR CFG_WATCHDOG_FLAGS_ADDR #define CFG_WATCHDOG_MAGIC 0x12480000 #define CFG_WATCHDOG_MAGIC_MASK 0xFFFF0000 #define CFG_DSPIC_TEST_MASK 0x00000001 |