Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-13 16:37:30 +00:00
Code Issues Projects Releases Packages Wiki Activity
u-boot/drivers/net
History
Albert ARIBAUD 85b8c5c4bf Merge branch 'iu-boot/master' into 'u-boot-arm/master' 
Conflicts:
	arch/arm/cpu/arm926ejs/mxs/Makefile
	board/compulab/cm_t35/Makefile
	board/corscience/tricorder/Makefile
	board/ppcag/bg0900/Makefile
	drivers/bootcount/Makefile
	include/configs/omap4_common.h
	include/configs/pdnb3.h

Makefile conflicts are due to additions/removals of
object files on the ARM branch vs KBuild introduction
on the main branch. Resolution consists in adjusting
the list of object files in the main branch version.
This also applies to two files which are not listed
as conflicting but had to be modified:

	board/compulab/common/Makefile
	board/udoo/Makefile

include/configs/omap4_common.h conflicts are due to
the OMAP4 conversion to ti_armv7_common.h on the ARM
side, and CONFIG_SYS_HZ removal on the main side.
Resolution is to convert as this icludes removal of
CONFIG_SYS_HZ.

include/configs/pdnb3.h is due to a removal on ARM side.
Trivial resolution is to remove the file.

Note: 'git show' will also list two files just because
they are new:

	include/configs/am335x_igep0033.h
	include/configs/omap3_igep00x0.h
2013-11-09 22:59:47 +01:00
..
fm drivers: net: convert makefiles to Kbuild style 2013-10-31 13:22:13 -04:00
npe cosmetic: remove empty lines at the top of file 2013-11-08 09:41:37 -05:00
phy drivers: net: convert makefiles to Kbuild style 2013-10-31 13:22:13 -04:00
4xx_enet.c SPDX: fix IBM-pibs license identifier 2013-09-20 10:30:54 -04:00
8390.h drivers/net : move net drivers to drivers/net 2007-11-25 18:35:17 +01:00
altera_tse.c net: Fix remaining API interface breakage 2012-05-23 14:19:21 -05:00
altera_tse.h miiphy: convert to linux/mii.h 2011-01-09 18:06:50 +01:00
armada100_fec.c Add GPL-2.0+ SPDX-License-Identifier to source files 2013-07-24 09:44:38 -04:00
armada100_fec.h Add GPL-2.0+ SPDX-License-Identifier to source files 2013-07-24 09:44:38 -04:00
at91_emac.c Add GPL-2.0+ SPDX-License-Identifier to source files 2013-07-24 09:44:38 -04:00
ax88180.c net: Use ARRAY_SIZE at appropriate places 2013-08-19 12:34:18 -05:00
ax88180.h AX88180: use standard I/O accessors 2010-07-12 00:14:29 -07:00
ax88796.c Add GPL-2.0+ SPDX-License-Identifier to source files 2013-07-24 09:44:38 -04:00
ax88796.h Add GPL-2.0+ SPDX-License-Identifier to source files 2013-07-24 09:44:38 -04:00
bfin_mac.c blackfin: The buf variable in bfin_mac.c is not used and produces warning, 2013-05-13 16:30:27 +08:00
bfin_mac.h net: Fix remaining API interface breakage 2012-05-23 14:19:21 -05:00
calxedaxgmac.c Merge branch 'u-boot/master' into u-boot-arm/master 2013-07-25 17:57:46 +02:00
cpsw.c net, phy, cpsw: fix NULL pointer deference 2013-09-20 16:57:40 -04:00
cs8900.c Add GPL-2.0+ SPDX-License-Identifier to source files 2013-07-24 09:44:38 -04:00
cs8900.h Add GPL-2.0+ SPDX-License-Identifier to source files 2013-07-24 09:44:38 -04:00
davinci_emac.c Add GPL-2.0+ SPDX-License-Identifier to source files 2013-07-24 09:44:38 -04:00
davinci_emac.h Add GPL-2.0+ SPDX-License-Identifier to source files 2013-07-24 09:44:38 -04:00
dc2114x.c Coding Style cleanup: remove trailing white space 2013-10-14 16:06:53 -04:00
designware.c Add GPL-2.0+ SPDX-License-Identifier to source files 2013-07-24 09:44:38 -04:00
designware.h Add GPL-2.0+ SPDX-License-Identifier to source files 2013-07-24 09:44:38 -04:00
dm9000x.c Coding Style cleanup: replace leading SPACEs by TABs 2013-10-14 16:06:54 -04:00
dm9000x.h dm9000 remove dead external phy support, gpio fix 2008-08-26 23:08:19 -07:00
dnet.c drivers/net/dnet.c: Fix compile warning 2012-05-22 10:18:15 -05:00
dnet.h dnet: driver for Dave DNET ethernet controller 2009-02-10 00:16:27 +01:00
e1000.c Add GPL-2.0+ SPDX-License-Identifier to source files 2013-07-24 09:44:38 -04:00
e1000.h Add GPL-2.0+ SPDX-License-Identifier to source files 2013-07-24 09:44:38 -04:00
e1000_spi.c Consolidate bool type 2013-04-01 16:33:52 -04:00
eepro100.c Add GPL-2.0+ SPDX-License-Identifier to source files 2013-07-24 09:44:38 -04:00
enc28j60.c Add GPL-2.0+ SPDX-License-Identifier to source files 2013-07-24 09:44:38 -04:00
enc28j60.h Add GPL-2.0+ SPDX-License-Identifier to source files 2013-07-24 09:44:38 -04:00
ep93xx_eth.c Add GPL-2.0+ SPDX-License-Identifier to source files 2013-07-24 09:44:38 -04:00
ep93xx_eth.h Add GPL-2.0+ SPDX-License-Identifier to source files 2013-07-24 09:44:38 -04:00
ethoc.c net: Fix remaining API interface breakage 2012-05-23 14:19:21 -05:00
fec_mxc.c net: fec_mxc: Fix timeouts during tftp transfer 2013-09-20 17:55:37 +02:00
fec_mxc.h net: fec_mxc: Add support for mx6 solo-lite 2013-09-20 17:55:36 +02:00
fsl_mcdmafec.c net: Use ARRAY_SIZE at appropriate places 2013-08-19 12:34:18 -05:00
fsl_mdio.c Add GPL-2.0+ SPDX-License-Identifier to source files 2013-07-24 09:44:38 -04:00
ftgmac100.c Add GPL-2.0+ SPDX-License-Identifier to source files 2013-07-24 09:44:38 -04:00
ftgmac100.h Add GPL-2.0+ SPDX-License-Identifier to source files 2013-07-24 09:44:38 -04:00
ftmac100.c Add GPL-2.0+ SPDX-License-Identifier to source files 2013-07-24 09:44:38 -04:00
ftmac100.h Add GPL-2.0+ SPDX-License-Identifier to source files 2013-07-24 09:44:38 -04:00
ftmac110.c net: ftmac110: Update tx/rx descriptor format 2013-08-19 12:34:21 -05:00
ftmac110.h net: ftmac110: Update tx/rx descriptor format 2013-08-19 12:34:21 -05:00
greth.c Add GPL-2.0+ SPDX-License-Identifier to source files 2013-07-24 09:44:38 -04:00
greth.h Add GPL-2.0+ SPDX-License-Identifier to source files 2013-07-24 09:44:38 -04:00
inca-ip_sw.c Add GPL-2.0+ SPDX-License-Identifier to source files 2013-07-24 09:44:38 -04:00
ks8695eth.c Add GPL-2.0+ SPDX-License-Identifier to source files 2013-07-24 09:44:38 -04:00
ks8851_mll.c Add GPL-2.0+ SPDX-License-Identifier to source files 2013-07-24 09:44:38 -04:00
ks8851_mll.h net: ks8851_mll: add ethernet support 2013-06-24 19:11:14 -05:00
lan91c96.c net: Use ARRAY_SIZE at appropriate places 2013-08-19 12:34:18 -05:00
lan91c96.h Add GPL-2.0+ SPDX-License-Identifier to source files 2013-07-24 09:44:38 -04:00
macb.c net: macb: get DMA bus width from design config register 2013-11-04 20:32:31 +01:00
macb.h net: macb: get DMA bus width from design config register 2013-11-04 20:32:31 +01:00
Makefile drivers: net: convert makefiles to Kbuild style 2013-10-31 13:22:13 -04:00
mcffec.c net: Use ARRAY_SIZE at appropriate places 2013-08-19 12:34:18 -05:00
mcfmii.c net: Use ARRAY_SIZE at appropriate places 2013-08-19 12:34:18 -05:00
mpc5xxx_fec.c ppc: Move mpc5xxx clocks to arch_global_data 2013-02-04 09:05:43 -05:00
mpc5xxx_fec.h Move MPC5xxx_FEC driver to drivers/net 2008-08-29 13:58:07 -06:00
mpc512x_fec.c ppc: Move mpc512x clocks to arch_global_data 2013-02-04 09:05:43 -05:00
mpc512x_fec.h MPC512x: remove include/mpc512x.h 2009-06-12 20:47:16 +02:00
mvgbe.c Add GPL-2.0+ SPDX-License-Identifier to source files 2013-07-24 09:44:38 -04:00
mvgbe.h Add GPL-2.0+ SPDX-License-Identifier to source files 2013-07-24 09:44:38 -04:00
natsemi.c drivers/net/natsemi.c: Fix compile warning 2012-05-22 13:41:47 -05:00
ne2000.c net: Use ARRAY_SIZE at appropriate places 2013-08-19 12:34:18 -05:00
ne2000.h NE2000: Fix regresssion introduced by e710185aae on non AX88796 2008-04-28 22:26:36 -07:00
ne2000_base.c net: Fix remaining API interface breakage 2012-05-23 14:19:21 -05:00
ne2000_base.h Consolidate bool type 2013-04-01 16:33:52 -04:00
netconsole.c netconsole loses 2nd character of input 2013-11-08 15:25:14 -05:00
nicext.h Big white-space cleanup. 2008-05-21 00:14:08 +02:00
ns8382x.c drivers/net/ns8382x.c: Fix compile warning 2012-05-22 13:41:47 -05:00
pcnet.c net: pcnet: use pci_virt_to_mem to obtain buffer addresses 2013-07-24 09:51:03 -04:00
plb2800_eth.c Coding Style cleanup: replace leading SPACEs by TABs 2013-10-14 16:06:54 -04:00
rtl8139.c drivers/net/rtl8139.c: Fix compile warning 2012-05-22 13:41:47 -05:00
rtl8169.c Add GPL-2.0+ SPDX-License-Identifier to source files 2013-07-24 09:44:38 -04:00
sh_eth.c Add GPL-2.0+ SPDX-License-Identifier to source files 2013-07-24 09:44:38 -04:00
sh_eth.h Add GPL-2.0+ SPDX-License-Identifier to source files 2013-07-24 09:44:38 -04:00
smc911x.c Add GPL-2.0+ SPDX-License-Identifier to source files 2013-07-24 09:44:38 -04:00
smc911x.h Add GPL-2.0+ SPDX-License-Identifier to source files 2013-07-24 09:44:38 -04:00
smc91111.c Add GPL-2.0+ SPDX-License-Identifier to source files 2013-07-24 09:44:38 -04:00
smc91111.h Add GPL-2.0+ SPDX-License-Identifier to source files 2013-07-24 09:44:38 -04:00
sunxi_wemac.c Add GPL-2.0+ SPDX-License-Identifier to source files 2013-07-24 09:44:38 -04:00
tsec.c net: abort network initialization if the PHY driver fails 2012-07-11 13:15:30 -05:00
tsi108_eth.c Add GPL-2.0+ SPDX-License-Identifier to source files 2013-07-24 09:44:38 -04:00
uli526x.c Add GPL-2.0+ SPDX-License-Identifier to source files 2013-07-24 09:44:38 -04:00
vsc7385.c drivers/net/: sparse fixes 2012-11-04 11:00:36 -07:00
xilinx_axi_emac.c Add GPL-2.0+ SPDX-License-Identifier to source files 2013-07-24 09:44:38 -04:00
xilinx_emaclite.c Coding Style cleanup: remove trailing white space 2013-10-14 16:06:53 -04:00
xilinx_ll_temac.c Add GPL-2.0+ SPDX-License-Identifier to source files 2013-07-24 09:44:38 -04:00
xilinx_ll_temac.h Add GPL-2.0+ SPDX-License-Identifier to source files 2013-07-24 09:44:38 -04:00
xilinx_ll_temac_fifo.c Add GPL-2.0+ SPDX-License-Identifier to source files 2013-07-24 09:44:38 -04:00
xilinx_ll_temac_fifo.h Add GPL-2.0+ SPDX-License-Identifier to source files 2013-07-24 09:44:38 -04:00
xilinx_ll_temac_mdio.c Add GPL-2.0+ SPDX-License-Identifier to source files 2013-07-24 09:44:38 -04:00
xilinx_ll_temac_mdio.h Add GPL-2.0+ SPDX-License-Identifier to source files 2013-07-24 09:44:38 -04:00
xilinx_ll_temac_sdma.c Add GPL-2.0+ SPDX-License-Identifier to source files 2013-07-24 09:44:38 -04:00
xilinx_ll_temac_sdma.h Add GPL-2.0+ SPDX-License-Identifier to source files 2013-07-24 09:44:38 -04:00
zynq_gem.c Coding Style cleanup: remove trailing white space 2013-10-14 16:06:53 -04:00