Merge branch 'master' of http://git.denx.de/u-boot-sunxi
This commit is contained in:
		
						commit
						b2016133ed
					
				| 
						 | 
				
			
			@ -223,6 +223,7 @@ int cpu_eth_init(bd_t *bis)
 | 
			
		|||
	__maybe_unused int rc;
 | 
			
		||||
 | 
			
		||||
#ifdef CONFIG_MACPWR
 | 
			
		||||
	gpio_request(CONFIG_MACPWR, "macpwr");
 | 
			
		||||
	gpio_direction_output(CONFIG_MACPWR, 1);
 | 
			
		||||
	mdelay(200);
 | 
			
		||||
#endif
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -126,6 +126,7 @@
 | 
			
		|||
#define CONFIG_SCSI_AHCI
 | 
			
		||||
#define CONFIG_SCSI_AHCI_PLAT
 | 
			
		||||
#define CONFIG_SUNXI_AHCI
 | 
			
		||||
#define CONFIG_SYS_64BIT_LBA
 | 
			
		||||
#define CONFIG_SYS_SCSI_MAX_SCSI_ID	1
 | 
			
		||||
#define CONFIG_SYS_SCSI_MAX_LUN		1
 | 
			
		||||
#define CONFIG_SYS_SCSI_MAX_DEVICE	(CONFIG_SYS_SCSI_MAX_SCSI_ID * \
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue