Merge branch 'master' of git://git.denx.de/u-boot-sunxi
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index c1ce54e..52555da 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -247,6 +247,7 @@
config SUN4I_EMAC
bool "Allwinner Sun4i Ethernet MAC support"
depends on DM_ETH
+ select PHYLIB
help
This driver supports the Allwinner based SUN4I Ethernet MAC.
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 94a4fd8..ac5443c 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -21,7 +21,7 @@
obj-$(CONFIG_E1000) += e1000.o
obj-$(CONFIG_E1000_SPI) += e1000_spi.o
obj-$(CONFIG_EEPRO100) += eepro100.o
-obj-$(CONFIG_SUNXI_EMAC) += sunxi_emac.o
+obj-$(CONFIG_SUN4I_EMAC) += sunxi_emac.o
obj-$(CONFIG_SUN8I_EMAC) += sun8i_emac.o
obj-$(CONFIG_ENC28J60) += enc28j60.o
obj-$(CONFIG_EP93XX) += ep93xx_eth.o
diff --git a/drivers/video/sunxi/sunxi_de2.c b/drivers/video/sunxi/sunxi_de2.c
index e890340..6d6bb2e 100644
--- a/drivers/video/sunxi/sunxi_de2.c
+++ b/drivers/video/sunxi/sunxi_de2.c
@@ -346,13 +346,19 @@
"sunxi_dw_hdmi", &hdmi);
if (ret) {
debug("HDMI not present\n");
- return 0;
+ } else if (device_active(hdmi)) {
+ if (mux == 0)
+ pipeline = "mixer0-lcd0-hdmi";
+ else
+ pipeline = "mixer1-lcd1-hdmi";
+ } else {
+ debug("HDMI present but not probed\n");
}
- if (mux == 0)
- pipeline = "mixer0-lcd0-hdmi";
- else
- pipeline = "mixer1-lcd1-hdmi";
+ if (!pipeline) {
+ debug("No active display present\n");
+ return 0;
+ }
de2_priv = dev_get_uclass_priv(de2);
de2_plat = dev_get_uclass_platdata(de2);
diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h
index 4207398..4391a8c 100644
--- a/include/configs/sunxi-common.h
+++ b/include/configs/sunxi-common.h
@@ -286,7 +286,7 @@
#endif /* CONFIG_VIDEO_SUNXI */
/* Ethernet support */
-#ifdef CONFIG_SUNXI_EMAC
+#ifdef CONFIG_SUN4I_EMAC
#define CONFIG_PHY_ADDR 1
#define CONFIG_MII /* MII PHY management */
#endif