Merge branch 'master' of git://git.denx.de/u-boot-rockchip

drivers/clk/rockchip/clk_rk3288.c

@@ -898,6 +898,16 @@ static int rk3288_clk_enable(struct clk *clk)
 	case HCLK_USBHOST0:
 	case HCLK_HSIC:
 		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);

include/configs/rockchip-common.h

@@ -7,6 +7,8 @@
 #define _ROCKCHIP_COMMON_H_
 #include <linux/sizes.h>
 
+#define CONFIG_SYS_NS16550_MEM32
+
 #ifndef CONFIG_SPL_BUILD
 
 /* First try to boot from SD (index 0), then eMMC (index 1) */