GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-20 22:21:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Tom Rini 2017-11-09 08:11:40 -05:00
commit 1c4043e532
4 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
drivers/net/Kconfig
View file

@ -247,6 +247,7 @@ config SUN7I_GMAC
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.

2
drivers/net/Makefile
View file

@ -21,7 +21,7 @@ obj-$(CONFIG_DNET) += dnet.o
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

16
drivers/video/sunxi/sunxi_de2.c
View file

@ -346,13 +346,19 @@ int sunxi_simplefb_setup(void *blob)
"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);

2
include/configs/sunxi-common.h
View file

@ -286,7 +286,7 @@ extern int soft_i2c_gpio_scl;
#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