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>

99 files changed, 99 insertions, 99 deletions

diff --git a/include/affinity.h b/include/affinity.h
index fe952bf..88bd285 100644
--- a/include/affinity.h
+++ b/include/affinity.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
 /*
  * All functions in charge of generating the associativity/affinity
  * properties in the device-tree
diff --git a/include/asm-utils.h b/include/asm-utils.h
index c3d8c09..73416cd 100644
--- a/include/asm-utils.h
+++ b/include/asm-utils.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-2019 IBM Corp. */
 
 #ifndef __ASM_UTILS_H
diff --git a/include/ast.h b/include/ast.h
index 2720ee1..5e93239 100644
--- a/include/ast.h
+++ b/include/ast.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-2019 IBM Corp. */
 
 #ifndef __AST_H
diff --git a/include/bitmap.h b/include/bitmap.h
index ba31b01..fa3a57f 100644
--- a/include/bitmap.h
+++ b/include/bitmap.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
 /* Copyright 2016-2017 IBM Corp. */
 
 #ifndef __BITMAP_H
diff --git a/include/bitutils.h b/include/bitutils.h
index b34ac11..f6f21c2 100644
--- a/include/bitutils.h
+++ b/include/bitutils.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 __BITUTILS_H
diff --git a/include/bt.h b/include/bt.h
index f6655d9..dd2e7b6 100644
--- a/include/bt.h
+++ b/include/bt.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 __BT_H
diff --git a/include/buddy.h b/include/buddy.h
index a8414f5..5eaf18d 100644
--- a/include/buddy.h
+++ b/include/buddy.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
 /*
  * Simple power-of-two buddy allocation mechanism.
  *
diff --git a/include/capp.h b/include/capp.h
index b099a16..28c12bd 100644
--- a/include/capp.h
+++ b/include/capp.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-2019 IBM Corp. */
 
 #ifndef __CAPP_H
diff --git a/include/cec.h b/include/cec.h
index 22da563..d51238f 100644
--- a/include/cec.h
+++ b/include/cec.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 __CEC_H
diff --git a/include/centaur.h b/include/centaur.h
index 9b60a21..9089705 100644
--- a/include/centaur.h
+++ b/include/centaur.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 __CENTAUR_H
diff --git a/include/chip.h b/include/chip.h
index f14e78b..f76c837 100644
--- a/include/chip.h
+++ b/include/chip.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-2019 IBM Corp. */
 
 #ifndef __CHIP_H
diff --git a/include/chiptod.h b/include/chiptod.h
index 85a23df..50b6ab9 100644
--- a/include/chiptod.h
+++ b/include/chiptod.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
 /*
  * The ChipTOD is the HW facility that maintains a synchronized
  * time base across the fabric.
diff --git a/include/cmpxchg.h b/include/cmpxchg.h
index 3541a41..0304e91 100644
--- a/include/cmpxchg.h
+++ b/include/cmpxchg.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 __CMPXCHG_H
diff --git a/include/compiler.h b/include/compiler.h
index 7d6dda8..a9ccfae 100644
--- a/include/compiler.h
+++ b/include/compiler.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-2019 IBM Corp. */
 
 #ifndef __COMPILER_H
diff --git a/include/config.h b/include/config.h
index d7a64b7..cb88edb 100644
--- a/include/config.h
+++ b/include/config.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-2019 IBM Corp. */
 
 #ifndef __CONFIG_H
diff --git a/include/console.h b/include/console.h
index 61448e2..02fc7a4 100644
--- a/include/console.h
+++ b/include/console.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 __CONSOLE_H
diff --git a/include/debug_descriptor.h b/include/debug_descriptor.h
index cbe9293..3ac487b 100644
--- a/include/debug_descriptor.h
+++ b/include/debug_descriptor.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-2019 IBM Corp. */
 
 #ifndef __DEBUG_DESCRIPTOR_H
diff --git a/include/device.h b/include/device.h
index f17b089..93fb90f 100644
--- a/include/device.h
+++ b/include/device.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 __DEVICE_H
diff --git a/include/dio-p9.h b/include/dio-p9.h
index 06563bf..957322f 100644
--- a/include/dio-p9.h
+++ b/include/dio-p9.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
 /* Copyright 2019 IBM Corp. */
 
 #ifndef __DIO_H
diff --git a/include/direct-controls.h b/include/direct-controls.h
index 8c7b356..8e3809b 100644
--- a/include/direct-controls.h
+++ b/include/direct-controls.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 __DIRECT_CONTROLS_H
diff --git a/include/dts.h b/include/dts.h
index 66f81a2..d506b71 100644
--- a/include/dts.h
+++ b/include/dts.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 __DTS_H
diff --git a/include/elf-abi.h b/include/elf-abi.h
index 827f2af..29c7576 100644
--- a/include/elf-abi.h
+++ b/include/elf-abi.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 __ELF_ABI_H
diff --git a/include/elf.h b/include/elf.h
index f3e071d..356c6f4 100644
--- a/include/elf.h
+++ b/include/elf.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 __ELF_H
diff --git a/include/errorlog.h b/include/errorlog.h
index 66732d7..a443d36 100644
--- a/include/errorlog.h
+++ b/include/errorlog.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 __ERRORLOG_H
diff --git a/include/fsi-master.h b/include/fsi-master.h
index 62035a4..df4ca87 100644
--- a/include/fsi-master.h
+++ b/include/fsi-master.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-2014 IBM Corp. */
 
 #ifndef __FSI_MASTER_H
diff --git a/include/fsp-attn.h b/include/fsp-attn.h
index b2f007b..76c3322 100644
--- a/include/fsp-attn.h
+++ b/include/fsp-attn.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 __FSP_ATTN_H
diff --git a/include/fsp-elog.h b/include/fsp-elog.h
index 2de1a04..11d1154 100644
--- a/include/fsp-elog.h
+++ b/include/fsp-elog.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. */
 
 #include <opal.h>
diff --git a/include/fsp-leds.h b/include/fsp-leds.h
index d62505f..499e477 100644
--- a/include/fsp-leds.h
+++ b/include/fsp-leds.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
 /*
  * SPCN based LED location code and other information
  *
diff --git a/include/fsp-sysparam.h b/include/fsp-sysparam.h
index b107f18..b1182f7 100644
--- a/include/fsp-sysparam.h
+++ b/include/fsp-sysparam.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 __FSP_SYSPARAM_H
diff --git a/include/fsp.h b/include/fsp.h
index ec079a2..0c53ed7 100644
--- a/include/fsp.h
+++ b/include/fsp.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
 /*
  * IBM System P FSP (Flexible Service Processor)
  *
diff --git a/include/hiomap.h b/include/hiomap.h
index 3b3f7a9..bf09aea 100644
--- a/include/hiomap.h
+++ b/include/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 IBM Corp. */
 
 #ifndef __HIOMAP_H
diff --git a/include/hostservices.h b/include/hostservices.h
index 205de84..279591b 100644
--- a/include/hostservices.h
+++ b/include/hostservices.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-2019 IBM Corp. */
 
 #ifndef __HOSTSERVICES_H
diff --git a/include/i2c.h b/include/i2c.h
index e68d499..c4ad805 100644
--- a/include/i2c.h
+++ b/include/i2c.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-2019 IBM Corp. */
 
 #ifndef __I2C_H
diff --git a/include/imc.h b/include/imc.h
index bfc28bc..7aae792 100644
--- a/include/imc.h
+++ b/include/imc.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
 /* Copyright 2016-2019 IBM Corp. */
 /*
  * In-Memory Collection (IMC) Counters :
diff --git a/include/interrupts.h b/include/interrupts.h
index dfd48f2..7ffcc6c 100644
--- a/include/interrupts.h
+++ b/include/interrupts.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-2019 IBM Corp. */
 
 #ifndef __INTERRUPTS_H
diff --git a/include/inttypes.h b/include/inttypes.h
index 57bd732..984c1f6 100644
--- a/include/inttypes.h
+++ b/include/inttypes.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
 /* This file exists because a bunch of files are built as part of
  * unit tests as well as skiboot and inttypes.h is part of libc rather
  * than gcc, so to get the magic to work when we don't have libc sitting
diff --git a/include/io.h b/include/io.h
index 57dddd4..ecdd3d0 100644
--- a/include/io.h
+++ b/include/io.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 __IO_H
diff --git a/include/ipmi.h b/include/ipmi.h
index 50deec0..3e629ba 100644
--- a/include/ipmi.h
+++ b/include/ipmi.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-2019 IBM Corp. */
 
 #ifndef __IPMI_H
diff --git a/include/lock.h b/include/lock.h
index 04bc9f9..244adea 100644
--- a/include/lock.h
+++ b/include/lock.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-2019 IBM Corp. */
 
 #ifndef __LOCK_H
diff --git a/include/lpc-mbox.h b/include/lpc-mbox.h
index 37ec341..5883cc3 100644
--- a/include/lpc-mbox.h
+++ b/include/lpc-mbox.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-2018 IBM Corp. */
 
 #ifndef __LPC_MBOX_H
diff --git a/include/lpc.h b/include/lpc.h
index 58cfe6b..b641aa4 100644
--- a/include/lpc.h
+++ b/include/lpc.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-2019 IBM Corp. */
 
 #ifndef __LPC_H
diff --git a/include/mem-map.h b/include/mem-map.h
index 8ac11e9..b654012 100644
--- a/include/mem-map.h
+++ b/include/mem-map.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-2019 IBM Corp. */
 
 #ifndef __MEM_MAP_H
diff --git a/include/mem_region-malloc.h b/include/mem_region-malloc.h
index 4350c56..271311b 100644
--- a/include/mem_region-malloc.h
+++ b/include/mem_region-malloc.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-2019 IBM Corp. */
 
 #ifndef __MEM_REGION_MALLOC_H
diff --git a/include/mem_region.h b/include/mem_region.h
index 65eda42..3e3818a 100644
--- a/include/mem_region.h
+++ b/include/mem_region.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 __MEMORY_REGION
diff --git a/include/npu-regs.h b/include/npu-regs.h
index 87d4499..38d53c9 100644
--- a/include/npu-regs.h
+++ b/include/npu-regs.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 __NPU_REGS_H
diff --git a/include/npu.h b/include/npu.h
index ed905e2..50cc9c9 100644
--- a/include/npu.h
+++ b/include/npu.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 __NPU_H
diff --git a/include/npu2-regs.h b/include/npu2-regs.h
index ce9fdbb..22f58a6 100644
--- a/include/npu2-regs.h
+++ b/include/npu2-regs.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-2019 IBM Corp. */
 
 #ifndef __NPU2_REGS_H
diff --git a/include/npu2.h b/include/npu2.h
index 85816a6..eb7c455 100644
--- a/include/npu2.h
+++ b/include/npu2.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-2019 IBM Corp. */
 
 #ifndef __NPU2_H
diff --git a/include/nvram.h b/include/nvram.h
index b056829..eaaa443 100644
--- a/include/nvram.h
+++ b/include/nvram.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-2019 IBM Corp. */
 
 #ifndef __NVRAM_H
diff --git a/include/nx.h b/include/nx.h
index 4950a2d..5734e24 100644
--- a/include/nx.h
+++ b/include/nx.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-2019 IBM Corp. */
 
 #ifndef __NX_H
diff --git a/include/occ.h b/include/occ.h
index 967c3fd..f1a1e2d 100644
--- a/include/occ.h
+++ b/include/occ.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-2019 IBM Corp. */
 
 #include <chip.h>
diff --git a/include/op-panel.h b/include/op-panel.h
index 04c52ba..7a44512 100644
--- a/include/op-panel.h
+++ b/include/op-panel.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-2019 IBM Corp. */
 
 #ifndef __OP_PANEL_H
diff --git a/include/opal-api.h b/include/opal-api.h
index e425d79..e90cab1 100644
--- a/include/opal-api.h
+++ b/include/opal-api.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-2019 IBM Corp. */
 
 #ifndef __OPAL_API_H
diff --git a/include/opal-dump.h b/include/opal-dump.h
index 30b60b3..060712e 100644
--- a/include/opal-dump.h
+++ b/include/opal-dump.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 __OPAL_DUMP_H
diff --git a/include/opal-internal.h b/include/opal-internal.h
index 83bf770..f6ca7ac 100644
--- a/include/opal-internal.h
+++ b/include/opal-internal.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
 /*
  * Internal header for OPAL API related things in skiboot
  *
diff --git a/include/opal-msg.h b/include/opal-msg.h
index df605b3..2028c79 100644
--- a/include/opal-msg.h
+++ b/include/opal-msg.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-2019 IBM Corp. */
 
 #ifndef __OPALMSG_H
diff --git a/include/opal.h b/include/opal.h
index a702655..6a19229 100644
--- a/include/opal.h
+++ b/include/opal.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 __OPAL_H
diff --git a/include/pci-cfg.h b/include/pci-cfg.h
index 0830723..72614fd 100644
--- a/include/pci-cfg.h
+++ b/include/pci-cfg.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
 /*
  * PCI Configuration space definitions
  *
diff --git a/include/pci-quirk.h b/include/pci-quirk.h
index 0ad5555..fe766db 100644
--- a/include/pci-quirk.h
+++ b/include/pci-quirk.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
 /* Copyright 2016-2017 IBM Corp. */
 
 #ifndef __PCI_QUIRK_H
diff --git a/include/pci-slot.h b/include/pci-slot.h
index 6e7dc1c..5eabd5a 100644
--- a/include/pci-slot.h
+++ b/include/pci-slot.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 __PCI_SLOT_H
diff --git a/include/pci-virt.h b/include/pci-virt.h
index 508baf8..137f67d 100644
--- a/include/pci-virt.h
+++ b/include/pci-virt.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 __PCI_VIRT_H
diff --git a/include/pci.h b/include/pci.h
index 0239e44..eb23a6d 100644
--- a/include/pci.h
+++ b/include/pci.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-2019 IBM Corp. */
 
 #ifndef __PCI_H
diff --git a/include/pel.h b/include/pel.h
index cd878a2..a0df7cc 100644
--- a/include/pel.h
+++ b/include/pel.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-2014 IBM Corp. */
 
 #ifndef __PEL_H
diff --git a/include/phb3-capp.h b/include/phb3-capp.h
index d2e814d..d228160 100644
--- a/include/phb3-capp.h
+++ b/include/phb3-capp.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 __PHB3_CAPP_H
diff --git a/include/phb3-regs.h b/include/phb3-regs.h
index d79af7e..a1f2818 100644
--- a/include/phb3-regs.h
+++ b/include/phb3-regs.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 __PHB3_REGS_H
diff --git a/include/phb3.h b/include/phb3.h
index 249a8b2..c8a605f 100644
--- a/include/phb3.h
+++ b/include/phb3.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 __PHB3_H
diff --git a/include/phb4-capp.h b/include/phb4-capp.h
index bea29fd..789b6e8 100644
--- a/include/phb4-capp.h
+++ b/include/phb4-capp.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 __PHB4_CAPP_H
diff --git a/include/phb4-regs.h b/include/phb4-regs.h
index d2fc357..d3b0aac 100644
--- a/include/phb4-regs.h
+++ b/include/phb4-regs.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-2019 IBM Corp. */
 
 #ifndef __PHB4_REGS_H
diff --git a/include/phys-map.h b/include/phys-map.h
index c7bc596..ae7a4aa 100644
--- a/include/phys-map.h
+++ b/include/phys-map.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-2019 IBM Corp. */
 
 #ifndef __PHYS_MAP_H
diff --git a/include/pool.h b/include/pool.h
index 41081ca..967e463 100644
--- a/include/pool.h
+++ b/include/pool.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
 /* Copyright 2014 IBM Corp. */
 
 #ifndef __POOL_H
diff --git a/include/powercap.h b/include/powercap.h
index a45e63e..3340ab7 100644
--- a/include/powercap.h
+++ b/include/powercap.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 __POWERCAP_H
diff --git a/include/prd-fw-msg.h b/include/prd-fw-msg.h
index 9c9cbdf..d0e5385 100644
--- a/include/prd-fw-msg.h
+++ b/include/prd-fw-msg.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-2019 IBM Corp. */
 
 #ifndef __PRD_FW_MSG_H
diff --git a/include/processor.h b/include/processor.h
index a0c2864..57c2ee1 100644
--- a/include/processor.h
+++ b/include/processor.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-2019 IBM Corp. */
 
 #ifndef __PROCESSOR_H
diff --git a/include/psi.h b/include/psi.h
index 635d2ce..f7b5927 100644
--- a/include/psi.h
+++ b/include/psi.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
 /*
  * IBM System P PSI (Processor Service Interface)
  *
diff --git a/include/psr.h b/include/psr.h
index 6997943..c057a99 100644
--- a/include/psr.h
+++ b/include/psr.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 __PSR_H
diff --git a/include/rtc.h b/include/rtc.h
index 1887003..b665824 100644
--- a/include/rtc.h
+++ b/include/rtc.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-2014 IBM Corp. */
 
 #ifndef __RTC_H
diff --git a/include/sbe-p8.h b/include/sbe-p8.h
index 50a7a55..66f7025 100644
--- a/include/sbe-p8.h
+++ b/include/sbe-p8.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 __SBE_P8_H
diff --git a/include/sbe-p9.h b/include/sbe-p9.h
index ceb0755..289c28b 100644
--- a/include/sbe-p9.h
+++ b/include/sbe-p9.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-2019 IBM Corp. */
 
 #ifndef __SBE_P9_H
diff --git a/include/secvar.h b/include/secvar.h
index c41fb73..ec812b8 100644
--- a/include/secvar.h
+++ b/include/secvar.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
 /* Copyright 2019 IBM Corp. */
 
 #ifndef _SECVAR_DRIVER_
diff --git a/include/sensor.h b/include/sensor.h
index a79e1de..905bd50 100644
--- a/include/sensor.h
+++ b/include/sensor.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 __SENSOR_H
diff --git a/include/sfc-ctrl.h b/include/sfc-ctrl.h
index 72da8b7..d3889bb 100644
--- a/include/sfc-ctrl.h
+++ b/include/sfc-ctrl.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-2014 IBM Corp. */
 
 #ifndef SFC_CTRL_H
diff --git a/include/skiboot-valgrind.h b/include/skiboot-valgrind.h
index 5b3a27f..c9cd7cb 100644
--- a/include/skiboot-valgrind.h
+++ b/include/skiboot-valgrind.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 __SKIBOOT_VALGRIND_H
diff --git a/include/skiboot.h b/include/skiboot.h
index 6946b80..30ff500 100644
--- a/include/skiboot.h
+++ b/include/skiboot.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-2019 IBM Corp. */
 
 #ifndef __SKIBOOT_H
diff --git a/include/spcn.h b/include/spcn.h
index 3a99eac..d0ee2d5 100644
--- a/include/spcn.h
+++ b/include/spcn.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 __SPCN_H
diff --git a/include/stack.h b/include/stack.h
index b0d6df1..bd4fa2f 100644
--- a/include/stack.h
+++ b/include/stack.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-2019 IBM Corp. */
 
 #ifndef __STACKFRAME_H
diff --git a/include/time-utils.h b/include/time-utils.h
index 3fdb03c..0e9f837 100644
--- a/include/time-utils.h
+++ b/include/time-utils.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 __TIME_UTILS_H
diff --git a/include/timebase.h b/include/timebase.h
index d7469c3..07967e2 100644
--- a/include/timebase.h
+++ b/include/timebase.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
 /*
  * Timebase helpers.
  *
diff --git a/include/timer.h b/include/timer.h
index 59f963d..d190532 100644
--- a/include/timer.h
+++ b/include/timer.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
 /* Copyright 2014-2015 IBM Corp. */
 
 #ifndef __TIMER_H
diff --git a/include/trace.h b/include/trace.h
index 43c6a9d..04c8440 100644
--- a/include/trace.h
+++ b/include/trace.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-2019 IBM Corp. */
 
 #ifndef __TRACE_H
diff --git a/include/trace_types.h b/include/trace_types.h
index 54228b9..5942a1f 100644
--- a/include/trace_types.h
+++ b/include/trace_types.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
 /*
  * API for kernel to read trace buffer.
  *
diff --git a/include/types.h b/include/types.h
index e7660f6..498ee66 100644
--- a/include/types.h
+++ b/include/types.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 __TYPES_H
diff --git a/include/vas.h b/include/vas.h
index 9f761be..1c06e56 100644
--- a/include/vas.h
+++ b/include/vas.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 __VAS_H
diff --git a/include/vpd.h b/include/vpd.h
index ec1ec95..cdfc73a 100644
--- a/include/vpd.h
+++ b/include/vpd.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-2019 IBM Corp. */
 
 #ifndef __VPD_H
diff --git a/include/xive-p9-regs.h b/include/xive-p9-regs.h
index 126ab52..7d18a6b 100644
--- a/include/xive-p9-regs.h
+++ b/include/xive-p9-regs.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
 /*
  * XIVE: eXternal Interrupt Virtualization Engine. POWER9 interrupt
  * controller
diff --git a/include/xive-regs.h b/include/xive-regs.h
index 7f0054e..702e5b1 100644
--- a/include/xive-regs.h
+++ b/include/xive-regs.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
 /*
  * XIVE: eXternal Interrupt Virtualization Engine. POWER9 interrupt
  * controller
diff --git a/include/xive.h b/include/xive.h
index 592a6dc..fb8967e 100644
--- a/include/xive.h
+++ b/include/xive.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
 /*
  * XIVE: eXternal Interrupt Virtualization Engine. POWER9 interrupt
  * controller
diff --git a/include/xscom-p8-regs.h b/include/xscom-p8-regs.h
index cd4e31f..2192b6e 100644
--- a/include/xscom-p8-regs.h
+++ b/include/xscom-p8-regs.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-2019 IBM Corp.
  */
diff --git a/include/xscom-p9-regs.h b/include/xscom-p9-regs.h
index 15bdc6f..a2a17d0 100644
--- a/include/xscom-p9-regs.h
+++ b/include/xscom-p9-regs.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
 /*
  * Copyright 2016-2019 IBM Corp.
  */
diff --git a/include/xscom.h b/include/xscom.h
index 8a466d5..110aa8d 100644
--- a/include/xscom.h
+++ b/include/xscom.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-2019 IBM Corp. */
 
 #ifndef __XSCOM_H