Merge with /home/m8/git/u-boot

This commit is contained in:
Wolfgang Denk 2005-12-14 15:05:59 +01:00
commit e43232dee8
2 changed files with 3 additions and 1 deletions

View file

@ -2,6 +2,8 @@
Changes for U-Boot 1.1.4:
======================================================================
* Change port configuration for O2DNT (CODEC1 on PSC1).
* Fix register for PCI async mode on PPC440EP
Patch by Youngchul Bang, 08 Dec 2005

View file

@ -238,7 +238,7 @@
* GPIO configuration
*/
/*#define CFG_GPS_PORT_CONFIG 0x10002004 */
#define CFG_GPS_PORT_CONFIG 0x00002004 /* no CAN */
#define CFG_GPS_PORT_CONFIG 0x00002006 /* no CAN */
/*
* Miscellaneous configurable options