V3s_Allwinner
/
uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity
uboot/drivers/net
History
Tom Rini 76b40ab41e Merge u-boot/master into u-boot-ti/master 
In master we had already taken a patch to fix the davinci GPIO code for
CONFIG_SOC_DM646X and in u-boot-ti we have additional patches to support
DA830 (which is CONFIG_SOC_DA8XX && !CONFIG_SOC_DA850).  Resolve these
conflicts manually and comment the #else/#endif lines for clarity.

Conflicts:
	arch/arm/include/asm/arch-davinci/gpio.h
	drivers/gpio/da8xx_gpio.c

Signed-off-by: Tom Rini <trini@ti.com>
 		2013-03-11 12:16:13 -04:00
..
fm net: Use new numeric setenv functions 2013-02-28 19:09:23 -08:00
npe dm: net: Move IXP NPE to drivers/net/ 2012-09-24 13:17:24 -05:00
phy phy: add phy_find_by_mask/phy_connect_dev 2013-01-28 06:57:50 +01:00
4xx_enet.c
…
8390.h
…
Makefile arm: Remove support for NETARM 2012-10-26 22:38:00 +02:00
altera_tse.c net: Fix remaining API interface breakage 2012-05-23 14:19:21 -05:00
altera_tse.h
…
armada100_fec.c dm: net: Fixup the armada100 FEC driver 2012-09-24 13:55:20 -05:00
armada100_fec.h
…
at91_emac.c
…
ax88180.c net: Fix remaining API interface breakage 2012-05-23 14:19:21 -05:00
ax88180.h
…
ax88796.c
…
ax88796.h
…
bfin_mac.c Blackfin: bfin_mac: drop volatile markings on packet buffers 2012-07-19 00:09:32 -04:00
bfin_mac.h net: Fix remaining API interface breakage 2012-05-23 14:19:21 -05:00
calxedaxgmac.c
…
cpsw.c am335x: cpsw: optimize cpsw_send to increase network performance 2013-03-11 11:06:09 -04:00
cs8900.c
…
cs8900.h
…
davinci_emac.c da850/omap-l138: davinci_emac: Suppress auto negotiation if needed 2012-10-01 10:02:13 -07:00
davinci_emac.h
…
dc2114x.c drivers/net/dc2114x.c: Fix compile warning 2012-05-22 10:18:15 -05:00
designware.c net/designware: Consecutive writes to the same register to be avoided 2012-07-11 13:15:31 -05:00
designware.h net: Multiple updates/enhancements to designware.c 2012-07-07 14:07:42 +02:00
dm9000x.c drivers/net/dm9000x.c: Fix compile warning 2012-05-22 10:18:15 -05:00
dm9000x.h
…
dnet.c drivers/net/dnet.c: Fix compile warning 2012-05-22 10:18:15 -05:00
dnet.h
…
e1000.c e1000e : Correct Rx Threshold granularity 2012-12-15 12:28:21 -06:00
e1000.h e1000e : Correct Rx Threshold granularity 2012-12-15 12:28:21 -06:00
e1000_spi.c
…
eepro100.c drivers/net/eepro100.c: Fix compile warning 2012-05-22 10:18:16 -05:00
enc28j60.c drivers/net/enc28j60.c: Fix compile warning 2012-05-22 10:18:16 -05:00
enc28j60.h
…
ep93xx_eth.c net: Fix remaining API interface breakage 2012-05-23 14:19:21 -05:00
ep93xx_eth.h
…
ethoc.c net: Fix remaining API interface breakage 2012-05-23 14:19:21 -05:00
fec_mxc.c net: fec_mxc: get phydev before fec_probe 2013-01-28 06:57:51 +01:00
fec_mxc.h net: fec_mxc: get phydev before fec_probe 2013-01-28 06:57:51 +01:00
fsl_mcdmafec.c net: Fix remaining API interface breakage 2012-05-23 14:19:21 -05:00
fsl_mdio.c
…
ftgmac100.c net: Fix remaining API interface breakage 2012-05-23 14:19:21 -05:00
ftgmac100.h
…
ftmac100.c drivers/net/ftmac100.c: Fix compile warning 2012-05-22 10:18:16 -05:00
ftmac100.h
…
greth.c dm: sparc: net: Fixup greth compile warnings 2012-09-18 12:01:50 -07:00
greth.h
…
inca-ip_sw.c net: Fix remaining API interface breakage 2012-05-23 14:19:21 -05:00
ks8695eth.c drivers/net/ks8695eth.c: Fix compile warning 2012-05-22 10:18:16 -05:00
lan91c96.c drivers/net/lan91c96.c: Fix compile warning 2012-05-22 10:18:16 -05:00
lan91c96.h
…
macb.c include/linux/byteorder: import latest endian definitions from linux 2012-11-04 11:00:34 -07:00
macb.h
…
mcffec.c net: Fix remaining API interface breakage 2012-05-23 14:19:21 -05:00
mcfmii.c m68k: net: Fix unused variable in mcfmii.c 2012-10-19 23:47:41 +08:00
mpc5xxx_fec.c ppc: Move mpc5xxx clocks to arch_global_data 2013-02-04 09:05:43 -05:00
mpc5xxx_fec.h
…
mpc512x_fec.c ppc: Move mpc512x clocks to arch_global_data 2013-02-04 09:05:43 -05:00
mpc512x_fec.h
…
mvgbe.c net: Fix remaining API interface breakage 2012-05-23 14:19:21 -05:00
mvgbe.h
…
natsemi.c drivers/net/natsemi.c: Fix compile warning 2012-05-22 13:41:47 -05:00
ne2000.c
…
ne2000.h
…
ne2000_base.c net: Fix remaining API interface breakage 2012-05-23 14:19:21 -05:00
ne2000_base.h
…
netconsole.c net: Filter incoming netconsole packets by IP 2012-09-24 13:55:44 -05:00
nicext.h
…
ns8382x.c drivers/net/ns8382x.c: Fix compile warning 2012-05-22 13:41:47 -05:00
pcnet.c drivers/net/pcnet.c: Fix compile warning 2012-05-22 23:17:52 -05:00
plb2800_eth.c net: Fix remaining API interface breakage 2012-05-23 14:19:21 -05:00
rtl8139.c drivers/net/rtl8139.c: Fix compile warning 2012-05-22 13:41:47 -05:00
rtl8169.c drivers/net/rtl8169.c: Fix compile warning 2012-05-22 23:17:52 -05:00
sh_eth.c net: sh_eth: add support for SH7752 2012-12-15 12:28:24 -06:00
sh_eth.h net: sh_eth: add support for SH7752 2012-12-15 12:28:24 -06:00
smc911x.c
…
smc911x.h
…
smc91111.c include/linux/byteorder: import latest endian definitions from linux 2012-11-04 11:00:34 -07:00
smc91111.h
…
tsec.c net: abort network initialization if the PHY driver fails 2012-07-11 13:15:30 -05:00
tsi108_eth.c drivers/net/tsi108_eth.c: Fix compile warning 2012-05-22 13:41:47 -05:00
uli526x.c drivers/net/uli526x.c: Fix compile warning 2012-05-22 13:41:47 -05:00
vsc7385.c drivers/net/: sparse fixes 2012-11-04 11:00:36 -07:00
xilinx_axi_emac.c net: abort network initialization if the PHY driver fails 2012-07-11 13:15:30 -05:00
xilinx_emaclite.c net: emaclite: Support OF initialization 2012-09-24 13:17:25 -05:00
xilinx_ll_temac.c net: abort network initialization if the PHY driver fails 2012-07-11 13:15:30 -05:00
xilinx_ll_temac.h
…
xilinx_ll_temac_fifo.c drivers/net/xilinx_ll_temac.c: Fix compile warning 2012-05-22 23:17:52 -05:00
xilinx_ll_temac_fifo.h drivers/net/xilinx_ll_temac.c: Fix compile warning 2012-05-22 23:17:52 -05:00
xilinx_ll_temac_mdio.c
…
xilinx_ll_temac_mdio.h
…
xilinx_ll_temac_sdma.c drivers/net/xilinx_ll_temac.c: Fix compile warning 2012-05-22 23:17:52 -05:00
xilinx_ll_temac_sdma.h drivers/net/xilinx_ll_temac.c: Fix compile warning 2012-05-22 23:17:52 -05:00
zynq_gem.c net: Add driver for Zynq Gem IP 2012-09-26 12:36:32 -05:00