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>

75 files changed, 75 insertions, 75 deletions

diff --git a/external/Makefile.check b/external/Makefile.check
index 46ff66e..7edd7a2 100644
--- a/external/Makefile.check
+++ b/external/Makefile.check
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: Apache-2.0
+# SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
 # -*-Makefile-*-
 
 TOOL=gard ffspart pflash
diff --git a/external/common/arch_flash.h b/external/common/arch_flash.h
index 4feed27..0dff8b7 100644
--- a/external/common/arch_flash.h
+++ b/external/common/arch_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 2015 IBM Corp.
  */
 
diff --git a/external/common/arch_flash_arm.c b/external/common/arch_flash_arm.c
index 5842fdd..cfe7b96 100644
--- a/external/common/arch_flash_arm.c
+++ b/external/common/arch_flash_arm.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
 /* Copyright 2015-2016 IBM Corp.
  */
 #define _GNU_SOURCE
diff --git a/external/common/arch_flash_arm_io.h b/external/common/arch_flash_arm_io.h
index bffcb53..85dbaf4 100644
--- a/external/common/arch_flash_arm_io.h
+++ b/external/common/arch_flash_arm_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 2015 IBM Corp.
  */
diff --git a/external/common/arch_flash_common.c b/external/common/arch_flash_common.c
index d3e34fd..c7a6e95 100644
--- a/external/common/arch_flash_common.c
+++ b/external/common/arch_flash_common.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
 /*
  * Default implementations
  *
diff --git a/external/common/arch_flash_powerpc.c b/external/common/arch_flash_powerpc.c
index 9bd4ba2..8766129 100644
--- a/external/common/arch_flash_powerpc.c
+++ b/external/common/arch_flash_powerpc.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.
  */
 
diff --git a/external/common/get_arch.sh b/external/common/get_arch.sh
index 1e2d375..682710f 100755
--- a/external/common/get_arch.sh
+++ b/external/common/get_arch.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# SPDX-License-Identifier: Apache-2.0
+# SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
 
 echo "#if defined(__powerpc__)
 echo -n ARCH_POWERPC
diff --git a/external/devicetree/Makefile b/external/devicetree/Makefile
index 02e7a17..690f633 100644
--- a/external/devicetree/Makefile
+++ b/external/devicetree/Makefile
@@ -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.
 
diff --git a/external/devicetree/p9-simics.dts b/external/devicetree/p9-simics.dts
index bc6747c..e24c7b7 100644
--- a/external/devicetree/p9-simics.dts
+++ b/external/devicetree/p9-simics.dts
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
 /*
  * POWER9 Simics Device Tree
  */
diff --git a/external/devicetree/p9.dts b/external/devicetree/p9.dts
index fab7ffa..bbda7cf 100644
--- a/external/devicetree/p9.dts
+++ b/external/devicetree/p9.dts
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
 /*
  * base POWER9 device tree
  */
diff --git a/external/ffspart/Makefile b/external/ffspart/Makefile
index 9814022..0a8d910 100644
--- a/external/ffspart/Makefile
+++ b/external/ffspart/Makefile
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: Apache-2.0
+# SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
 # Use make V=1 for a verbose build.
 include rules.mk
 GET_ARCH = ../../external/common/get_arch.sh
diff --git a/external/ffspart/config.h b/external/ffspart/config.h
index 4509837..7894afb 100644
--- a/external/ffspart/config.h
+++ b/external/ffspart/config.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
 /*
  * For CCAN
  *
diff --git a/external/ffspart/ffspart.c b/external/ffspart/ffspart.c
index e0dd8d3..d41bdfd 100644
--- a/external/ffspart/ffspart.c
+++ b/external/ffspart/ffspart.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
 /*
  * Assemble a FFS Image (no, not that FFS, this FFS)
  *
diff --git a/external/ffspart/rules.mk b/external/ffspart/rules.mk
index 1c6a838..40972c6 100644
--- a/external/ffspart/rules.mk
+++ b/external/ffspart/rules.mk
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: Apache-2.0
+# SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
 .DEFAULT_GOAL := all
 
 override CFLAGS  += -O2 -Wall -g -I.
diff --git a/external/fwts/generate-fwts-olog b/external/fwts/generate-fwts-olog
index 3018965..c455988 100755
--- a/external/fwts/generate-fwts-olog
+++ b/external/fwts/generate-fwts-olog
@@ -1,5 +1,5 @@
 #!/usr/bin/env python2
-# SPDX-License-Identifier: Apache-2.0
+# SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
 #
 # Copyright 2016 Jeremy Kerr <jk@ozlabs.org>
 
diff --git a/external/fwts/merge-fwts-olog b/external/fwts/merge-fwts-olog
index 6b0befb..132d898 100755
--- a/external/fwts/merge-fwts-olog
+++ b/external/fwts/merge-fwts-olog
@@ -1,5 +1,5 @@
 #!/usr/bin/env python2
-# SPDX-License-Identifier: Apache-2.0
+# SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
 #
 # Copyright 2016 IBM Corp.
 
diff --git a/external/gard/Makefile.dist b/external/gard/Makefile.dist
index 4d44a04..e03ad23 100644
--- a/external/gard/Makefile.dist
+++ b/external/gard/Makefile.dist
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: Apache-2.0
+# SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
 #Prevent make from trying to remake arch links symlinks
 #which are fixed files now
 ARCH_LINKS :=
diff --git a/external/gard/config.h b/external/gard/config.h
index d3edaea..42aef6d 100644
--- a/external/gard/config.h
+++ b/external/gard/config.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
 /*
  * For CCAN
  *
diff --git a/external/gard/gard.c b/external/gard/gard.c
index f8bfa72..b012cf9 100644
--- a/external/gard/gard.c
+++ b/external/gard/gard.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
 /*
  * Manipulate GARD records in the GARD partition
  *
diff --git a/external/gard/gard.h b/external/gard/gard.h
index 5999cf9..329772a 100644
--- a/external/gard/gard.h
+++ b/external/gard/gard.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.
  */
 
diff --git a/external/gard/units.c b/external/gard/units.c
index 62033a1..677d68f 100644
--- a/external/gard/units.c
+++ b/external/gard/units.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
 /*
  * Each chip has a set of "units" that are detailed by the System MRW. Granted
  * they're pretty much fixed for a given chip generation so hardcoding them here
diff --git a/external/lpc/Makefile b/external/lpc/Makefile
index be71b5f..1c14945 100644
--- a/external/lpc/Makefile
+++ b/external/lpc/Makefile
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: Apache-2.0
+# SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
 
 all: lpc
 
diff --git a/external/lpc/lpc.c b/external/lpc/lpc.c
index e8d87b8..1121837 100644
--- a/external/lpc/lpc.c
+++ b/external/lpc/lpc.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
 /*
  * LPC operations through debugfs interface
  *
diff --git a/external/mambo/Makefile b/external/mambo/Makefile
index d750b98..942ebf2 100644
--- a/external/mambo/Makefile
+++ b/external/mambo/Makefile
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: Apache-2.0
+# SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
 
 CFLAGS=-O2 -m64 -pthread -Werror -Wall
 
diff --git a/external/mambo/mambo-socket-proxy.c b/external/mambo/mambo-socket-proxy.c
index 16053e7..64b6770 100644
--- a/external/mambo/mambo-socket-proxy.c
+++ b/external/mambo/mambo-socket-proxy.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
 /*
  * Compile with:
  *   gcc -static -O2 mambo-socket-proxy.c -o mambo-socket-proxy -pthread
diff --git a/external/mambo/mambo_utils.tcl b/external/mambo/mambo_utils.tcl
index 8bde1e1..96f8971 100644
--- a/external/mambo/mambo_utils.tcl
+++ b/external/mambo/mambo_utils.tcl
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: Apache-2.0
+# SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
 #
 # Make Mambo behave a bit more like gdb
 #
diff --git a/external/mambo/qtrace_utils.tcl b/external/mambo/qtrace_utils.tcl
index 3fbcd59..bb20b31 100644
--- a/external/mambo/qtrace_utils.tcl
+++ b/external/mambo/qtrace_utils.tcl
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: Apache-2.0
+# SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
 
 if { [file exists $env(LIB_DIR)/perf/qtrace.tcl] == 1} {
     if { [catch {source $env(LIB_DIR)/perf/qtrace.tcl} issue ] } {
diff --git a/external/mambo/skiboot.tcl b/external/mambo/skiboot.tcl
index 15d00a4..6003fcb 100644
--- a/external/mambo/skiboot.tcl
+++ b/external/mambo/skiboot.tcl
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: Apache-2.0
+# SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
 #
 # scripts to run skiboot (and a payload) with Mambo (otherwise known as the
 # POWER[89] Functional Simulator)
diff --git a/external/memboot/Makefile b/external/memboot/Makefile
index 85c0f58..da17b32 100644
--- a/external/memboot/Makefile
+++ b/external/memboot/Makefile
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: Apache-2.0
+# SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
 all: memboot
 
 CFLAGS=-O2 -Wall
diff --git a/external/memboot/memboot.c b/external/memboot/memboot.c
index 4d2b5f8..8298aed 100644
--- a/external/memboot/memboot.c
+++ b/external/memboot/memboot.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
 /*
  * The old way of booting a temporary f/w image.
  * These days, use mboxd on a BMC.
diff --git a/external/npu/run_procedure.sh b/external/npu/run_procedure.sh
index 31a6c42..e5df327 100755
--- a/external/npu/run_procedure.sh
+++ b/external/npu/run_procedure.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# SPDX-License-Identifier: Apache-2.0
+# SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
 #
 # Run an NPU Hardware procedure
 #
diff --git a/external/opal-prd/config.h b/external/opal-prd/config.h
index 5de618b..e7f3773 100644
--- a/external/opal-prd/config.h
+++ b/external/opal-prd/config.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
 /*
  * For CCAN
  *
diff --git a/external/opal-prd/hostboot-interface.h b/external/opal-prd/hostboot-interface.h
index 60951fe..59f9ff4 100644
--- a/external/opal-prd/hostboot-interface.h
+++ b/external/opal-prd/hostboot-interface.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
 /*
  * Hostboot runtime interface
  *
diff --git a/external/opal-prd/i2c.c b/external/opal-prd/i2c.c
index 3cf8868..f4c7f27 100644
--- a/external/opal-prd/i2c.c
+++ b/external/opal-prd/i2c.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
 /*
  * I2C operations for opal-prd
  *
diff --git a/external/opal-prd/i2c.h b/external/opal-prd/i2c.h
index bdadec6..ee73f90 100644
--- a/external/opal-prd/i2c.h
+++ b/external/opal-prd/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 2015 IBM Corp */
 
 #ifndef __I2C_H
diff --git a/external/opal-prd/module.c b/external/opal-prd/module.c
index 6797d4c..9c9c0af 100644
--- a/external/opal-prd/module.c
+++ b/external/opal-prd/module.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
 /*
  * Load kernel modules needed for opal-prd
  *
diff --git a/external/opal-prd/module.h b/external/opal-prd/module.h
index e55d321..2771bf0 100644
--- a/external/opal-prd/module.h
+++ b/external/opal-prd/module.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
 /* Copyright 2015 IBM Corp. */
 
 #ifndef MODULES_H
diff --git a/external/opal-prd/opal-prd.c b/external/opal-prd/opal-prd.c
index 1dc7691..40e5a98 100644
--- a/external/opal-prd/opal-prd.c
+++ b/external/opal-prd/opal-prd.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
 /*
  * OPAL Processor Runtime Diagnostics (PRD)
  * Runs Hostboot RunTime (HBRT) code in a userspace wrapper
diff --git a/external/opal-prd/opal-prd.h b/external/opal-prd/opal-prd.h
index 17333d2..606317d 100644
--- a/external/opal-prd/opal-prd.h
+++ b/external/opal-prd/opal-prd.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
 /* Copyright 2015 IBM Corp. */
 
 #ifndef OPAL_PRD_H
diff --git a/external/opal-prd/pnor.c b/external/opal-prd/pnor.c
index 6ddc2b5..b2da713 100644
--- a/external/opal-prd/pnor.c
+++ b/external/opal-prd/pnor.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
 /*
  * PNOR Access (/dev/mtd) for opal-prd
  *
diff --git a/external/opal-prd/pnor.h b/external/opal-prd/pnor.h
index 0d25325..aaaf9c4 100644
--- a/external/opal-prd/pnor.h
+++ b/external/opal-prd/pnor.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
 /* Copyright 2015-2017 IBM Corp */
 
 #ifndef PNOR_H
diff --git a/external/opal-prd/test/test_pnor.c b/external/opal-prd/test/test_pnor.c
index 4e599e5..bc7234e 100644
--- a/external/opal-prd/test/test_pnor.c
+++ b/external/opal-prd/test/test_pnor.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-2015 IBM Corp. */
 
 #include <stdarg.h>
diff --git a/external/opal-prd/test/test_pnor_ops.c b/external/opal-prd/test/test_pnor_ops.c
index ab05930..913f2ec 100644
--- a/external/opal-prd/test/test_pnor_ops.c
+++ b/external/opal-prd/test/test_pnor_ops.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
 /* Copyright 2015-2016 IBM Corp */
 
 #include <sys/types.h>
diff --git a/external/opal-prd/thunk.S b/external/opal-prd/thunk.S
index 227607c..46355c0 100644
--- a/external/opal-prd/thunk.S
+++ b/external/opal-prd/thunk.S
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
 /* Copyright 2015-2017 IBM Corp */
 	
 #include <endian.h>
diff --git a/external/pflash/Makefile.dist b/external/pflash/Makefile.dist
index b6183d7..85e41fa 100644
--- a/external/pflash/Makefile.dist
+++ b/external/pflash/Makefile.dist
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: Apache-2.0
+# SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
 include rules.mk
 GET_ARCH = common/get_arch.sh
 include common/rules.mk
diff --git a/external/pflash/build-all-arch.sh b/external/pflash/build-all-arch.sh
index 0af3a4d..1436433 100755
--- a/external/pflash/build-all-arch.sh
+++ b/external/pflash/build-all-arch.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# SPDX-License-Identifier: Apache-2.0
+# SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
 #
 # Script to build all pflash backends
 #
diff --git a/external/pflash/config.h b/external/pflash/config.h
index b55d13e..34da2eb 100644
--- a/external/pflash/config.h
+++ b/external/pflash/config.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
 /*
  * For CCAN
  *
diff --git a/external/pflash/pflash.c b/external/pflash/pflash.c
index 7bf0785..8aa2acb 100644
--- a/external/pflash/pflash.c
+++ b/external/pflash/pflash.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
 /*
  * Display progress bars, while also writing whole or part
  * of flash.
diff --git a/external/pflash/progress.c b/external/pflash/progress.c
index 4140446..b988384 100644
--- a/external/pflash/progress.c
+++ b/external/pflash/progress.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
 /*
  * The most important part of pflash, the progress bars
  *
diff --git a/external/pflash/progress.h b/external/pflash/progress.h
index efe70c6..eb390d5 100644
--- a/external/pflash/progress.h
+++ b/external/pflash/progress.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-2017 IBM Corp.
  */
diff --git a/external/pflash/rules.mk b/external/pflash/rules.mk
index ab9bf14..8d5a7bf 100644
--- a/external/pflash/rules.mk
+++ b/external/pflash/rules.mk
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: Apache-2.0
+# SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
 
 .DEFAULT_GOAL := all
 
diff --git a/external/pflash/test/tests/00-usage b/external/pflash/test/tests/00-usage
index 809b995..4c4ba2a 100644
--- a/external/pflash/test/tests/00-usage
+++ b/external/pflash/test/tests/00-usage
@@ -1,5 +1,5 @@
 #! /bin/sh
-# SPDX-License-Identifier: Apache-2.0
+# SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
 
 run_binary "./pflash" "-h"
 if [ "$?" -ne 0 ] ; then
diff --git a/external/pflash/test/tests/01-info b/external/pflash/test/tests/01-info
index 2fc2755..583d275 100644
--- a/external/pflash/test/tests/01-info
+++ b/external/pflash/test/tests/01-info
@@ -1,5 +1,5 @@
 #! /bin/sh
-# SPDX-License-Identifier: Apache-2.0
+# SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
 
 touch "$DATA_DIR/$CUR_TEST.pnor"
 
diff --git a/external/pflash/test/tests/02-erase b/external/pflash/test/tests/02-erase
index 911728d..f1db992 100644
--- a/external/pflash/test/tests/02-erase
+++ b/external/pflash/test/tests/02-erase
@@ -1,5 +1,5 @@
 #! /bin/sh
-# SPDX-License-Identifier: Apache-2.0
+# SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
 
 touch "$DATA_DIR/$CUR_TEST.pnor"
 
diff --git a/external/pflash/test/tests/03-erase-parts b/external/pflash/test/tests/03-erase-parts
index 74937fa..91b0a14 100644
--- a/external/pflash/test/tests/03-erase-parts
+++ b/external/pflash/test/tests/03-erase-parts
@@ -1,5 +1,5 @@
 #! /bin/sh
-# SPDX-License-Identifier: Apache-2.0
+# SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
 
 touch "$DATA_DIR/$CUR_TEST.pnor"
 
diff --git a/external/pflash/test/tests/04-program-rand b/external/pflash/test/tests/04-program-rand
index d732eab..fc8abb6 100644
--- a/external/pflash/test/tests/04-program-rand
+++ b/external/pflash/test/tests/04-program-rand
@@ -1,5 +1,5 @@
 #! /bin/sh
-# SPDX-License-Identifier: Apache-2.0
+# SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
 
 touch "$DATA_DIR/$CUR_TEST.pnor"
 
diff --git a/external/pflash/test/tests/05-bad-numbers b/external/pflash/test/tests/05-bad-numbers
index 6064090..03cc39e 100644
--- a/external/pflash/test/tests/05-bad-numbers
+++ b/external/pflash/test/tests/05-bad-numbers
@@ -1,5 +1,5 @@
 #! /bin/sh
-# SPDX-License-Identifier: Apache-2.0
+# SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
 
 touch "$DATA_DIR/$CUR_TEST.pnor"
 
diff --git a/external/pflash/test/tests/06-miscprint b/external/pflash/test/tests/06-miscprint
index 8b37cab..bee84af 100644
--- a/external/pflash/test/tests/06-miscprint
+++ b/external/pflash/test/tests/06-miscprint
@@ -1,5 +1,5 @@
 #! /bin/sh
-# SPDX-License-Identifier: Apache-2.0
+# SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
 
 touch "$DATA_DIR/$CUR_TEST.pnor"
 
diff --git a/external/read_esel.sh b/external/read_esel.sh
index 3007092..ee4c66e 100644
--- a/external/read_esel.sh
+++ b/external/read_esel.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# SPDX-License-Identifier: Apache-2.0
+# SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
 # Copyright 2013-2014 IBM Corp.
 
 set -e
diff --git a/external/shared/Makefile b/external/shared/Makefile
index 9442954..9ea4adc 100644
--- a/external/shared/Makefile
+++ b/external/shared/Makefile
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: Apache-2.0
+# SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
 .DEFAULT_GOAL := all
 GET_ARCH := ../../external/common/get_arch.sh
 include ../../external/common/rules.mk
diff --git a/external/shared/config.h b/external/shared/config.h
index 9ed42d2..f78e30e 100644
--- a/external/shared/config.h
+++ b/external/shared/config.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
 /*
  * For CCAN
  *
diff --git a/external/shared/rules.mk b/external/shared/rules.mk
index 632c62c..a3d83d1 100644
--- a/external/shared/rules.mk
+++ b/external/shared/rules.mk
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: Apache-2.0
+# SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
 # NOTE: shared lib versioning has *NOTHING* to do with software package version
 #
 # If source code has changed, revision++
diff --git a/external/test/test.sh b/external/test/test.sh
index 1ff534b..2bf1e89 100755
--- a/external/test/test.sh
+++ b/external/test/test.sh
@@ -1,5 +1,5 @@
 #! /bin/sh
-# SPDX-License-Identifier: Apache-2.0
+# SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
 #
 # Copyright 2013-2017 IBM Corp.
 
diff --git a/external/trace/Makefile b/external/trace/Makefile
index f18e5bc..737397b 100644
--- a/external/trace/Makefile
+++ b/external/trace/Makefile
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: Apache-2.0
+# SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
 HOSTEND=$(shell uname -m | sed -e 's/^i.*86$$/LITTLE/' -e 's/^x86.*/LITTLE/' -e 's/^ppc64le/LITTLE/' -e 's/^ppc.*/BIG/')
 CFLAGS=-g -Wall -DHAVE_$(HOSTEND)_ENDIAN -I../../include -I../../
 
diff --git a/external/trace/dump_trace.c b/external/trace/dump_trace.c
index 4a01bde..aba684b 100644
--- a/external/trace/dump_trace.c
+++ b/external/trace/dump_trace.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
 /*
  * Dump the content of an OPAL trace
  *
diff --git a/external/trace/trace.c b/external/trace/trace.c
index f28630f..97cec7d 100644
--- a/external/trace/trace.c
+++ b/external/trace/trace.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
 /*
  * This example code shows how to read from the trace buffer.
  *
diff --git a/external/trace/trace.h b/external/trace/trace.h
index 14b94d0..1a5a138 100644
--- a/external/trace/trace.h
+++ b/external/trace/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.
  */
diff --git a/external/xscom-utils/adu_scoms.py b/external/xscom-utils/adu_scoms.py
index 4d1f3fa..cb1c0d2 100755
--- a/external/xscom-utils/adu_scoms.py
+++ b/external/xscom-utils/adu_scoms.py
@@ -1,5 +1,5 @@
 #!/usr/bin/python
-# SPDX-License-Identifier: Apache-2.0
+# SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
 #
 # Python library for in-band SCom access
 # (based on xscom-utils from OPAL firmware)
diff --git a/external/xscom-utils/getscom.c b/external/xscom-utils/getscom.c
index 430a23e..bb28139 100644
--- a/external/xscom-utils/getscom.c
+++ b/external/xscom-utils/getscom.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
 /*
  * getscom
  *
diff --git a/external/xscom-utils/getsram.c b/external/xscom-utils/getsram.c
index a3e53e1..7d9c4bf 100644
--- a/external/xscom-utils/getsram.c
+++ b/external/xscom-utils/getsram.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
 /*
  * Read SRAM
  *
diff --git a/external/xscom-utils/putscom.c b/external/xscom-utils/putscom.c
index ba575e0..b942eeb 100644
--- a/external/xscom-utils/putscom.c
+++ b/external/xscom-utils/putscom.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
 /*
  * getscom
  *
diff --git a/external/xscom-utils/sram.c b/external/xscom-utils/sram.c
index fd3fe8c..87df70e 100644
--- a/external/xscom-utils/sram.c
+++ b/external/xscom-utils/sram.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
 /* Copyright 2014-2019 IBM Corp. */
 
 #include <stdint.h>
diff --git a/external/xscom-utils/sram.h b/external/xscom-utils/sram.h
index 92ab512..75d9155 100644
--- a/external/xscom-utils/sram.h
+++ b/external/xscom-utils/sram.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-2016 IBM Corp. */
 
 #ifndef __SRAM_H
diff --git a/external/xscom-utils/xscom.c b/external/xscom-utils/xscom.c
index f742336..031f9e1 100644
--- a/external/xscom-utils/xscom.c
+++ b/external/xscom-utils/xscom.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
 /*
  * Do XSCOMs through linux debugfs interface
  *
diff --git a/external/xscom-utils/xscom.h b/external/xscom-utils/xscom.h
index 8929fb2..05b8f54 100644
--- a/external/xscom-utils/xscom.h
+++ b/external/xscom-utils/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 2014-2017 IBM Corp.
  */