diff options
| author | Wolfgang Denk <wd@pollux.denx.de> | 2006-11-12 21:12:52 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2006-11-12 21:12:52 +0100 |
| commit | cb2eb17b2f80c22ff8e883cd4e59e97010fa0e4a (patch) | |
| tree | 2fef15116403337d8eb2bdd31b3e371d160129a4 | |
| parent | 91650b3e4de688038d4f71279c44858e3e2c6870 (diff) | |
| parent | ce3f1a40c507afbab06c5eb58ccdc6713eda3245 (diff) | |
| download | u-boot-imx-cb2eb17b2f80c22ff8e883cd4e59e97010fa0e4a.zip u-boot-imx-cb2eb17b2f80c22ff8e883cd4e59e97010fa0e4a.tar.gz u-boot-imx-cb2eb17b2f80c22ff8e883cd4e59e97010fa0e4a.tar.bz2 | |
Merge with /home/tur/proj/v38b/u-boot
| -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 |