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

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