Re-license IBM written files as Apache 2.0 OR GPLv2+

SPDX makes it a simpler diff.

I have audited the commit history of each file to ensure that they are
exclusively authored by IBM and thus we have the right to relicense.

The motivation behind this is twofold:
1) We want to enable experiments with coreboot, which is GPLv2 licensed
2) An upcoming firmware component wants to incorporate code from skiboot
   and code from the Linux kernel, which is GPLv2 licensed.

I have gone through the IBM internal way of gaining approval for this.

The following files are not exclusively authored by IBM, so are *not*
included in this update (I will be seeking approval from contributors):

core/direct-controls.c
core/flash.c
core/pcie-slot.c
external/common/arch_flash_unknown.c
external/common/rules.mk
external/gard/Makefile
external/gard/rules.mk
external/opal-prd/Makefile
external/pflash/Makefile
external/xscom-utils/Makefile
hdata/vpd.c
hw/dts.c
hw/ipmi/ipmi-watchdog.c
hw/phb4.c
include/cpu.h
include/phb4.h
include/platform.h
libflash/libffs.c
libstb/mbedtls/sha512.c
libstb/mbedtls/sha512.h
platforms/astbmc/barreleye.c
platforms/astbmc/garrison.c
platforms/astbmc/mihawk.c
platforms/astbmc/nicole.c
platforms/astbmc/p8dnu.c
platforms/astbmc/p8dtu.c
platforms/astbmc/p9dsu.c
platforms/astbmc/vesnin.c
platforms/rhesus/ec/config.h
platforms/rhesus/ec/gpio.h
platforms/rhesus/gpio.c
platforms/rhesus/rhesus.c
platforms/astbmc/talos.c
platforms/astbmc/romulus.c

Signed-off-by: Stewart Smith <stewart@linux.ibm.com>
[oliver: fixed up the drift]
Signed-off-by: Oliver O'Halloran <oohall@gmail.com>

25 files changed, 25 insertions, 25 deletions

diff --git a/libflash/blocklevel.c b/libflash/blocklevel.c
index b1b8f90..f11f337 100644
--- a/libflash/blocklevel.c
+++ b/libflash/blocklevel.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
 /* Copyright 2013-2018 IBM Corp. */
 
 #include <stdlib.h>
diff --git a/libflash/blocklevel.h b/libflash/blocklevel.h
index 492918e..2557eb3 100644
--- a/libflash/blocklevel.h
+++ b/libflash/blocklevel.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
 /* Copyright 2013-2017 IBM Corp. */
 
 #ifndef __LIBFLASH_BLOCKLEVEL_H
diff --git a/libflash/ecc.c b/libflash/ecc.c
index 8e76e7c..25f518e 100644
--- a/libflash/ecc.c
+++ b/libflash/ecc.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
 /*
  * This is based on the hostboot ecc code
  *
diff --git a/libflash/ecc.h b/libflash/ecc.h
index 75c3adf..bdf0420 100644
--- a/libflash/ecc.h
+++ b/libflash/ecc.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
 /*
  * This is based on the hostboot ecc code
  *
diff --git a/libflash/errors.h b/libflash/errors.h
index c800ada..e67a759 100644
--- a/libflash/errors.h
+++ b/libflash/errors.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
 /* Copyright 2013-2018 IBM Corp. */
 
 #ifndef __LIBFLASH_ERRORS_H
diff --git a/libflash/ffs.h b/libflash/ffs.h
index f9f2833..441d846 100644
--- a/libflash/ffs.h
+++ b/libflash/ffs.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
 /*
  * FSP Flash Structure
  *
diff --git a/libflash/file.c b/libflash/file.c
index b395fc0..fbaf792 100644
--- a/libflash/file.c
+++ b/libflash/file.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
 /* Copyright 2013-2019 IBM Corp. */
 
 #define _GNU_SOURCE
diff --git a/libflash/file.h b/libflash/file.h
index af055ca..25cf73b 100644
--- a/libflash/file.h
+++ b/libflash/file.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
 /* Copyright 2013-2016 IBM Corp. */
 
 #ifndef __LIBFLASH_FILE_H
diff --git a/libflash/ipmi-hiomap.c b/libflash/ipmi-hiomap.c
index 821d28d..c889d63 100644
--- a/libflash/ipmi-hiomap.c
+++ b/libflash/ipmi-hiomap.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
 /* Copyright 2018-2019 IBM Corp. */
 
 #define pr_fmt(fmt) "HIOMAP: " fmt
diff --git a/libflash/ipmi-hiomap.h b/libflash/ipmi-hiomap.h
index 489d55e..2046a27 100644
--- a/libflash/ipmi-hiomap.h
+++ b/libflash/ipmi-hiomap.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
 /* Copyright 2018-2019 IBM Corp. */
 
 #ifndef __LIBFLASH_IPMI_HIOMAP_H
diff --git a/libflash/libffs.h b/libflash/libffs.h
index fa9359c..a81f24c 100644
--- a/libflash/libffs.h
+++ b/libflash/libffs.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
 /* Copyright 2013-2018 IBM Corp. */
 
 #ifndef __LIBFFS_H
diff --git a/libflash/libflash-priv.h b/libflash/libflash-priv.h
index 9a8afc9..b3d10d4 100644
--- a/libflash/libflash-priv.h
+++ b/libflash/libflash-priv.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
 /* Copyright 2013-2015 IBM Corp. */
 
 #ifndef __LIBFLASH_PRIV_H
diff --git a/libflash/libflash.c b/libflash/libflash.c
index 4d56969..70c8a59 100644
--- a/libflash/libflash.c
+++ b/libflash/libflash.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
 /* Copyright 2013-2017 IBM Corp. */
 
 #include <stdlib.h>
diff --git a/libflash/libflash.h b/libflash/libflash.h
index 31be920..9e83d41 100644
--- a/libflash/libflash.h
+++ b/libflash/libflash.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
 /* Copyright 2013-2017 IBM Corp. */
 
 #ifndef __LIBFLASH_H
diff --git a/libflash/mbox-flash.c b/libflash/mbox-flash.c
index 3fd2c05..6da77d7 100644
--- a/libflash/mbox-flash.c
+++ b/libflash/mbox-flash.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
 /* Copyright 2017-2018 IBM Corp. */
 
 #define pr_fmt(fmt) "MBOX-FLASH: " fmt
diff --git a/libflash/mbox-flash.h b/libflash/mbox-flash.h
index 73ac6a3..cf8575c 100644
--- a/libflash/mbox-flash.h
+++ b/libflash/mbox-flash.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
 /* Copyright 2017 IBM Corp. */
 
 #ifndef __LIBFLASH_MBOX_FLASH_H
diff --git a/libflash/test/mbox-server.c b/libflash/test/mbox-server.c
index 59786ca..8a68cff 100644
--- a/libflash/test/mbox-server.c
+++ b/libflash/test/mbox-server.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
 /* Copyright 2017 IBM Corp. */
 
 #include <stdio.h>
diff --git a/libflash/test/mbox-server.h b/libflash/test/mbox-server.h
index b573f34..e7aec81 100644
--- a/libflash/test/mbox-server.h
+++ b/libflash/test/mbox-server.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
 /* Copyright 2017 IBM Corp. */
 
 #include <stdint.h>
diff --git a/libflash/test/stubs.c b/libflash/test/stubs.c
index 30ccf4c..09f0043 100644
--- a/libflash/test/stubs.c
+++ b/libflash/test/stubs.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
 /*
  * Stubs for libflash test
  *
diff --git a/libflash/test/stubs.h b/libflash/test/stubs.h
index ec408bc..3f890c9 100644
--- a/libflash/test/stubs.h
+++ b/libflash/test/stubs.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
 /* Copyright 2013-2018 IBM Corp. */
 
 #include <lock.h>
diff --git a/libflash/test/test-blocklevel.c b/libflash/test/test-blocklevel.c
index 4f5adc1..7a4fe19 100644
--- a/libflash/test/test-blocklevel.c
+++ b/libflash/test/test-blocklevel.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
 /* Copyright 2013-2018 IBM Corp. */
 
 #include <stdio.h>
diff --git a/libflash/test/test-ecc.c b/libflash/test/test-ecc.c
index af5f42f..b9489f8 100644
--- a/libflash/test/test-ecc.c
+++ b/libflash/test/test-ecc.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
 /* Copyright 2013-2018 IBM Corp. */
 
 #include <stdio.h>
diff --git a/libflash/test/test-flash.c b/libflash/test/test-flash.c
index 9cc8499..3304195 100644
--- a/libflash/test/test-flash.c
+++ b/libflash/test/test-flash.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
 /* Copyright 2013-2017 IBM Corp. */
 
 #include <stdio.h>
diff --git a/libflash/test/test-ipmi-hiomap.c b/libflash/test/test-ipmi-hiomap.c
index d3343fe..6117e9d 100644
--- a/libflash/test/test-ipmi-hiomap.c
+++ b/libflash/test/test-ipmi-hiomap.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
 /* Copyright 2018-2019 IBM Corp. */
 
 #include <assert.h>
diff --git a/libflash/test/test-mbox.c b/libflash/test/test-mbox.c
index 6e30b9e..260a3c7 100644
--- a/libflash/test/test-mbox.c
+++ b/libflash/test/test-mbox.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
 /* Copyright 2017-2018 IBM Corp. */
 
 #include <stdio.h>