u-boot.git/include, branch v2013.10-rc1 Unnamed repository; edit this file 'description' to name the repository. SPDX-License-Identifier: convert BSD-3-Clause files 2013-08-19T19:45:35+00:00 Wolfgang Denk wd@denx.de 2013-07-28T20:12:47+00:00 cb3761ea995ca2699db19f54e7c5f7e463381459 Signed-off-by: Wolfgang Denk <wd@denx.de> [trini Don't remove some copyrights by accident] Signed-off-by: Tom Rini <trini@ti.com> 
Signed-off-by: Wolfgang Denk <wd@denx.de>
[trini Don't remove some copyrights by accident]
Signed-off-by: Tom Rini <trini@ti.com>
SPDX-License-Identifier: convert PIBS licensed files 2013-08-19T19:34:14+00:00 Wolfgang Denk wd@denx.de 2013-07-28T20:12:45+00:00 46263f2de4e01ff0b2e4247c2fa76d24027efd65 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 <wd@denx.de> Cc: Stefan Roese <sr@denx.de> Signed-off-by: Wolfgang Denk <wd@denx.de> Conflicts: Licenses/README Acked-by: Stefan Roese <sr@denx.de> 
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 <wd@denx.de>
Cc: Stefan Roese <sr@denx.de>
Signed-off-by: Wolfgang Denk <wd@denx.de>

Conflicts:
	Licenses/README
Acked-by: Stefan Roese <sr@denx.de>
SPDX-License-Identifier: convert GPL-2.0+ / BSD-2-Clause dual-licensed files 2013-08-19T19:34:13+00:00 Wolfgang Denk wd@denx.de 2013-07-28T20:12:43+00:00 933aa017145838510d1311e3a22e191d14074e53 Signed-off-by: Wolfgang Denk <wd@denx.de> 
Signed-off-by: Wolfgang Denk <wd@denx.de>
net.h: don't use the reserved name __unused 2013-08-19T17:34:20+00:00 Jeroen Hofstee jeroen@myspectrum.nl 2013-08-10T14:52:47+00:00 6e840ebcd41ab40d0f8c7ff8d609d7edc8a0d723 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 <jeroen@myspectrum.nl> cc: joe.hershberger@gmail.com 
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 <jeroen@myspectrum.nl>
cc: joe.hershberger@gmail.com
linkstation_HGLAN: Convert from unused CONFIG_BOOTP_MASK to specific list 2013-08-19T17:34:20+00:00 Tom Rini trini@ti.com 2013-08-09T19:58:18+00:00 a782fb2d7587937528dc73541fda489241ea2c56 Signed-off-by: Tom Rini <trini@ti.com> 
Signed-off-by: Tom Rini <trini@ti.com>
galaxy5200: Convert from unused CONFIG_BOOTP_MASK to specific list 2013-08-19T17:34:19+00:00 Tom Rini trini@ti.com 2013-08-09T18:43:05+00:00 48e8c08e586866d21ec609bf8944b213a5e71bb7 Signed-off-by: Tom Rini <trini@ti.com> 
Signed-off-by: Tom Rini <trini@ti.com>
configs: Remove unused CONFIG_BOOTP_DEFAULT 2013-08-19T17:34:19+00:00 Tom Rini trini@ti.com 2013-08-09T18:39:51+00:00 b173075ead63a2fb8db4c0d81578f2a52aafd759 Signed-off-by: Tom Rini <trini@ti.com> 
Signed-off-by: Tom Rini <trini@ti.com>
powerpc/ppc4xx: Fix dlvision-10g reset gpio 2013-08-19T08:27:12+00:00 Dirk Eibach dirk.eibach@gdsys.cc 2013-08-09T08:52:54+00:00 3e24dd2b8713c00ddecbc0cded2b0390e9b256be Signed-off-by: Dirk Eibach <dirk.eibach@gdsys.cc> Signed-off-by: Stefan Roese <sr@denx.de> 
Signed-off-by: Dirk Eibach <dirk.eibach@gdsys.cc>
Signed-off-by: Stefan Roese <sr@denx.de>
Merge branch 'master' of git://88.191.163.10/u-boot-arm 2013-08-18T18:14:34+00:00 Tom Rini trini@ti.com 2013-08-18T18:14:34+00:00 e20cc2ca15b5b0644f51b6e58d530d70acd2bc00 Fixup an easy conflict over adding the clk_get prototype and USB_OTG defines for am33xx having moved. Conflicts: arch/arm/include/asm/arch-am33xx/hardware.h Signed-off-by: Tom Rini <trini@ti.com> 
Fixup an easy conflict over adding the clk_get prototype and USB_OTG
defines for am33xx having moved.

Conflicts:
	arch/arm/include/asm/arch-am33xx/hardware.h

Signed-off-by: Tom Rini <trini@ti.com>
Merge branch 'u-boot-imx/master' into 'u-boot-arm/master' 2013-08-17T16:24:13+00:00 Albert ARIBAUD albert.u.boot@aribaud.net 2013-08-17T16:24:13+00:00 9ed887caecb9ecb0c68773a1870d143b9f28d3da