From 1b387ef55c7a10a87814f3d8ffc04b62fbfc150e Mon Sep 17 00:00:00 2001 From: Wolfgang Denk Date: Tue, 17 Sep 2013 11:24:06 +0200 Subject: [PATCH] SPDX: fix IBM-pibs license identifier The SPDX License List version 1.19 now contains an official entry for the IBM-pibs license. However, instead of our suggestion "ibm-pibs", the SPDX License List uses "IBM-pibs", with the following rationale: "The reason being that all other SPDX License List short identifiers tend towards using capital letters unless spelling a word. I'd prefer to be consistent to this end". Change the license IDs to use the official name. Signed-off-by: Wolfgang Denk --- Licenses/README | 2 +- arch/powerpc/cpu/ppc4xx/4xx_pci.c | 2 +- arch/powerpc/cpu/ppc4xx/4xx_uart.c | 2 +- arch/powerpc/cpu/ppc4xx/miiphy.c | 2 +- arch/powerpc/cpu/ppc4xx/start.S | 2 +- arch/powerpc/include/asm/ppc405.h | 2 +- arch/powerpc/include/asm/ppc440.h | 2 +- arch/powerpc/include/asm/ppc4xx-emac.h | 2 +- arch/powerpc/include/asm/ppc4xx-mal.h | 2 +- arch/powerpc/include/asm/ppc4xx.h | 2 +- board/cray/L1/init.S | 2 +- board/csb272/init.S | 2 +- board/csb472/init.S | 2 +- board/esd/pci405/writeibm.S | 2 +- board/jse/init.S | 2 +- board/mpl/common/pci.c | 2 +- board/mpl/mip405/init.S | 2 +- board/mpl/pip405/init.S | 2 +- board/sc3/init.S | 2 +- board/w7o/init.S | 2 +- drivers/net/4xx_enet.c | 2 +- drivers/net/npe/miiphy.c | 2 +- include/miiphy.h | 2 +- 23 files changed, 23 insertions(+), 23 deletions(-) diff --git a/Licenses/README b/Licenses/README index 41961256a6..9f61192557 100644 --- a/Licenses/README +++ b/Licenses/README @@ -52,5 +52,5 @@ GNU Lesser General Public License v2.1 or later LGPL-2.1+ Y lgpl-2.1.txt http: eCos license version 2.0 eCos-2.0 eCos-2.0.txt http://www.gnu.org/licenses/ecos-license.html BSD 2-Clause License BSD-2-Clause Y bsd-2-clause.txt http://spdx.org/licenses/BSD-2-Clause BSD 3-clause "New" or "Revised" License BSD-3-Clause Y bsd-3-clause.txt http://spdx.org/licenses/BSD-3-Clause#licenseText -IBM PIBS (PowerPC Initialization and ibm-pibs ibm-pibs.txt +IBM PIBS (PowerPC Initialization and IBM-pibs ibm-pibs.txt Boot Software) license diff --git a/arch/powerpc/cpu/ppc4xx/4xx_pci.c b/arch/powerpc/cpu/ppc4xx/4xx_pci.c index 5584e0f3e8..08781a1fb9 100644 --- a/arch/powerpc/cpu/ppc4xx/4xx_pci.c +++ b/arch/powerpc/cpu/ppc4xx/4xx_pci.c @@ -1,5 +1,5 @@ /* - * SPDX-License-Identifier: GPL-2.0 ibm-pibs + * SPDX-License-Identifier: GPL-2.0 IBM-pibs * * File Name: 405gp_pci.c * diff --git a/arch/powerpc/cpu/ppc4xx/4xx_uart.c b/arch/powerpc/cpu/ppc4xx/4xx_uart.c index 50c28a0d39..c02058f79b 100644 --- a/arch/powerpc/cpu/ppc4xx/4xx_uart.c +++ b/arch/powerpc/cpu/ppc4xx/4xx_uart.c @@ -5,7 +5,7 @@ * (C) Copyright 2010 * Stefan Roese, DENX Software Engineering, sr@denx.de. * - * SPDX-License-Identifier: GPL-2.0 ibm-pibs + * SPDX-License-Identifier: GPL-2.0 IBM-pibs */ #include diff --git a/arch/powerpc/cpu/ppc4xx/miiphy.c b/arch/powerpc/cpu/ppc4xx/miiphy.c index e4a9db6767..10147de089 100644 --- a/arch/powerpc/cpu/ppc4xx/miiphy.c +++ b/arch/powerpc/cpu/ppc4xx/miiphy.c @@ -1,5 +1,5 @@ /* - * SPDX-License-Identifier: GPL-2.0 ibm-pibs + * SPDX-License-Identifier: GPL-2.0 IBM-pibs */ /*-----------------------------------------------------------------------------+ | diff --git a/arch/powerpc/cpu/ppc4xx/start.S b/arch/powerpc/cpu/ppc4xx/start.S index d9d8cbffaa..38bbc5a9bc 100644 --- a/arch/powerpc/cpu/ppc4xx/start.S +++ b/arch/powerpc/cpu/ppc4xx/start.S @@ -6,7 +6,7 @@ * Copyright (c) 2008 Nuovation System Designs, LLC * Grant Erickson * - * SPDX-License-Identifier: GPL-2.0 ibm-pibs + * SPDX-License-Identifier: GPL-2.0 IBM-pibs */ /* diff --git a/arch/powerpc/include/asm/ppc405.h b/arch/powerpc/include/asm/ppc405.h index 8bb342b929..f2ed16a216 100644 --- a/arch/powerpc/include/asm/ppc405.h +++ b/arch/powerpc/include/asm/ppc405.h @@ -1,5 +1,5 @@ /* - * SPDX-License-Identifier: GPL-2.0 ibm-pibs + * SPDX-License-Identifier: GPL-2.0 IBM-pibs */ #ifndef __PPC405_H__ diff --git a/arch/powerpc/include/asm/ppc440.h b/arch/powerpc/include/asm/ppc440.h index 0f5bc8d1c7..0cfa88bff5 100644 --- a/arch/powerpc/include/asm/ppc440.h +++ b/arch/powerpc/include/asm/ppc440.h @@ -9,7 +9,7 @@ * (C) Copyright 2010 * Stefan Roese, DENX Software Engineering, sr@denx.de. * - * SPDX-License-Identifier: GPL-2.0 ibm-pibs + * SPDX-License-Identifier: GPL-2.0 IBM-pibs */ #ifndef __PPC440_H__ diff --git a/arch/powerpc/include/asm/ppc4xx-emac.h b/arch/powerpc/include/asm/ppc4xx-emac.h index e6eb332220..76fa95ca37 100644 --- a/arch/powerpc/include/asm/ppc4xx-emac.h +++ b/arch/powerpc/include/asm/ppc4xx-emac.h @@ -1,5 +1,5 @@ /* - * SPDX-License-Identifier: GPL-2.0 ibm-pibs + * SPDX-License-Identifier: GPL-2.0 IBM-pibs */ /*----------------------------------------------------------------------------+ | diff --git a/arch/powerpc/include/asm/ppc4xx-mal.h b/arch/powerpc/include/asm/ppc4xx-mal.h index d15290dc1a..ef8b174461 100644 --- a/arch/powerpc/include/asm/ppc4xx-mal.h +++ b/arch/powerpc/include/asm/ppc4xx-mal.h @@ -1,6 +1,6 @@ /* include/mal.h, openbios_walnut, walnut_bios 8/6/99 08:48:40 */ /* - * SPDX-License-Identifier: GPL-2.0 ibm-pibs + * SPDX-License-Identifier: GPL-2.0 IBM-pibs */ /*----------------------------------------------------------------------------+ | diff --git a/arch/powerpc/include/asm/ppc4xx.h b/arch/powerpc/include/asm/ppc4xx.h index 8d703c6634..e6a3bff079 100644 --- a/arch/powerpc/include/asm/ppc4xx.h +++ b/arch/powerpc/include/asm/ppc4xx.h @@ -1,5 +1,5 @@ /* - * SPDX-License-Identifier: GPL-2.0 ibm-pibs + * SPDX-License-Identifier: GPL-2.0 IBM-pibs */ #ifndef __PPC4XX_H__ diff --git a/board/cray/L1/init.S b/board/cray/L1/init.S index 82f21b08b2..44c688d1f0 100644 --- a/board/cray/L1/init.S +++ b/board/cray/L1/init.S @@ -1,5 +1,5 @@ /* - * SPDX-License-Identifier: GPL-2.0 ibm-pibs + * SPDX-License-Identifier: GPL-2.0 IBM-pibs */ /*----------------------------------------------------------------------------- */ diff --git a/board/csb272/init.S b/board/csb272/init.S index b1283aa69a..5961978c86 100644 --- a/board/csb272/init.S +++ b/board/csb272/init.S @@ -1,5 +1,5 @@ /* - * SPDX-License-Identifier: GPL-2.0 ibm-pibs + * SPDX-License-Identifier: GPL-2.0 IBM-pibs */ #include #include diff --git a/board/csb472/init.S b/board/csb472/init.S index f5805b7988..1ebc9ead3a 100644 --- a/board/csb472/init.S +++ b/board/csb472/init.S @@ -1,5 +1,5 @@ /* - * SPDX-License-Identifier: GPL-2.0 ibm-pibs + * SPDX-License-Identifier: GPL-2.0 IBM-pibs */ #include #include diff --git a/board/esd/pci405/writeibm.S b/board/esd/pci405/writeibm.S index 38acca12bf..03eaf97b78 100644 --- a/board/esd/pci405/writeibm.S +++ b/board/esd/pci405/writeibm.S @@ -1,5 +1,5 @@ /* - * SPDX-License-Identifier: GPL-2.0 ibm-pibs + * SPDX-License-Identifier: GPL-2.0 IBM-pibs */ /*----------------------------------------------------------------------------- */ /* Function: ext_bus_cntlr_init */ diff --git a/board/jse/init.S b/board/jse/init.S index 7b918b558d..4e449fef20 100644 --- a/board/jse/init.S +++ b/board/jse/init.S @@ -1,5 +1,5 @@ /* - * SPDX-License-Identifier: GPL-2.0 ibm-pibs + * SPDX-License-Identifier: GPL-2.0 IBM-pibs */ /*------------------------------------------------------------------------- */ /* Function: ext_bus_cntlr_init */ diff --git a/board/mpl/common/pci.c b/board/mpl/common/pci.c index 6ab263a4d9..cd969cb518 100644 --- a/board/mpl/common/pci.c +++ b/board/mpl/common/pci.c @@ -1,5 +1,5 @@ /* - * SPDX-License-Identifier: GPL-2.0 ibm-pibs + * SPDX-License-Identifier: GPL-2.0 IBM-pibs */ /* * Adapted for PIP405 03.07.01 diff --git a/board/mpl/mip405/init.S b/board/mpl/mip405/init.S index bf886c05c0..642f17c35b 100644 --- a/board/mpl/mip405/init.S +++ b/board/mpl/mip405/init.S @@ -1,5 +1,5 @@ /* - * SPDX-License-Identifier: GPL-2.0 ibm-pibs + * SPDX-License-Identifier: GPL-2.0 IBM-pibs */ /*----------------------------------------------------------------------------- * Function: ext_bus_cntlr_init diff --git a/board/mpl/pip405/init.S b/board/mpl/pip405/init.S index 9ed27990a1..95fed34fcc 100644 --- a/board/mpl/pip405/init.S +++ b/board/mpl/pip405/init.S @@ -1,5 +1,5 @@ /* - * SPDX-License-Identifier: GPL-2.0 ibm-pibs + * SPDX-License-Identifier: GPL-2.0 IBM-pibs */ /*----------------------------------------------------------------------------- * Function: ext_bus_cntlr_init diff --git a/board/sc3/init.S b/board/sc3/init.S index 9921f8fc4f..46323d2688 100644 --- a/board/sc3/init.S +++ b/board/sc3/init.S @@ -1,5 +1,5 @@ /* - * SPDX-License-Identifier: GPL-2.0 ibm-pibs + * SPDX-License-Identifier: GPL-2.0 IBM-pibs */ #include #include diff --git a/board/w7o/init.S b/board/w7o/init.S index 490411e6ee..54eda3299f 100644 --- a/board/w7o/init.S +++ b/board/w7o/init.S @@ -1,5 +1,5 @@ /* - * SPDX-License-Identifier: GPL-2.0 ibm-pibs + * SPDX-License-Identifier: GPL-2.0 IBM-pibs */ #include #include diff --git a/drivers/net/4xx_enet.c b/drivers/net/4xx_enet.c index c98867dc4a..381ec42864 100644 --- a/drivers/net/4xx_enet.c +++ b/drivers/net/4xx_enet.c @@ -1,5 +1,5 @@ /* - * SPDX-License-Identifier: GPL-2.0 ibm-pibs + * SPDX-License-Identifier: GPL-2.0 IBM-pibs */ /*-----------------------------------------------------------------------------+ * diff --git a/drivers/net/npe/miiphy.c b/drivers/net/npe/miiphy.c index 07fcb60e9d..002fb8113b 100644 --- a/drivers/net/npe/miiphy.c +++ b/drivers/net/npe/miiphy.c @@ -1,5 +1,5 @@ /* - * SPDX-License-Identifier: GPL-2.0 ibm-pibs + * SPDX-License-Identifier: GPL-2.0 IBM-pibs */ /*-----------------------------------------------------------------------------+ | diff --git a/include/miiphy.h b/include/miiphy.h index 657b49624a..088797e4c6 100644 --- a/include/miiphy.h +++ b/include/miiphy.h @@ -1,5 +1,5 @@ /* - * SPDX-License-Identifier: GPL-2.0 ibm-pibs + * SPDX-License-Identifier: GPL-2.0 IBM-pibs * * Additions (C) Copyright 2009 Industrie Dial Face S.p.A. */