diff options
author | Kim Phillips <kim.phillips@freescale.com> | 2006-11-28 23:35:49 -0600 |
---|---|---|
committer | Kim Phillips <kim.phillips@freescale.com> | 2006-11-28 23:35:49 -0600 |
commit | 32081125a028aff9e93af5281c777b0745ef8558 (patch) | |
tree | 4e4f95da64aed9db11bb245a00e5c0bead04ad23 /include/configs/v38b.h | |
parent | cf3d045e51ca8dcc6cf759827140861d6ac25c04 (diff) | |
parent | d2c83f549378fb3fc34cb3c2e62fd772fbf8b68b (diff) | |
download | u-boot-imx-32081125a028aff9e93af5281c777b0745ef8558.zip u-boot-imx-32081125a028aff9e93af5281c777b0745ef8558.tar.gz u-boot-imx-32081125a028aff9e93af5281c777b0745ef8558.tar.bz2 |
Merge http://www.denx.de/git/u-boot
Diffstat (limited to 'include/configs/v38b.h')
-rw-r--r-- | include/configs/v38b.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/configs/v38b.h b/include/configs/v38b.h index cf2d031..554a7a4 100644 --- a/include/configs/v38b.h +++ b/include/configs/v38b.h @@ -34,7 +34,7 @@ #define CONFIG_RTC_PCF8563 1 /* has PCF8563 RTC */ #define CONFIG_MPC5200_DDR 1 /* has DDR SDRAM */ -#define CONFIG_HW_WATCHDOG 1 /* has watchdog */ +#undef CONFIG_HW_WATCHDOG /* don't use watchdog */ #define CONFIG_NETCONSOLE 1 @@ -246,7 +246,7 @@ /* * GPIO configuration */ -#define CFG_GPS_PORT_CONFIG 0x90000404 +#define CFG_GPS_PORT_CONFIG 0x90001404 /* * Miscellaneous configurable options |