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 <[email protected]>

diff --git a/Licenses/README b/Licenses/README
index 41961256a63665425559ea85abd1f2c8d37dcd6b..9f6119255732e9122b3cb4b2d09fb1b2eb38c355 100644 (file)
--- 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 5584e0f3e8e99e748aae32236e7c13f6c1c7ef88..08781a1fb96d6859426d43d849eeec7b87ec8856 100644 (file)
--- 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 50c28a0d39f07f682e9a005a101c3ac6ce1eb773..c02058f79bba253ad9cfa6b90155d3f47ac6dfde 100644 (file)
--- 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, [email protected].
  *
- * SPDX-License-Identifier:    GPL-2.0 ibm-pibs
+ * SPDX-License-Identifier:    GPL-2.0 IBM-pibs
  */
 
 #include <common.h>

diff --git a/arch/powerpc/cpu/ppc4xx/miiphy.c b/arch/powerpc/cpu/ppc4xx/miiphy.c
index e4a9db6767b674af41b7cb88652678aa59cd27f0..10147de0897d7be956e014ce120759fe55144af3 100644 (file)
--- 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 d9d8cbffaa7a1bcc3ca293b3e87197384c95405e..38bbc5a9bce5676b25ebeae74a251c16dbea9490 100644 (file)
--- 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 <[email protected]>
  *
- * 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 8bb342b9295f7be4da390723d8885f789fa93710..f2ed16a216f69c34a554876e827b199933c9acf4 100644 (file)
--- 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 0f5bc8d1c79f41fa420be2b7539c75abc365cb50..0cfa88bff592e6f702b3fbe81ea76401b45f3c18 100644 (file)
--- 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, [email protected].
  *
- * 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 e6eb332220ef7edab7c9f3cc8d1c7c1e7b6b4fa7..76fa95ca370dfdc49859bfbd04e7f69fb80940b9 100644 (file)
--- 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 d15290dc1a6ec24329ea1508920649296461bbe7..ef8b174461553cfaacb4a8d7c47af69da868a32b 100644 (file)
--- 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 8d703c663402996644c38cb451142c878821356e..e6a3bff079e4500d905c2840253e321191fec499 100644 (file)
--- 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 82f21b08b2aebe20e332ba22601b99ec9946fef5..44c688d1f0436b88f7cc951d529bd2c9b79f2be9 100644 (file)
--- 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 b1283aa69a72b129151a1fb2ca08a5d8505f044e..5961978c8642b82c86b4aef9e2a22e4eec400c7a 100644 (file)
--- 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 <config.h>
 #include <asm/ppc4xx.h>

diff --git a/board/csb472/init.S b/board/csb472/init.S
index f5805b79882a961963d77a202aafefaefc50dd37..1ebc9ead3ae5b762f99ae3aa6603862cd465733e 100644 (file)
--- 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 <config.h>
 #include <asm/ppc4xx.h>

diff --git a/board/esd/pci405/writeibm.S b/board/esd/pci405/writeibm.S
index 38acca12bf397cfea773b360448df666f264deb5..03eaf97b78e0e0df2fb0c671b9139898d90544dc 100644 (file)
--- 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 7b918b558d0fa565f6645487b262ff86398794db..4e449fef206428eee014085924b3251e61ebee48 100644 (file)
--- 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 6ab263a4d9d4e9532247a360178a3fa2473725e1..cd969cb5182d4e3bb6a9b4dcaf739f2495f18ae0 100644 (file)
--- 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 bf886c05c0b9419c4799225585c6f748c2d76af7..642f17c35b6494bb21db0281e62ef931e5744f2c 100644 (file)
--- 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 9ed27990a1acaf0fad4ffc36c3534f8a974722bc..95fed34fcc948580eb937a92eaa403ae34964625 100644 (file)
--- 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 9921f8fc4f12ba1e17c5260894517f7303af823a..46323d26884dcb39e7fc1c69bd79ace04f20d772 100644 (file)
--- 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 <config.h>
 #include <asm/ppc4xx.h>

diff --git a/board/w7o/init.S b/board/w7o/init.S
index 490411e6ee9b5b2aab06edfaa4b3657500b664de..54eda3299f290a7a8bb9610961ecbd000451cb54 100644 (file)
--- 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 <config.h>
 #include <asm/ppc4xx.h>

diff --git a/drivers/net/4xx_enet.c b/drivers/net/4xx_enet.c
index c98867dc4aa39b9fc0144973f4c2096151ee7146..381ec42864fb618c867ad2524b6f5ba452417967 100644 (file)
--- 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 07fcb60e9d1e8a5f8412983e0cf6e85090e968c9..002fb8113b25ffab35a4fa3724765288ea7f9636 100644 (file)
--- 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 657b49624a90a44057aaf7f446e23a501de59e23..088797e4c6ca9d4c39a82cd6067de61c4df911a5 100644 (file)
--- 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.
  */