Merge with /home/tur/proj/v38b/u-boot

This commit is contained in:
Wolfgang Denk 2006-11-12 21:12:52 +01:00 committed by Wolfgang Denk
commit cb2eb17b2f

View file

@ -34,7 +34,7 @@
#define CONFIG_RTC_PCF8563 1 /* has PCF8563 RTC */ #define CONFIG_RTC_PCF8563 1 /* has PCF8563 RTC */
#define CONFIG_MPC5200_DDR 1 /* has DDR SDRAM */ #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 #define CONFIG_NETCONSOLE 1
@ -246,7 +246,7 @@
/* /*
* GPIO configuration * GPIO configuration
*/ */
#define CFG_GPS_PORT_CONFIG 0x90000404 #define CFG_GPS_PORT_CONFIG 0x90001404
/* /*
* Miscellaneous configurable options * Miscellaneous configurable options