diff options
author | roy zang <tie-fei.zang@freescale.com> | 2006-12-04 23:57:35 +0800 |
---|---|---|
committer | Zang Tiefei <roy@bus.ap.freescale.net> | 2006-12-04 23:57:35 +0800 |
commit | d3bb5ec198edad4869ac5276a5899881b7bf5433 (patch) | |
tree | 409a70e937d5f826df7929d11cb08a7cd207f5cd /include/configs/v38b.h | |
parent | 41862d13a87ec58c21166b10fcb754c963bc46f2 (diff) | |
parent | 9d27b3a0685ff99fc477983f315c04d49f657a8a (diff) | |
download | u-boot-imx-d3bb5ec198edad4869ac5276a5899881b7bf5433.zip u-boot-imx-d3bb5ec198edad4869ac5276a5899881b7bf5433.tar.gz u-boot-imx-d3bb5ec198edad4869ac5276a5899881b7bf5433.tar.bz2 |
Merge /home/roy/CVS/7448/Open_Source/u-boot.git.dev
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 |