Add GPL-2.0+ SPDX-License-Identifier to source files

Signed-off-by: Wolfgang Denk <wd@denx.de>
[trini: Fixup common/cmd_io.c]
Signed-off-by: Tom Rini <trini@ti.com>

drivers/net/pcnet.c: Fix compile warning

Fix this:
pcnet.c: In function 'pcnet_initialize':
pcnet.c:224:13: warning: assignment from incompatible pointer type

Signed-off-by: Joe Hershberger <joe.he

drivers/net/pcnet.c: Fix compile warning

Fix this:
pcnet.c: In function 'pcnet_initialize':
pcnet.c:224:13: warning: assignment from incompatible pointer type

Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>

show more ...

drivers/net/pcnet.c: Change debug code to fix build warning

Fix:
pcnet.c: In function 'pcnet_probe':
pcnet.c:247:8: warning: variable 'chipname' set but not used
[-Wunused-but-set-variable]

Signed-

drivers/net/pcnet.c: Change debug code to fix build warning

Fix:
pcnet.c: In function 'pcnet_probe':
pcnet.c:247:8: warning: variable 'chipname' set but not used
[-Wunused-but-set-variable]

Signed-off-by: Wolfgang Denk <wd@denx.de>
Cc: Wolfgang Grandegger <wg@denx.de>

show more ...

net: pcnet: Add initialized eth_device structure

pcnet driver does not have write_hwaddr function.
However, eth stuff executes write_hwaddr function
because eth_device structure has not been initial

net: pcnet: Add initialized eth_device structure

pcnet driver does not have write_hwaddr function.
However, eth stuff executes write_hwaddr function
because eth_device structure has not been initialized.

Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
CC: Ben Warren <biggerbadderben@gmail.com>

show more ...

Merge branch 'fixes' into cleanups

Conflicts:

board/atmel/atngw100/atngw100.c
board/atmel/atstk1000/atstk1000.c
cpu/at32ap/at32ap700x/gpio.c
include/asm-avr32/arch-at32ap700x/clk.h
include/con

Merge branch 'fixes' into cleanups

Conflicts:

board/atmel/atngw100/atngw100.c
board/atmel/atstk1000/atstk1000.c
cpu/at32ap/at32ap700x/gpio.c
include/asm-avr32/arch-at32ap700x/clk.h
include/configs/atngw100.h
include/configs/atstk1002.h
include/configs/atstk1003.h
include/configs/atstk1004.h
include/configs/atstk1006.h
include/configs/favr-32-ezkit.h
include/configs/hammerhead.h
include/configs/mimc200.h

show more ...

Merge branch 'master' of ssh://10.10.0.7/home/wd/git/u-boot/master

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

Moved initialization of PCNET Ethernet controller to board_eth_init()

Affected boards:
PN62
sc520_cdp

Removed initialization of the driver from net/eth.c

Signed-off-by: Ben Warren <biggerbadderb

Moved initialization of PCNET Ethernet controller to board_eth_init()

Affected boards:
PN62
sc520_cdp

Removed initialization of the driver from net/eth.c

Signed-off-by: Ben Warren <biggerbadderben@gmail.com>

show more ...

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

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

net: Conditional COBJS inclusion of network drivers

Replace COBJS-y with appropriate driver config names.

Signed-off-by: Shinya Kuribayashi <skuribay@ruby.dti.ne.jp>
Signed-off-by: Ben Warren <bigg

net: Conditional COBJS inclusion of network drivers

Replace COBJS-y with appropriate driver config names.

Signed-off-by: Shinya Kuribayashi <skuribay@ruby.dti.ne.jp>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>

show more ...

pcnet.c: fix a merge issue

Signed-off-by: Wolfgang Denk <wd@denx.de>

Fixed pcnet io_base

Bus and phys address are not always the same

Signed-off-by: Vlad Lungu <vlad@comsys.ro>

drivers/net/pcnet.c: Coding Style cleanup.

Signed-off-by: Wolfgang Denk <wd@denx.de>

Added Am79C970A chip id to pcnet

Signed-off-by: Vlad Lungu <vlad@comsys.ro>

Merge branch 'master' of /home/stefan/git/u-boot/u-boot

Merge commit 'wd/master'

Fix Ethernet init() return codes

Change return values of init() functions in all Ethernet drivers to conform
to the following:

>=0: Success
<0: Failure

All drivers going forward should re

Fix Ethernet init() return codes

Change return values of init() functions in all Ethernet drivers to conform
to the following:

>=0: Success
<0: Failure

All drivers going forward should return 0 on success. Current drivers that
return 1 on success were left as-is to minimize changes.

Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
Acked-by: Stefan Roese <sr@denx.de>
Acked-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Acked-by: Kim Phillips <kim.phillips@freescale.com>
Acked-by: Haavard Skinnemoen <hskinnemoen@atmel.com>
Acked-By: Timur Tabi <timur@freescale.com>

show more ...

Merge git://www.denx.de/git/u-boot

Conflicts:

board/tqm5200/tqm5200.c

Merge with git://www.denx.de/git/u-boot.git

Merge commit 'u-boot/master' into for-1.3.1

Conflicts:

drivers/rtc/Makefile

Merge commit 'wd/master'

Merge git://www.denx.de/git/u-boot

Conflicts:

drivers/Makefile

Merge commit '87ddedd'

drivers/net : move net drivers to drivers/net

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>