Merge with /home/m8/git/u-boot
This commit is contained in:
		
						commit
						e43232dee8
					
				| 
						 | 
					@ -2,6 +2,8 @@
 | 
				
			||||||
Changes for U-Boot 1.1.4:
 | 
					Changes for U-Boot 1.1.4:
 | 
				
			||||||
======================================================================
 | 
					======================================================================
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					* Change port configuration for O2DNT (CODEC1 on PSC1).
 | 
				
			||||||
 | 
					
 | 
				
			||||||
* Fix register for PCI async mode on PPC440EP
 | 
					* Fix register for PCI async mode on PPC440EP
 | 
				
			||||||
  Patch by Youngchul Bang, 08 Dec 2005
 | 
					  Patch by Youngchul Bang, 08 Dec 2005
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -238,7 +238,7 @@
 | 
				
			||||||
 * GPIO configuration
 | 
					 * GPIO configuration
 | 
				
			||||||
 */
 | 
					 */
 | 
				
			||||||
/*#define CFG_GPS_PORT_CONFIG	0x10002004 */
 | 
					/*#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
 | 
					 * Miscellaneous configurable options
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue