mirror of
				https://source.denx.de/u-boot/u-boot.git
				synced 2025-10-25 22:41:21 +02:00 
			
		
		
		
	Merge branch 'master' of git://git.denx.de/u-boot-rockchip
This commit is contained in:
		
						commit
						db6b0281ec
					
				| @ -898,6 +898,16 @@ static int rk3288_clk_enable(struct clk *clk) | |||||||
| 	case HCLK_USBHOST0: | 	case HCLK_USBHOST0: | ||||||
| 	case HCLK_HSIC: | 	case HCLK_HSIC: | ||||||
| 		return 0; | 		return 0; | ||||||
|  | 
 | ||||||
|  | 	case SCLK_MAC: | ||||||
|  | 	case SCLK_MAC_RX: | ||||||
|  | 	case SCLK_MAC_TX: | ||||||
|  | 	case SCLK_MACREF: | ||||||
|  | 	case SCLK_MACREF_OUT: | ||||||
|  | 	case ACLK_GMAC: | ||||||
|  | 	case PCLK_GMAC: | ||||||
|  | 		/* Required to successfully probe the Designware GMAC driver */ | ||||||
|  | 		return 0; | ||||||
| 	} | 	} | ||||||
| 
 | 
 | ||||||
| 	debug("%s: unsupported clk %ld\n", __func__, clk->id); | 	debug("%s: unsupported clk %ld\n", __func__, clk->id); | ||||||
|  | |||||||
| @ -7,6 +7,8 @@ | |||||||
| #define _ROCKCHIP_COMMON_H_ | #define _ROCKCHIP_COMMON_H_ | ||||||
| #include <linux/sizes.h> | #include <linux/sizes.h> | ||||||
| 
 | 
 | ||||||
|  | #define CONFIG_SYS_NS16550_MEM32 | ||||||
|  | 
 | ||||||
| #ifndef CONFIG_SPL_BUILD | #ifndef CONFIG_SPL_BUILD | ||||||
| 
 | 
 | ||||||
| /* First try to boot from SD (index 0), then eMMC (index 1) */ | /* First try to boot from SD (index 0), then eMMC (index 1) */ | ||||||
|  | |||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user