u-boot.git, branch v2013.10-rc1

Prepare v2013.10-rc1

2013-08-19T21:26:15+00:00

Signed-off-by: Tom Rini

SPDX-License-Identifier: convert BSD-3-Clause files

2013-08-19T19:45:35+00:00

Signed-off-by: Wolfgang Denk 
[trini Don't remove some copyrights by accident]
Signed-off-by: Tom Rini

board/esd/cpci750/mv_eth.c: Fix license

2013-08-19T19:34:14+00:00

The file header indicated that this file was GPL-2.0+, but actually
the code was derived from (Marvell based) Linux source code which is
only GPL-2.0.  Fix this.

Signed-off-by: Wolfgang Denk 
Cc: Stefan Roese 
Cc: Matthias Fuchs 
Acked-by: Stefan Roese

SPDX-License-Identifier: convert PIBS licensed files

2013-08-19T19:34:14+00:00

This commit adapts the files that were derived from PIBS (PowerPC
Initialization and Boot Software) codeto using SPDX License
Identifiers.

So far, SPDX has not assigned an official License ID for the PIBS
license yet, so this should be considered preliminary.

Note that the following files contained incorrect license information:

	arch/powerpc/cpu/ppc4xx/4xx_uart.c
	arch/powerpc/cpu/ppc4xx/start.S
	arch/powerpc/include/asm/ppc440.h

These files included, in addition to the GPL-2.0 / ibm-pibs dual
license as inherited from PIBS, a GPL-2.0+ license header which was
obviously incorrect.  This has been removed.

Signed-off-by: Wolfgang Denk 
Cc: Stefan Roese 
Signed-off-by: Wolfgang Denk 

Conflicts:
	Licenses/README
Acked-by: Stefan Roese

SPDX-License-Identifier: fixing some problematic GPL-2.0 files

2013-08-19T19:34:13+00:00

Unlike the other patches in this series so far, this commit fixes a
ambiguity in the license terms for some OMAP files:  the code was
originally derived from the Linux kernel sources, where it was clearly
marked as GPL-2.0 (i. e. without the "or later" part), but the U-Boot
version had a GPL-2.0+ file header added, apparently without
permission / relicensing from the original authors of the code.

Insert a GPL-2.0 SPDX-License-Identifier to fix this.

Signed-off-by: Wolfgang Denk 
cc: Tom Rix 
Cc: Tom Rini 
Cc: Albert Aribaud 
Acked-by: Tom Rini

SPDX-License-Identifier: convert GPL-2.0+ / BSD-2-Clause dual-licensed files

2013-08-19T19:34:13+00:00

Signed-off-by: Wolfgang Denk

net: ftmac110: Update tx/rx descriptor format

2013-08-19T17:34:21+00:00

1. Reformat tx/rx descriptor as an uniform struct.
2. Replace uint32_t[2] with uint64_t for descriptor control.

Signed-off-by: Kuo-Jung Su 
CC: Joe Hershberger

net: ftmac110: struct ftmac110_regs __iomem * -> struct ftmac110_regs *

2013-08-19T17:34:21+00:00

Signed-off-by: Kuo-Jung Su 
CC: Joe Hershberger

net: ftmac110: Update license statement

2013-08-19T17:34:20+00:00

Signed-off-by: Kuo-Jung Su 
CC: Joe Hershberger

net.h: don't use the reserved name __unused

2013-08-19T17:34:20+00:00

The __* keywords are reserved. On FreeBSD __unused evaluates
to the attribute unused, causing a compilation failure.
Just use unused instead.

Signed-off-by: Jeroen Hofstee 
cc: joe.hershberger@gmail.com