aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStewart Smith <stewart@linux.ibm.com>2019-11-05 19:48:08 +1100
committerOliver O'Halloran <oohall@gmail.com>2020-03-12 20:33:18 +1100
commit49496485fe9df08633d0db70c1cdbf15ff533991 (patch)
tree8ca76542f57840193157582c8811fbd0ecb31476
parent2700092e09adc8f3c2d578878c1a98cb44b9863d (diff)
downloadskiboot-49496485fe9df08633d0db70c1cdbf15ff533991.zip
skiboot-49496485fe9df08633d0db70c1cdbf15ff533991.tar.gz
skiboot-49496485fe9df08633d0db70c1cdbf15ff533991.tar.bz2
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>
-rw-r--r--Makefile2
-rw-r--r--Makefile.main2
-rw-r--r--Makefile.rules2
-rw-r--r--asm/asm-offsets.c2
-rw-r--r--asm/cvc_entry.S2
-rw-r--r--asm/dummy_map.S2
-rw-r--r--asm/head.S2
-rw-r--r--asm/kernel-wrapper.S2
-rw-r--r--asm/misc.S2
-rw-r--r--asm/real_map.S2
-rw-r--r--core/Makefile.inc2
-rw-r--r--core/affinity.c2
-rw-r--r--core/bitmap.c2
-rw-r--r--core/buddy.c2
-rw-r--r--core/chip.c2
-rw-r--r--core/console-log.c2
-rw-r--r--core/console.c2
-rw-r--r--core/cpu.c2
-rw-r--r--core/cpufeatures.c2
-rw-r--r--core/device.c2
-rw-r--r--core/errorlog.c2
-rw-r--r--core/exceptions.c2
-rw-r--r--core/fast-reboot.c2
-rw-r--r--core/fdt.c2
-rw-r--r--core/flash-firmware-versions.c2
-rw-r--r--core/flash-subpartition.c2
-rw-r--r--core/gcov-profiling.c2
-rw-r--r--core/hmi.c2
-rw-r--r--core/i2c.c2
-rw-r--r--core/init.c2
-rw-r--r--core/interrupts.c2
-rw-r--r--core/ipmi-opal.c2
-rw-r--r--core/ipmi.c2
-rw-r--r--core/lock.c2
-rw-r--r--core/malloc.c2
-rw-r--r--core/mem_region.c2
-rw-r--r--core/nvram-format.c2
-rw-r--r--core/nvram.c2
-rw-r--r--core/opal-msg.c2
-rw-r--r--core/opal.c2
-rw-r--r--core/pci-dt-slot.c2
-rw-r--r--core/pci-opal.c2
-rw-r--r--core/pci-quirk.c2
-rw-r--r--core/pci-slot.c2
-rw-r--r--core/pci-virt.c2
-rw-r--r--core/pci.c2
-rw-r--r--core/pel.c2
-rw-r--r--core/platform.c2
-rw-r--r--core/pool.c2
-rw-r--r--core/powercap.c2
-rw-r--r--core/psr.c2
-rw-r--r--core/relocate.c2
-rw-r--r--core/rtc.c2
-rw-r--r--core/sensor.c2
-rw-r--r--core/stack.c2
-rw-r--r--core/test/dummy-cpu.h2
-rw-r--r--core/test/run-api-test.c2
-rw-r--r--core/test/run-bitmap.c2
-rw-r--r--core/test/run-buddy.c2
-rw-r--r--core/test/run-console-log-buf-overrun.c2
-rw-r--r--core/test/run-console-log-pr_fmt.c2
-rw-r--r--core/test/run-console-log.c2
-rw-r--r--core/test/run-cpufeatures.c2
-rw-r--r--core/test/run-device.c2
-rw-r--r--core/test/run-flash-firmware-versions.c2
-rw-r--r--core/test/run-flash-subpartition.c2
-rw-r--r--core/test/run-malloc-speed.c2
-rw-r--r--core/test/run-malloc.c2
-rw-r--r--core/test/run-mem_range_is_reserved.c2
-rw-r--r--core/test/run-mem_region.c2
-rw-r--r--core/test/run-mem_region_init.c2
-rw-r--r--core/test/run-mem_region_next.c2
-rw-r--r--core/test/run-mem_region_release_unused.c2
-rw-r--r--core/test/run-mem_region_release_unused_noalloc.c2
-rw-r--r--core/test/run-mem_region_reservations.c2
-rw-r--r--core/test/run-msg.c2
-rw-r--r--core/test/run-nvram-format.c2
-rw-r--r--core/test/run-pci-quirk.c2
-rw-r--r--core/test/run-pel.c2
-rw-r--r--core/test/run-pool.c2
-rw-r--r--core/test/run-time-utils.c2
-rw-r--r--core/test/run-timebase.c2
-rw-r--r--core/test/run-timer.c2
-rw-r--r--core/test/run-trace.c2
-rw-r--r--core/test/stubs.c2
-rw-r--r--core/time-utils.c2
-rw-r--r--core/timebase.c2
-rw-r--r--core/timer.c2
-rw-r--r--core/trace.c2
-rw-r--r--core/utils.c2
-rw-r--r--core/vpd.c2
-rw-r--r--external/Makefile.check2
-rw-r--r--external/common/arch_flash.h2
-rw-r--r--external/common/arch_flash_arm.c2
-rw-r--r--external/common/arch_flash_arm_io.h2
-rw-r--r--external/common/arch_flash_common.c2
-rw-r--r--external/common/arch_flash_powerpc.c2
-rwxr-xr-xexternal/common/get_arch.sh2
-rw-r--r--external/devicetree/Makefile2
-rw-r--r--external/devicetree/p9-simics.dts2
-rw-r--r--external/devicetree/p9.dts2
-rw-r--r--external/ffspart/Makefile2
-rw-r--r--external/ffspart/config.h2
-rw-r--r--external/ffspart/ffspart.c2
-rw-r--r--external/ffspart/rules.mk2
-rwxr-xr-xexternal/fwts/generate-fwts-olog2
-rwxr-xr-xexternal/fwts/merge-fwts-olog2
-rw-r--r--external/gard/Makefile.dist2
-rw-r--r--external/gard/config.h2
-rw-r--r--external/gard/gard.c2
-rw-r--r--external/gard/gard.h2
-rw-r--r--external/gard/units.c2
-rw-r--r--external/lpc/Makefile2
-rw-r--r--external/lpc/lpc.c2
-rw-r--r--external/mambo/Makefile2
-rw-r--r--external/mambo/mambo-socket-proxy.c2
-rw-r--r--external/mambo/mambo_utils.tcl2
-rw-r--r--external/mambo/qtrace_utils.tcl2
-rw-r--r--external/mambo/skiboot.tcl2
-rw-r--r--external/memboot/Makefile2
-rw-r--r--external/memboot/memboot.c2
-rwxr-xr-xexternal/npu/run_procedure.sh2
-rw-r--r--external/opal-prd/config.h2
-rw-r--r--external/opal-prd/hostboot-interface.h2
-rw-r--r--external/opal-prd/i2c.c2
-rw-r--r--external/opal-prd/i2c.h2
-rw-r--r--external/opal-prd/module.c2
-rw-r--r--external/opal-prd/module.h2
-rw-r--r--external/opal-prd/opal-prd.c2
-rw-r--r--external/opal-prd/opal-prd.h2
-rw-r--r--external/opal-prd/pnor.c2
-rw-r--r--external/opal-prd/pnor.h2
-rw-r--r--external/opal-prd/test/test_pnor.c2
-rw-r--r--external/opal-prd/test/test_pnor_ops.c2
-rw-r--r--external/opal-prd/thunk.S2
-rw-r--r--external/pflash/Makefile.dist2
-rwxr-xr-xexternal/pflash/build-all-arch.sh2
-rw-r--r--external/pflash/config.h2
-rw-r--r--external/pflash/pflash.c2
-rw-r--r--external/pflash/progress.c2
-rw-r--r--external/pflash/progress.h2
-rw-r--r--external/pflash/rules.mk2
-rw-r--r--external/pflash/test/tests/00-usage2
-rw-r--r--external/pflash/test/tests/01-info2
-rw-r--r--external/pflash/test/tests/02-erase2
-rw-r--r--external/pflash/test/tests/03-erase-parts2
-rw-r--r--external/pflash/test/tests/04-program-rand2
-rw-r--r--external/pflash/test/tests/05-bad-numbers2
-rw-r--r--external/pflash/test/tests/06-miscprint2
-rw-r--r--external/read_esel.sh2
-rw-r--r--external/shared/Makefile2
-rw-r--r--external/shared/config.h2
-rw-r--r--external/shared/rules.mk2
-rwxr-xr-xexternal/test/test.sh2
-rw-r--r--external/trace/Makefile2
-rw-r--r--external/trace/dump_trace.c2
-rw-r--r--external/trace/trace.c2
-rw-r--r--external/trace/trace.h2
-rwxr-xr-xexternal/xscom-utils/adu_scoms.py2
-rw-r--r--external/xscom-utils/getscom.c2
-rw-r--r--external/xscom-utils/getsram.c2
-rw-r--r--external/xscom-utils/putscom.c2
-rw-r--r--external/xscom-utils/sram.c2
-rw-r--r--external/xscom-utils/sram.h2
-rw-r--r--external/xscom-utils/xscom.c2
-rw-r--r--external/xscom-utils/xscom.h2
-rw-r--r--extract-gcov.c2
-rw-r--r--hdata/cpu-common.c2
-rw-r--r--hdata/fsp.c2
-rw-r--r--hdata/hdata.h2
-rw-r--r--hdata/hdif.c2
-rw-r--r--hdata/hdif.h2
-rw-r--r--hdata/hostservices.c2
-rw-r--r--hdata/i2c.c2
-rw-r--r--hdata/iohub.c2
-rw-r--r--hdata/memory.c2
-rw-r--r--hdata/naca.c1
-rw-r--r--hdata/naca.h2
-rw-r--r--hdata/pcia.c2
-rw-r--r--hdata/slca.c2
-rw-r--r--hdata/spira.c2
-rw-r--r--hdata/spira.h2
-rw-r--r--hdata/test/Makefile.check2
-rwxr-xr-xhdata/test/dtdiff_wrap.sh2
-rw-r--r--hdata/test/hdata_to_dt.c2
-rw-r--r--hdata/test/stubs.c2
-rw-r--r--hdata/tpmrel.c2
-rw-r--r--hdata/vpd-common.c2
-rw-r--r--hw/ast-bmc/Makefile.inc2
-rw-r--r--hw/ast-bmc/ast-io.c2
-rw-r--r--hw/ast-bmc/ast-sf-ctrl.c2
-rw-r--r--hw/bt.c2
-rw-r--r--hw/cache-p9.c2
-rw-r--r--hw/capp.c2
-rw-r--r--hw/centaur.c2
-rw-r--r--hw/chiptod.c2
-rw-r--r--hw/dio-p9.c2
-rw-r--r--hw/fake-nvram.c2
-rw-r--r--hw/fake-rtc.c2
-rw-r--r--hw/fsi-master.c2
-rw-r--r--hw/fsp/fsp-attn.c2
-rw-r--r--hw/fsp/fsp-chiptod.c2
-rw-r--r--hw/fsp/fsp-codeupdate.c2
-rw-r--r--hw/fsp/fsp-codeupdate.h2
-rw-r--r--hw/fsp/fsp-console.c2
-rw-r--r--hw/fsp/fsp-diag.c2
-rw-r--r--hw/fsp/fsp-dpo.c2
-rw-r--r--hw/fsp/fsp-dump.c2
-rw-r--r--hw/fsp/fsp-elog-read.c2
-rw-r--r--hw/fsp/fsp-elog-write.c2
-rw-r--r--hw/fsp/fsp-epow.c2
-rw-r--r--hw/fsp/fsp-epow.h2
-rw-r--r--hw/fsp/fsp-ipmi.c2
-rw-r--r--hw/fsp/fsp-leds.c2
-rw-r--r--hw/fsp/fsp-mem-err.c2
-rw-r--r--hw/fsp/fsp-nvram.c2
-rw-r--r--hw/fsp/fsp-occ.c2
-rw-r--r--hw/fsp/fsp-op-panel.c2
-rw-r--r--hw/fsp/fsp-psi.c2
-rw-r--r--hw/fsp/fsp-rtc.c2
-rw-r--r--hw/fsp/fsp-sensor.c2
-rw-r--r--hw/fsp/fsp-surveillance.c2
-rw-r--r--hw/fsp/fsp-sysdump.c2
-rw-r--r--hw/fsp/fsp-sysparam.c2
-rw-r--r--hw/fsp/fsp.c2
-rw-r--r--hw/homer.c2
-rw-r--r--hw/imc.c2
-rw-r--r--hw/ipmi/Makefile.inc2
-rw-r--r--hw/ipmi/ipmi-attn.c2
-rw-r--r--hw/ipmi/ipmi-fru.c2
-rw-r--r--hw/ipmi/ipmi-info.c2
-rw-r--r--hw/ipmi/ipmi-power.c2
-rw-r--r--hw/ipmi/ipmi-rtc.c2
-rw-r--r--hw/ipmi/ipmi-sel.c2
-rw-r--r--hw/ipmi/ipmi-sensor.c2
-rw-r--r--hw/ipmi/test/run-fru.c2
-rw-r--r--hw/lpc-mbox.c2
-rw-r--r--hw/lpc-port80h.c2
-rw-r--r--hw/lpc-rtc.c2
-rw-r--r--hw/lpc-uart.c2
-rw-r--r--hw/lpc.c2
-rw-r--r--hw/npu-hw-procedures.c2
-rw-r--r--hw/npu-opal.c2
-rw-r--r--hw/npu.c2
-rw-r--r--hw/npu2-common.c2
-rw-r--r--hw/npu2-hw-procedures.c2
-rw-r--r--hw/npu2-opencapi.c2
-rw-r--r--hw/npu2.c2
-rw-r--r--hw/npu3-hw-procedures.c2
-rw-r--r--hw/npu3-nvlink.c2
-rw-r--r--hw/npu3.c2
-rw-r--r--hw/nx-842.c2
-rw-r--r--hw/nx-compress.c2
-rw-r--r--hw/nx-crypto.c2
-rw-r--r--hw/nx-gzip.c2
-rw-r--r--hw/nx-rng.c2
-rw-r--r--hw/nx.c2
-rw-r--r--hw/occ-sensor.c2
-rw-r--r--hw/occ.c2
-rw-r--r--hw/p8-i2c.c2
-rw-r--r--hw/phb3.c2
-rw-r--r--hw/phys-map.c2
-rw-r--r--hw/prd.c2
-rw-r--r--hw/psi.c2
-rw-r--r--hw/sbe-p8.c2
-rw-r--r--hw/sbe-p9.c2
-rw-r--r--hw/sfc-ctrl.c2
-rw-r--r--hw/slw.c2
-rw-r--r--hw/test/phys-map-test.c2
-rw-r--r--hw/test/run-port80h.c2
-rw-r--r--hw/vas.c2
-rw-r--r--hw/xive.c2
-rw-r--r--hw/xscom.c2
-rw-r--r--include/affinity.h2
-rw-r--r--include/asm-utils.h2
-rw-r--r--include/ast.h2
-rw-r--r--include/bitmap.h2
-rw-r--r--include/bitutils.h2
-rw-r--r--include/bt.h2
-rw-r--r--include/buddy.h2
-rw-r--r--include/capp.h2
-rw-r--r--include/cec.h2
-rw-r--r--include/centaur.h2
-rw-r--r--include/chip.h2
-rw-r--r--include/chiptod.h2
-rw-r--r--include/cmpxchg.h2
-rw-r--r--include/compiler.h2
-rw-r--r--include/config.h2
-rw-r--r--include/console.h2
-rw-r--r--include/debug_descriptor.h2
-rw-r--r--include/device.h2
-rw-r--r--include/dio-p9.h2
-rw-r--r--include/direct-controls.h2
-rw-r--r--include/dts.h2
-rw-r--r--include/elf-abi.h2
-rw-r--r--include/elf.h2
-rw-r--r--include/errorlog.h2
-rw-r--r--include/fsi-master.h2
-rw-r--r--include/fsp-attn.h2
-rw-r--r--include/fsp-elog.h2
-rw-r--r--include/fsp-leds.h2
-rw-r--r--include/fsp-sysparam.h2
-rw-r--r--include/fsp.h2
-rw-r--r--include/hiomap.h2
-rw-r--r--include/hostservices.h2
-rw-r--r--include/i2c.h2
-rw-r--r--include/imc.h2
-rw-r--r--include/interrupts.h2
-rw-r--r--include/inttypes.h2
-rw-r--r--include/io.h2
-rw-r--r--include/ipmi.h2
-rw-r--r--include/lock.h2
-rw-r--r--include/lpc-mbox.h2
-rw-r--r--include/lpc.h2
-rw-r--r--include/mem-map.h2
-rw-r--r--include/mem_region-malloc.h2
-rw-r--r--include/mem_region.h2
-rw-r--r--include/npu-regs.h2
-rw-r--r--include/npu.h2
-rw-r--r--include/npu2-regs.h2
-rw-r--r--include/npu2.h2
-rw-r--r--include/nvram.h2
-rw-r--r--include/nx.h2
-rw-r--r--include/occ.h2
-rw-r--r--include/op-panel.h2
-rw-r--r--include/opal-api.h2
-rw-r--r--include/opal-dump.h2
-rw-r--r--include/opal-internal.h2
-rw-r--r--include/opal-msg.h2
-rw-r--r--include/opal.h2
-rw-r--r--include/pci-cfg.h2
-rw-r--r--include/pci-quirk.h2
-rw-r--r--include/pci-slot.h2
-rw-r--r--include/pci-virt.h2
-rw-r--r--include/pci.h2
-rw-r--r--include/pel.h2
-rw-r--r--include/phb3-capp.h2
-rw-r--r--include/phb3-regs.h2
-rw-r--r--include/phb3.h2
-rw-r--r--include/phb4-capp.h2
-rw-r--r--include/phb4-regs.h2
-rw-r--r--include/phys-map.h2
-rw-r--r--include/pool.h2
-rw-r--r--include/powercap.h2
-rw-r--r--include/prd-fw-msg.h2
-rw-r--r--include/processor.h2
-rw-r--r--include/psi.h2
-rw-r--r--include/psr.h2
-rw-r--r--include/rtc.h2
-rw-r--r--include/sbe-p8.h2
-rw-r--r--include/sbe-p9.h2
-rw-r--r--include/secvar.h2
-rw-r--r--include/sensor.h2
-rw-r--r--include/sfc-ctrl.h2
-rw-r--r--include/skiboot-valgrind.h2
-rw-r--r--include/skiboot.h2
-rw-r--r--include/spcn.h2
-rw-r--r--include/stack.h2
-rw-r--r--include/time-utils.h2
-rw-r--r--include/timebase.h2
-rw-r--r--include/timer.h2
-rw-r--r--include/trace.h2
-rw-r--r--include/trace_types.h2
-rw-r--r--include/types.h2
-rw-r--r--include/vas.h2
-rw-r--r--include/vpd.h2
-rw-r--r--include/xive-p9-regs.h2
-rw-r--r--include/xive-regs.h2
-rw-r--r--include/xive.h2
-rw-r--r--include/xscom-p8-regs.h2
-rw-r--r--include/xscom-p9-regs.h2
-rw-r--r--include/xscom.h2
-rw-r--r--libc/string/memcpy_from_ci.c2
-rw-r--r--libc/test/run-ctype-test.c2
-rw-r--r--libc/test/run-ctype.c2
-rw-r--r--libc/test/run-memops-test.c2
-rw-r--r--libc/test/run-memops.c2
-rw-r--r--libc/test/run-snprintf-test.c2
-rw-r--r--libc/test/run-snprintf.c2
-rw-r--r--libc/test/run-stdlib-test.c2
-rw-r--r--libc/test/run-stdlib.c2
-rw-r--r--libc/test/run-time.c2
-rw-r--r--libflash/blocklevel.c2
-rw-r--r--libflash/blocklevel.h2
-rw-r--r--libflash/ecc.c2
-rw-r--r--libflash/ecc.h2
-rw-r--r--libflash/errors.h2
-rw-r--r--libflash/ffs.h2
-rw-r--r--libflash/file.c2
-rw-r--r--libflash/file.h2
-rw-r--r--libflash/ipmi-hiomap.c2
-rw-r--r--libflash/ipmi-hiomap.h2
-rw-r--r--libflash/libffs.h2
-rw-r--r--libflash/libflash-priv.h2
-rw-r--r--libflash/libflash.c2
-rw-r--r--libflash/libflash.h2
-rw-r--r--libflash/mbox-flash.c2
-rw-r--r--libflash/mbox-flash.h2
-rw-r--r--libflash/test/mbox-server.c2
-rw-r--r--libflash/test/mbox-server.h2
-rw-r--r--libflash/test/stubs.c2
-rw-r--r--libflash/test/stubs.h2
-rw-r--r--libflash/test/test-blocklevel.c2
-rw-r--r--libflash/test/test-ecc.c2
-rw-r--r--libflash/test/test-flash.c2
-rw-r--r--libflash/test/test-ipmi-hiomap.c2
-rw-r--r--libflash/test/test-mbox.c2
-rw-r--r--libstb/container-utils.c2
-rw-r--r--libstb/container-utils.h2
-rw-r--r--libstb/container.c2
-rw-r--r--libstb/container.h2
-rw-r--r--libstb/create-container.c2
-rw-r--r--libstb/cvc.c2
-rw-r--r--libstb/cvc.h2
-rw-r--r--libstb/drivers/tpm_i2c_interface.c2
-rw-r--r--libstb/drivers/tpm_i2c_interface.h2
-rw-r--r--libstb/drivers/tpm_i2c_nuvoton.c2
-rw-r--r--libstb/drivers/tpm_i2c_nuvoton.h2
-rw-r--r--libstb/print-container.c2
-rw-r--r--libstb/secureboot.c2
-rw-r--r--libstb/secureboot.h2
-rw-r--r--libstb/secvar/Makefile.inc2
-rw-r--r--libstb/secvar/backend/Makefile.inc2
-rw-r--r--libstb/secvar/secvar.h2
-rw-r--r--libstb/secvar/secvar_api.c2
-rw-r--r--libstb/secvar/secvar_devtree.c2
-rw-r--r--libstb/secvar/secvar_devtree.h2
-rw-r--r--libstb/secvar/secvar_main.c2
-rw-r--r--libstb/secvar/secvar_util.c2
-rw-r--r--libstb/secvar/storage/Makefile.inc2
-rw-r--r--libstb/secvar/test/Makefile.check2
-rw-r--r--libstb/secvar/test/secvar-test-enqueue.c2
-rw-r--r--libstb/secvar/test/secvar-test-getvar.c2
-rw-r--r--libstb/secvar/test/secvar-test-nextvar.c2
-rw-r--r--libstb/secvar/test/secvar-test-void.c2
-rw-r--r--libstb/secvar/test/secvar_api_test.c2
-rw-r--r--libstb/secvar/test/secvar_common_test.c2
-rw-r--r--libstb/status_codes.h2
-rw-r--r--libstb/test/run-stb-container.c2
-rw-r--r--libstb/tpm_chip.c2
-rw-r--r--libstb/tpm_chip.h2
-rw-r--r--libstb/trustedboot.c2
-rw-r--r--libstb/trustedboot.h2
-rwxr-xr-xmake_offsets.sh2
-rw-r--r--platforms/astbmc/astbmc.h2
-rw-r--r--platforms/astbmc/common.c2
-rw-r--r--platforms/astbmc/firestone.c2
-rw-r--r--platforms/astbmc/habanero.c2
-rw-r--r--platforms/astbmc/palmetto.c2
-rw-r--r--platforms/astbmc/pnor.c2
-rw-r--r--platforms/astbmc/slots.c2
-rw-r--r--platforms/astbmc/swift.c2
-rw-r--r--platforms/astbmc/witherspoon.c2
-rw-r--r--platforms/astbmc/zaius.c2
-rw-r--r--platforms/ibm-fsp/common.c2
-rw-r--r--platforms/ibm-fsp/firenze-pci.c2
-rw-r--r--platforms/ibm-fsp/firenze.c2
-rw-r--r--platforms/ibm-fsp/fsp-vpd.c2
-rw-r--r--platforms/ibm-fsp/hostservices.c2
-rw-r--r--platforms/ibm-fsp/ibm-fsp.h2
-rw-r--r--platforms/ibm-fsp/lxvpd.c2
-rw-r--r--platforms/ibm-fsp/lxvpd.h2
-rw-r--r--platforms/ibm-fsp/zz.c2
-rw-r--r--platforms/mambo/console.c2
-rw-r--r--platforms/mambo/mambo.c2
-rw-r--r--platforms/mambo/mambo.h2
-rw-r--r--platforms/qemu/qemu.c2
-rw-r--r--skiboot.lds.S2
-rw-r--r--test/dt_common.c2
-rw-r--r--test/hello_world/hello_kernel/hello_kernel.S2
-rw-r--r--test/sreset_world/sreset_kernel/sreset_kernel.S2
471 files changed, 471 insertions, 470 deletions
diff --git a/Makefile b/Makefile
index 8122e0c..d236df9 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: Apache-2.0
+# SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
# Copyright 2012-2019 IBM Corp
#
diff --git a/Makefile.main b/Makefile.main
index daca012..dabd073 100644
--- a/Makefile.main
+++ b/Makefile.main
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: Apache-2.0
+# SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
#
# This is the main Makefile
#
diff --git a/Makefile.rules b/Makefile.rules
index 3d9d1b1..8c41c26 100644
--- a/Makefile.rules
+++ b/Makefile.rules
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: Apache-2.0
+# SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
#
# These allow for the build to be less verbose
#
diff --git a/asm/asm-offsets.c b/asm/asm-offsets.c
index 61a25ca..2328d4d 100644
--- a/asm/asm-offsets.c
+++ b/asm/asm-offsets.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.
*/
diff --git a/asm/cvc_entry.S b/asm/cvc_entry.S
index 94cd1ae..3f314ee 100644
--- a/asm/cvc_entry.S
+++ b/asm/cvc_entry.S
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: Apache-2.0
+# SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
# Derived from automatically generated HostBoot rom_entry.S
diff --git a/asm/dummy_map.S b/asm/dummy_map.S
index cb8f9df..dd38bc1 100644
--- a/asm/dummy_map.S
+++ b/asm/dummy_map.S
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
.section ".sym_map","a"
.byte 0
diff --git a/asm/head.S b/asm/head.S
index b565f6c..aea49d2 100644
--- a/asm/head.S
+++ b/asm/head.S
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
/*
* OPAL Entry points (and related code)
*
diff --git a/asm/kernel-wrapper.S b/asm/kernel-wrapper.S
index 27ff47c..107f2b2 100644
--- a/asm/kernel-wrapper.S
+++ b/asm/kernel-wrapper.S
@@ -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.
*/
diff --git a/asm/misc.S b/asm/misc.S
index 647f60b..e797efc 100644
--- a/asm/misc.S
+++ b/asm/misc.S
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
/*
* Misc asm functions
*
diff --git a/asm/real_map.S b/asm/real_map.S
index 4dfb71a..54d3760 100644
--- a/asm/real_map.S
+++ b/asm/real_map.S
@@ -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.
*/
diff --git a/core/Makefile.inc b/core/Makefile.inc
index fddff50..cc7d789 100644
--- a/core/Makefile.inc
+++ b/core/Makefile.inc
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: Apache-2.0
+# SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
# Copyright 2012-2019 IBM Corp
# -*-Makefile-*-
diff --git a/core/affinity.c b/core/affinity.c
index dabe893..47ba33c 100644
--- a/core/affinity.c
+++ b/core/affinity.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. */
/*
diff --git a/core/bitmap.c b/core/bitmap.c
index 0900a61..8de1356 100644
--- a/core/bitmap.c
+++ b/core/bitmap.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
/* Copyright 2016 IBM Corp. */
#include "bitmap.h"
diff --git a/core/buddy.c b/core/buddy.c
index d3f7ee3..1f433dd 100644
--- a/core/buddy.c
+++ b/core/buddy.c
@@ -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. */
#include <assert.h>
diff --git a/core/chip.c b/core/chip.c
index 8afc6bb..191432d 100644
--- a/core/chip.c
+++ b/core/chip.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. */
#include <skiboot.h>
diff --git a/core/console-log.c b/core/console-log.c
index 09176af..21a1442 100644
--- a/core/console-log.c
+++ b/core/console-log.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
/*
* Console Log routines
* Wraps libc and console lower level functions
diff --git a/core/console.c b/core/console.c
index 030c1d9..2a15090 100644
--- a/core/console.c
+++ b/core/console.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
/*
* Console IO routine for use by libc
*
diff --git a/core/cpu.c b/core/cpu.c
index d5b7d62..37d9f41 100644
--- a/core/cpu.c
+++ b/core/cpu.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
/*
* Code to manage and manipulate CPUs
*
diff --git a/core/cpufeatures.c b/core/cpufeatures.c
index ec30c97..c6754ab 100644
--- a/core/cpufeatures.c
+++ b/core/cpufeatures.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
/*
* This file deals with setup of /cpus/ibm,powerpc-cpu-features dt
*
diff --git a/core/device.c b/core/device.c
index 6c77946..4fd4459 100644
--- a/core/device.c
+++ b/core/device.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
/*
* Manipulate the device tree
*
diff --git a/core/errorlog.c b/core/errorlog.c
index 12bc913..f64ac3f 100644
--- a/core/errorlog.c
+++ b/core/errorlog.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
/* This file contains the front end for OPAL error logging. It is used
* to construct a struct errorlog representing the event/error to be
* logged which is then passed to the platform specific backend to log
diff --git a/core/exceptions.c b/core/exceptions.c
index 4ff7a9e..dacc02a 100644
--- a/core/exceptions.c
+++ b/core/exceptions.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
/*
* Deal with exceptions when in OPAL.
*
diff --git a/core/fast-reboot.c b/core/fast-reboot.c
index b60ddf3..02f0ca0 100644
--- a/core/fast-reboot.c
+++ b/core/fast-reboot.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
/*
* Full IPL is slow, let's cheat!
*
diff --git a/core/fdt.c b/core/fdt.c
index 92fdc5b..463dc69 100644
--- a/core/fdt.c
+++ b/core/fdt.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
/*
* Produce and consume flattened device trees
*
diff --git a/core/flash-firmware-versions.c b/core/flash-firmware-versions.c
index 3e58379..975ac6a 100644
--- a/core/flash-firmware-versions.c
+++ b/core/flash-firmware-versions.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
/*
* Parse VERSION partition, add to device tree
*
diff --git a/core/flash-subpartition.c b/core/flash-subpartition.c
index 06a53a6..6e0fec6 100644
--- a/core/flash-subpartition.c
+++ b/core/flash-subpartition.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
/*
* Parse flash sub-partitions
*
diff --git a/core/gcov-profiling.c b/core/gcov-profiling.c
index c94438e..fdad51e 100644
--- a/core/gcov-profiling.c
+++ b/core/gcov-profiling.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
/*
* libgcov skeleton reimplementation to build skiboot with gcov support
*
diff --git a/core/hmi.c b/core/hmi.c
index 3e38e04..120fe4b 100644
--- a/core/hmi.c
+++ b/core/hmi.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
/*
* Deal with Hypervisor Maintenance Interrupts
*
diff --git a/core/i2c.c b/core/i2c.c
index 9bc32aa..fd93081 100644
--- a/core/i2c.c
+++ b/core/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
*
diff --git a/core/init.c b/core/init.c
index 53572e5..bff4e96 100644
--- a/core/init.c
+++ b/core/init.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
/*
* skiboot C entry point
*
diff --git a/core/interrupts.c b/core/interrupts.c
index 6814832..0a617d3 100644
--- a/core/interrupts.c
+++ b/core/interrupts.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
/*
* Excuse me, you do work for me now?
*
diff --git a/core/ipmi-opal.c b/core/ipmi-opal.c
index d36962d..cc45b40 100644
--- a/core/ipmi-opal.c
+++ b/core/ipmi-opal.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
/*
* IPMI OPAL calls
*
diff --git a/core/ipmi.c b/core/ipmi.c
index f32adb3..bbc1a7b 100644
--- a/core/ipmi.c
+++ b/core/ipmi.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
/*
* in-band IPMI, probably over bt (or via FSP mbox on FSP)
*
diff --git a/core/lock.c b/core/lock.c
index 9594e05..f0ab595 100644
--- a/core/lock.c
+++ b/core/lock.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
/*
* Simple spinlock
*
diff --git a/core/malloc.c b/core/malloc.c
index 613cff9..76996ff 100644
--- a/core/malloc.c
+++ b/core/malloc.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
/*
* Implement malloc()/free() etc on top of our memory region allocator,
* which provides mem_alloc()/mem_free().
diff --git a/core/mem_region.c b/core/mem_region.c
index 003a918..0054832 100644
--- a/core/mem_region.c
+++ b/core/mem_region.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
/*
* Simple memory allocator
*
diff --git a/core/nvram-format.c b/core/nvram-format.c
index 15a4a2d..8aa5abf 100644
--- a/core/nvram-format.c
+++ b/core/nvram-format.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
/*
* NVRAM Format as specified in PAPR
*
diff --git a/core/nvram.c b/core/nvram.c
index ce24684..773d202 100644
--- a/core/nvram.c
+++ b/core/nvram.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
/*
* NVRAM support
*
diff --git a/core/opal-msg.c b/core/opal-msg.c
index dbe75e1..65a2476 100644
--- a/core/opal-msg.c
+++ b/core/opal-msg.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
/*
* OPAL Message queue between host and skiboot
*
diff --git a/core/opal.c b/core/opal.c
index dc9944d..64fdfe6 100644
--- a/core/opal.c
+++ b/core/opal.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
/*
* Base support for OPAL calls
*
diff --git a/core/pci-dt-slot.c b/core/pci-dt-slot.c
index 034422c..2441bf9 100644
--- a/core/pci-dt-slot.c
+++ b/core/pci-dt-slot.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
/*
* PCI slots in the device tree.
*
diff --git a/core/pci-opal.c b/core/pci-opal.c
index 292f100..aa375c6 100644
--- a/core/pci-opal.c
+++ b/core/pci-opal.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
/*
* PCIe OPAL Calls
*
diff --git a/core/pci-quirk.c b/core/pci-quirk.c
index 1fa43d8..5c8b091 100644
--- a/core/pci-quirk.c
+++ b/core/pci-quirk.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
/*
* Deal with PCI device quirks
*
diff --git a/core/pci-slot.c b/core/pci-slot.c
index ffb54cb..71d3d32 100644
--- a/core/pci-slot.c
+++ b/core/pci-slot.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
/*
* PCI Slots
*
diff --git a/core/pci-virt.c b/core/pci-virt.c
index 606e4f5..e0cb994 100644
--- a/core/pci-virt.c
+++ b/core/pci-virt.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
/*
* Support virtual PCI devices
*
diff --git a/core/pci.c b/core/pci.c
index cc7353b..e195ecb 100644
--- a/core/pci.c
+++ b/core/pci.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
/*
* Base PCI support
*
diff --git a/core/pel.c b/core/pel.c
index f37b218..ec13e55 100644
--- a/core/pel.c
+++ b/core/pel.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
/*
* Platform Error Log (PEL) generation
*
diff --git a/core/platform.c b/core/platform.c
index 85b2cd2..8f4a3b8 100644
--- a/core/platform.c
+++ b/core/platform.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
/*
* OPAL Platform abstraction
*
diff --git a/core/pool.c b/core/pool.c
index 9294f8c..a028319 100644
--- a/core/pool.c
+++ b/core/pool.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
/*
* This file provides some functions to manage a pool of pre-allocated
* objects. It also provides a method to reserve a pre-defined number
diff --git a/core/powercap.c b/core/powercap.c
index de2a790..6ae58eb 100644
--- a/core/powercap.c
+++ b/core/powercap.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
/*
* OPAL calls to get/set power caps
*
diff --git a/core/psr.c b/core/psr.c
index 6698df8..75ccc66 100644
--- a/core/psr.c
+++ b/core/psr.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
/*
* OPAL calls to get/set Power Shift Ratio (PSR)
*
diff --git a/core/relocate.c b/core/relocate.c
index 8e1f1b2..6295927 100644
--- a/core/relocate.c
+++ b/core/relocate.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
/*
* Relocate ourselves
*
diff --git a/core/rtc.c b/core/rtc.c
index 28faa98..3c0dda7 100644
--- a/core/rtc.c
+++ b/core/rtc.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
/*
* Real Time Clock (RTC) Cache
*
diff --git a/core/sensor.c b/core/sensor.c
index d63d909..303d867 100644
--- a/core/sensor.c
+++ b/core/sensor.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
/*
* OPAL Sensor APIs
*
diff --git a/core/stack.c b/core/stack.c
index b94d115..688ef70 100644
--- a/core/stack.c
+++ b/core/stack.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
/*
* Create/Print backtraces, check stack usage etc.
*
diff --git a/core/test/dummy-cpu.h b/core/test/dummy-cpu.h
index 804a047..64fb71b 100644
--- a/core/test/dummy-cpu.h
+++ b/core/test/dummy-cpu.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.
*
diff --git a/core/test/run-api-test.c b/core/test/run-api-test.c
index 0c3472b..35e8135 100644
--- a/core/test/run-api-test.c
+++ b/core/test/run-api-test.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-2016 IBM Corp.
*
diff --git a/core/test/run-bitmap.c b/core/test/run-bitmap.c
index 2c7cea7..e474915 100644
--- a/core/test/run-bitmap.c
+++ b/core/test/run-bitmap.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.
*/
diff --git a/core/test/run-buddy.c b/core/test/run-buddy.c
index 83a4661..8ae26cb 100644
--- a/core/test/run-buddy.c
+++ b/core/test/run-buddy.c
@@ -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.
*/
diff --git a/core/test/run-console-log-buf-overrun.c b/core/test/run-console-log-buf-overrun.c
index 45679f2..83774c4 100644
--- a/core/test/run-console-log-buf-overrun.c
+++ b/core/test/run-console-log-buf-overrun.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.
*/
diff --git a/core/test/run-console-log-pr_fmt.c b/core/test/run-console-log-pr_fmt.c
index a25dafd..457de03 100644
--- a/core/test/run-console-log-pr_fmt.c
+++ b/core/test/run-console-log-pr_fmt.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.
*/
diff --git a/core/test/run-console-log.c b/core/test/run-console-log.c
index 589b8b6..bec281b 100644
--- a/core/test/run-console-log.c
+++ b/core/test/run-console-log.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-2016 IBM Corp.
*/
diff --git a/core/test/run-cpufeatures.c b/core/test/run-cpufeatures.c
index 1ec8c22..bb89b25 100644
--- a/core/test/run-cpufeatures.c
+++ b/core/test/run-cpufeatures.c
@@ -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/core/test/run-device.c b/core/test/run-device.c
index 03d3d54..4a12382 100644
--- a/core/test/run-device.c
+++ b/core/test/run-device.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
/*
* Copyright 2012-2018 IBM Corp.
*/
diff --git a/core/test/run-flash-firmware-versions.c b/core/test/run-flash-firmware-versions.c
index 4b8a4da..9f96f5c 100644
--- a/core/test/run-flash-firmware-versions.c
+++ b/core/test/run-flash-firmware-versions.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.
*/
diff --git a/core/test/run-flash-subpartition.c b/core/test/run-flash-subpartition.c
index bc41dbf..5b6df87 100644
--- a/core/test/run-flash-subpartition.c
+++ b/core/test/run-flash-subpartition.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-2016 IBM Corp.
*/
diff --git a/core/test/run-malloc-speed.c b/core/test/run-malloc-speed.c
index 400778a..39a24f9 100644
--- a/core/test/run-malloc-speed.c
+++ b/core/test/run-malloc-speed.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.
*/
diff --git a/core/test/run-malloc.c b/core/test/run-malloc.c
index 00ea410..6018e99 100644
--- a/core/test/run-malloc.c
+++ b/core/test/run-malloc.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.
*/
diff --git a/core/test/run-mem_range_is_reserved.c b/core/test/run-mem_range_is_reserved.c
index f34c4ec..22c9213 100644
--- a/core/test/run-mem_range_is_reserved.c
+++ b/core/test/run-mem_range_is_reserved.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-2019 IBM Corp.
*/
diff --git a/core/test/run-mem_region.c b/core/test/run-mem_region.c
index 038ce27..66fa630 100644
--- a/core/test/run-mem_region.c
+++ b/core/test/run-mem_region.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.
*/
diff --git a/core/test/run-mem_region_init.c b/core/test/run-mem_region_init.c
index beff3c2..e96282d 100644
--- a/core/test/run-mem_region_init.c
+++ b/core/test/run-mem_region_init.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.
*/
diff --git a/core/test/run-mem_region_next.c b/core/test/run-mem_region_next.c
index bab214f..07c4709 100644
--- a/core/test/run-mem_region_next.c
+++ b/core/test/run-mem_region_next.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-2018 IBM Corp.
*/
diff --git a/core/test/run-mem_region_release_unused.c b/core/test/run-mem_region_release_unused.c
index f22cf19..16090f8 100644
--- a/core/test/run-mem_region_release_unused.c
+++ b/core/test/run-mem_region_release_unused.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.
*/
diff --git a/core/test/run-mem_region_release_unused_noalloc.c b/core/test/run-mem_region_release_unused_noalloc.c
index 5c4b1dd..2ebf966 100644
--- a/core/test/run-mem_region_release_unused_noalloc.c
+++ b/core/test/run-mem_region_release_unused_noalloc.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.
*/
diff --git a/core/test/run-mem_region_reservations.c b/core/test/run-mem_region_reservations.c
index daf1083..0ead70a 100644
--- a/core/test/run-mem_region_reservations.c
+++ b/core/test/run-mem_region_reservations.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.
*/
diff --git a/core/test/run-msg.c b/core/test/run-msg.c
index 7314ea6..3659a12 100644
--- a/core/test/run-msg.c
+++ b/core/test/run-msg.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.
*/
diff --git a/core/test/run-nvram-format.c b/core/test/run-nvram-format.c
index 8f2e33a..ba286be 100644
--- a/core/test/run-nvram-format.c
+++ b/core/test/run-nvram-format.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.
*/
diff --git a/core/test/run-pci-quirk.c b/core/test/run-pci-quirk.c
index 95a1aa7..fd4d95c 100644
--- a/core/test/run-pci-quirk.c
+++ b/core/test/run-pci-quirk.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 IBM Corp
*/
diff --git a/core/test/run-pel.c b/core/test/run-pel.c
index 17f033e..812c899 100644
--- a/core/test/run-pel.c
+++ b/core/test/run-pel.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
/*
* Test for our PEL record generation. Currently this doesn't actually
* test that the records we generate are correct, but it at least lets
diff --git a/core/test/run-pool.c b/core/test/run-pool.c
index 929f5ab..e1c3843 100644
--- a/core/test/run-pool.c
+++ b/core/test/run-pool.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 IBM Corp
*/
diff --git a/core/test/run-time-utils.c b/core/test/run-time-utils.c
index 1b64e5a..04723dd 100644
--- a/core/test/run-time-utils.c
+++ b/core/test/run-time-utils.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-2017 IBM Corp.
*/
diff --git a/core/test/run-timebase.c b/core/test/run-timebase.c
index 264ebdf..a613609 100644
--- a/core/test/run-timebase.c
+++ b/core/test/run-timebase.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.
*/
diff --git a/core/test/run-timer.c b/core/test/run-timer.c
index 415188c..fef5648 100644
--- a/core/test/run-timer.c
+++ b/core/test/run-timer.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-2018 IBM Corp
*/
diff --git a/core/test/run-trace.c b/core/test/run-trace.c
index 9b2048c..b268276 100644
--- a/core/test/run-trace.c
+++ b/core/test/run-trace.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.
*/
diff --git a/core/test/stubs.c b/core/test/stubs.c
index 2c29927..0e97af2 100644
--- a/core/test/stubs.c
+++ b/core/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
/*
* Copyright 2013-2019 IBM Corp
*/
diff --git a/core/time-utils.c b/core/time-utils.c
index 97ca962..e948654 100644
--- a/core/time-utils.c
+++ b/core/time-utils.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
/*
* Converts an OPAL formatted datetime into a struct tm. We ignore microseconds
* as Linux doesn't use them anyway.
diff --git a/core/timebase.c b/core/timebase.c
index 4cb0b51..451e371 100644
--- a/core/timebase.c
+++ b/core/timebase.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
/*
* Wait for things, by waiting for timebase to tick over
*
diff --git a/core/timer.c b/core/timer.c
index 5cf9069..652ffba 100644
--- a/core/timer.c
+++ b/core/timer.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
/*
* run something, but later.
*
diff --git a/core/trace.c b/core/trace.c
index 00d71cf..5a3ad49 100644
--- a/core/trace.c
+++ b/core/trace.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
/*
* Trace various things into in-memory buffers
*
diff --git a/core/utils.c b/core/utils.c
index 8fd63fc..0d2f5e8 100644
--- a/core/utils.c
+++ b/core/utils.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
/*
* Misc utility functions
*
diff --git a/core/vpd.c b/core/vpd.c
index eb9254a..20fe095 100644
--- a/core/vpd.c
+++ b/core/vpd.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
/*
* Parse Vital Product Data (VPD)
*
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.
*/
diff --git a/extract-gcov.c b/extract-gcov.c
index ececbc1..f1dec35 100644
--- a/extract-gcov.c
+++ b/extract-gcov.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-2018 IBM Corp. */
#define _DEFAULT_SOURCE
diff --git a/hdata/cpu-common.c b/hdata/cpu-common.c
index b229f64..e46f919 100644
--- a/hdata/cpu-common.c
+++ b/hdata/cpu-common.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. */
#include <skiboot.h>
diff --git a/hdata/fsp.c b/hdata/fsp.c
index d351f5a..18380e7 100644
--- a/hdata/fsp.c
+++ b/hdata/fsp.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 <device.h>
diff --git a/hdata/hdata.h b/hdata/hdata.h
index 580e5c7..cbc61c3 100644
--- a/hdata/hdata.h
+++ b/hdata/hdata.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 __HDATA_H
diff --git a/hdata/hdif.c b/hdata/hdif.c
index 2c26038..2dfa94c 100644
--- a/hdata/hdif.c
+++ b/hdata/hdif.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 "hdif.h"
diff --git a/hdata/hdif.h b/hdata/hdif.h
index b9d4391..52df0f1 100644
--- a/hdata/hdif.h
+++ b/hdata/hdif.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 __HDIF_H
diff --git a/hdata/hostservices.c b/hdata/hostservices.c
index 7fb5bac..9e53a86 100644
--- a/hdata/hostservices.c
+++ b/hdata/hostservices.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 <stdint.h>
diff --git a/hdata/i2c.c b/hdata/i2c.c
index b979f35..08645be 100644
--- a/hdata/i2c.c
+++ b/hdata/i2c.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-2019 IBM Corp. */
#include <device.h>
diff --git a/hdata/iohub.c b/hdata/iohub.c
index 35f4a74..fa3afbf 100644
--- a/hdata/iohub.c
+++ b/hdata/iohub.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. */
#include <skiboot.h>
diff --git a/hdata/memory.c b/hdata/memory.c
index 9c588ff..6d060f7 100644
--- a/hdata/memory.c
+++ b/hdata/memory.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. */
#include <cpu.h>
diff --git a/hdata/naca.c b/hdata/naca.c
index b215c39..9581bb6 100644
--- a/hdata/naca.c
+++ b/hdata/naca.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
#include <compiler.h>
#include <mem-map.h>
#include <types.h>
diff --git a/hdata/naca.h b/hdata/naca.h
index 1271b59..74e5a29 100644
--- a/hdata/naca.h
+++ b/hdata/naca.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 __NACA_H
diff --git a/hdata/pcia.c b/hdata/pcia.c
index 8e3b961..0b803e2 100644
--- a/hdata/pcia.c
+++ b/hdata/pcia.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. */
#include <skiboot.h>
diff --git a/hdata/slca.c b/hdata/slca.c
index a658af6..dd49335 100644
--- a/hdata/slca.c
+++ b/hdata/slca.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 <device.h>
diff --git a/hdata/spira.c b/hdata/spira.c
index 76c3d60..35d6109 100644
--- a/hdata/spira.c
+++ b/hdata/spira.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. */
#include <inttypes.h>
diff --git a/hdata/spira.h b/hdata/spira.h
index 8744d0a..ffe5394 100644
--- a/hdata/spira.h
+++ b/hdata/spira.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 __SPIRA_H
diff --git a/hdata/test/Makefile.check b/hdata/test/Makefile.check
index 4c579ae..b3cb7e3 100644
--- a/hdata/test/Makefile.check
+++ b/hdata/test/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-*-
HDATA_TEST := hdata/test/hdata_to_dt
diff --git a/hdata/test/dtdiff_wrap.sh b/hdata/test/dtdiff_wrap.sh
index a2c58fa..f92c944 100755
--- a/hdata/test/dtdiff_wrap.sh
+++ b/hdata/test/dtdiff_wrap.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
#
# Takes /dev/stdin as dtb, saves to file, does dtdiff
# Also runs parameter through a dts->dtb->dts conversion
diff --git a/hdata/test/hdata_to_dt.c b/hdata/test/hdata_to_dt.c
index 11b7a3a..49357cd 100644
--- a/hdata/test/hdata_to_dt.c
+++ b/hdata/test/hdata_to_dt.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
/*
* Given a hdata dump, output the device tree.
*
diff --git a/hdata/test/stubs.c b/hdata/test/stubs.c
index 107f948..f2cdd88 100644
--- a/hdata/test/stubs.c
+++ b/hdata/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
/* Copyright 2013-2019 IBM Corp. */
#include <stdlib.h>
diff --git a/hdata/tpmrel.c b/hdata/tpmrel.c
index 93a8b485e..8e36d3d 100644
--- a/hdata/tpmrel.c
+++ b/hdata/tpmrel.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. */
#ifndef pr_fmt
diff --git a/hdata/vpd-common.c b/hdata/vpd-common.c
index db6384b..c91fcca 100644
--- a/hdata/vpd-common.c
+++ b/hdata/vpd-common.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 <skiboot.h>
diff --git a/hw/ast-bmc/Makefile.inc b/hw/ast-bmc/Makefile.inc
index 1ab9627..e7ded0e 100644
--- a/hw/ast-bmc/Makefile.inc
+++ b/hw/ast-bmc/Makefile.inc
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: Apache-2.0
+# SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
SUBDIRS += hw/ast-bmc
AST_BMC_OBJS = ast-io.o ast-sf-ctrl.o
diff --git a/hw/ast-bmc/ast-io.c b/hw/ast-bmc/ast-io.c
index 171942a..f0f8c4c 100644
--- a/hw/ast-bmc/ast-io.c
+++ b/hw/ast-bmc/ast-io.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
/*
* Note about accesses to the AST2400 internal memory map:
*
diff --git a/hw/ast-bmc/ast-sf-ctrl.c b/hw/ast-bmc/ast-sf-ctrl.c
index f1814c4..03cc443 100644
--- a/hw/ast-bmc/ast-sf-ctrl.c
+++ b/hw/ast-bmc/ast-sf-ctrl.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 <stdint.h>
diff --git a/hw/bt.c b/hw/bt.c
index 2f3143f..cf967f8 100644
--- a/hw/bt.c
+++ b/hw/bt.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
/*
* Block Transfer, typically what IPMI goes over
*
diff --git a/hw/cache-p9.c b/hw/cache-p9.c
index 29640cf..fb5ce30 100644
--- a/hw/cache-p9.c
+++ b/hw/cache-p9.c
@@ -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/hw/capp.c b/hw/capp.c
index 269deb6..dde8c52 100644
--- a/hw/capp.c
+++ b/hw/capp.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
/*
* CAPP unit (i.e. CAPI)
*
diff --git a/hw/centaur.c b/hw/centaur.c
index 641f2f0..c79dd7f 100644
--- a/hw/centaur.c
+++ b/hw/centaur.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
/*
* Centaur memory buffer chip
*
diff --git a/hw/chiptod.c b/hw/chiptod.c
index f7e9225..f445fd4 100644
--- a/hw/chiptod.c
+++ b/hw/chiptod.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
/*
* Handle ChipTOD chip & configure core and CAPP timebases
*
diff --git a/hw/dio-p9.c b/hw/dio-p9.c
index 59c4873..5153f6e 100644
--- a/hw/dio-p9.c
+++ b/hw/dio-p9.c
@@ -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. */
#define pr_fmt(fmt) "DIO: " fmt
diff --git a/hw/fake-nvram.c b/hw/fake-nvram.c
index 6411400..44adde4 100644
--- a/hw/fake-nvram.c
+++ b/hw/fake-nvram.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 <skiboot.h>
diff --git a/hw/fake-rtc.c b/hw/fake-rtc.c
index fd2882d..3f08305 100644
--- a/hw/fake-rtc.c
+++ b/hw/fake-rtc.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 <skiboot.h>
diff --git a/hw/fsi-master.c b/hw/fsi-master.c
index 87d1b5f..410542a 100644
--- a/hw/fsi-master.c
+++ b/hw/fsi-master.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 <skiboot.h>
diff --git a/hw/fsp/fsp-attn.c b/hw/fsp/fsp-attn.c
index e121d8a..9d032d1 100644
--- a/hw/fsp/fsp-attn.c
+++ b/hw/fsp/fsp-attn.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
/*
* FSP ATTentioN support
*
diff --git a/hw/fsp/fsp-chiptod.c b/hw/fsp/fsp-chiptod.c
index fef98e0..e4ede3c 100644
--- a/hw/fsp/fsp-chiptod.c
+++ b/hw/fsp/fsp-chiptod.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
/*
* On some chiptod errors, ask the FSP for a new topology
*
diff --git a/hw/fsp/fsp-codeupdate.c b/hw/fsp/fsp-codeupdate.c
index 13aa357..3cd5b2b 100644
--- a/hw/fsp/fsp-codeupdate.c
+++ b/hw/fsp/fsp-codeupdate.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
/*
* Firmware code update for FSP systems
*
diff --git a/hw/fsp/fsp-codeupdate.h b/hw/fsp/fsp-codeupdate.h
index 0262c69..2b86619 100644
--- a/hw/fsp/fsp-codeupdate.h
+++ b/hw/fsp/fsp-codeupdate.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 __CODEUPDATE_H
diff --git a/hw/fsp/fsp-console.c b/hw/fsp/fsp-console.c
index 05feb71..dc23ac4 100644
--- a/hw/fsp/fsp-console.c
+++ b/hw/fsp/fsp-console.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
/*
* Flexible Service Processor (FSP) serial console handling code
*
diff --git a/hw/fsp/fsp-diag.c b/hw/fsp/fsp-diag.c
index 9d1a350..d9101f3 100644
--- a/hw/fsp/fsp-diag.c
+++ b/hw/fsp/fsp-diag.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
/*
* Code for handling FSP_MCLASS_DIAG messages (cmd 0xee)
* Receiving a high level ack timeout is likely indicative of a firmware bug
diff --git a/hw/fsp/fsp-dpo.c b/hw/fsp/fsp-dpo.c
index da83a93..af97501 100644
--- a/hw/fsp/fsp-dpo.c
+++ b/hw/fsp/fsp-dpo.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
/*
* FSP DPO (Delayed Power Off) event support
*
diff --git a/hw/fsp/fsp-dump.c b/hw/fsp/fsp-dump.c
index bf72438..5b5f1f0 100644
--- a/hw/fsp/fsp-dump.c
+++ b/hw/fsp/fsp-dump.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
/*
* Dump support:
* We get dump notification from different sources:
diff --git a/hw/fsp/fsp-elog-read.c b/hw/fsp/fsp-elog-read.c
index fb81320..bd23ffb 100644
--- a/hw/fsp/fsp-elog-read.c
+++ b/hw/fsp/fsp-elog-read.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
/*
* This code will enable retrieving of error log from FSP -> Sapphire in
* sequence.
diff --git a/hw/fsp/fsp-elog-write.c b/hw/fsp/fsp-elog-write.c
index 1776c96..7b26a18 100644
--- a/hw/fsp/fsp-elog-write.c
+++ b/hw/fsp/fsp-elog-write.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
/*
* This code will enable generation and pushing of error log from Sapphire
* to FSP.
diff --git a/hw/fsp/fsp-epow.c b/hw/fsp/fsp-epow.c
index 300a441..8869e91 100644
--- a/hw/fsp/fsp-epow.c
+++ b/hw/fsp/fsp-epow.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
/*
* FSP Environmental and Power Warnings (EPOW) support
*
diff --git a/hw/fsp/fsp-epow.h b/hw/fsp/fsp-epow.h
index 6a01de0..bc1df25 100644
--- a/hw/fsp/fsp-epow.h
+++ b/hw/fsp/fsp-epow.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
/*
* Handle FSP EPOW event notifications
*
diff --git a/hw/fsp/fsp-ipmi.c b/hw/fsp/fsp-ipmi.c
index f62f18c..e368c28 100644
--- a/hw/fsp/fsp-ipmi.c
+++ b/hw/fsp/fsp-ipmi.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
/*
* Conduit for IPMI messages to/from FSP
*
diff --git a/hw/fsp/fsp-leds.c b/hw/fsp/fsp-leds.c
index 58dfab3..5a552ab 100644
--- a/hw/fsp/fsp-leds.c
+++ b/hw/fsp/fsp-leds.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
/*
* LED location code and indicator handling
*
diff --git a/hw/fsp/fsp-mem-err.c b/hw/fsp/fsp-mem-err.c
index 2745006..2e3e654 100644
--- a/hw/fsp/fsp-mem-err.c
+++ b/hw/fsp/fsp-mem-err.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
/*
* Sometimes some memory needs to go and sit in the naughty corner
*
diff --git a/hw/fsp/fsp-nvram.c b/hw/fsp/fsp-nvram.c
index f5c6d66..80c8424 100644
--- a/hw/fsp/fsp-nvram.c
+++ b/hw/fsp/fsp-nvram.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
/*
* Read/Write NVRAM from/to FSP
*
diff --git a/hw/fsp/fsp-occ.c b/hw/fsp/fsp-occ.c
index 03ddc2c..3081f89 100644
--- a/hw/fsp/fsp-occ.c
+++ b/hw/fsp/fsp-occ.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
/*
* FSP/OCC interactions
*
diff --git a/hw/fsp/fsp-op-panel.c b/hw/fsp/fsp-op-panel.c
index 9bd0247..a8ac00b 100644
--- a/hw/fsp/fsp-op-panel.c
+++ b/hw/fsp/fsp-op-panel.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
/*
* Small LCD screen on the front of FSP machines
*
diff --git a/hw/fsp/fsp-psi.c b/hw/fsp/fsp-psi.c
index 5db6a99..aeaf47e 100644
--- a/hw/fsp/fsp-psi.c
+++ b/hw/fsp/fsp-psi.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. */
#include <io.h>
diff --git a/hw/fsp/fsp-rtc.c b/hw/fsp/fsp-rtc.c
index 4e5a809..237560a 100644
--- a/hw/fsp/fsp-rtc.c
+++ b/hw/fsp/fsp-rtc.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
/*
* Real Time Clock (RTC) attached to FSP
*
diff --git a/hw/fsp/fsp-sensor.c b/hw/fsp/fsp-sensor.c
index 5cff258..ffcd004 100644
--- a/hw/fsp/fsp-sensor.c
+++ b/hw/fsp/fsp-sensor.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
/*
* This code will enable the 'powernv' to retrieve sensor related data from FSP
* using SPCN passthru mailbox commands.
diff --git a/hw/fsp/fsp-surveillance.c b/hw/fsp/fsp-surveillance.c
index 0b7cc21..84e6878 100644
--- a/hw/fsp/fsp-surveillance.c
+++ b/hw/fsp/fsp-surveillance.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
/*
* We don't want to go on the cart!
*
diff --git a/hw/fsp/fsp-sysdump.c b/hw/fsp/fsp-sysdump.c
index f2777be..cd87440 100644
--- a/hw/fsp/fsp-sysdump.c
+++ b/hw/fsp/fsp-sysdump.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
/*
* Sapphire dump design:
* - During initialization we setup Memory Dump Source Table (MDST) table
diff --git a/hw/fsp/fsp-sysparam.c b/hw/fsp/fsp-sysparam.c
index 2b8446c..adb424e 100644
--- a/hw/fsp/fsp-sysparam.c
+++ b/hw/fsp/fsp-sysparam.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
/*
* There's some system level parameters that aren't over IPMI or NVRAM
* but that the FSP exposes through this interface.
diff --git a/hw/fsp/fsp.c b/hw/fsp/fsp.c
index 392cf5d..6f06bfd 100644
--- a/hw/fsp/fsp.c
+++ b/hw/fsp/fsp.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
/*
* Base FSP (Flexible Service Processor) Support
*
diff --git a/hw/homer.c b/hw/homer.c
index 96a01fd..c5dbd58 100644
--- a/hw/homer.c
+++ b/hw/homer.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. */
#include <skiboot.h>
diff --git a/hw/imc.c b/hw/imc.c
index 3a5382c..08d9401 100644
--- a/hw/imc.c
+++ b/hw/imc.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
/*
* In-Memory Counters (IMC)
* Sometimes called IMA, but that's also a different thing.
diff --git a/hw/ipmi/Makefile.inc b/hw/ipmi/Makefile.inc
index 250dfc8..c6b36a2 100644
--- a/hw/ipmi/Makefile.inc
+++ b/hw/ipmi/Makefile.inc
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: Apache-2.0
+# SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
SUBDIRS += hw/ipmi
diff --git a/hw/ipmi/ipmi-attn.c b/hw/ipmi/ipmi-attn.c
index 93ede05..280b252 100644
--- a/hw/ipmi/ipmi-attn.c
+++ b/hw/ipmi/ipmi-attn.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
/*
* When everything is terrible, tell the FSP as much as possible as to why
*
diff --git a/hw/ipmi/ipmi-fru.c b/hw/ipmi/ipmi-fru.c
index 10f4325..da866ad 100644
--- a/hw/ipmi/ipmi-fru.c
+++ b/hw/ipmi/ipmi-fru.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
/*
* Fill out firmware related FRUs (Field Replaceable Units)
*
diff --git a/hw/ipmi/ipmi-info.c b/hw/ipmi/ipmi-info.c
index b078e19..d93b59d 100644
--- a/hw/ipmi/ipmi-info.c
+++ b/hw/ipmi/ipmi-info.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
/*
* Various bits of info retreived over IPMI
*
diff --git a/hw/ipmi/ipmi-power.c b/hw/ipmi/ipmi-power.c
index 1ff9dda..8101a85 100644
--- a/hw/ipmi/ipmi-power.c
+++ b/hw/ipmi/ipmi-power.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
/*
* Power as in electricity, not POWER as in POWER
*
diff --git a/hw/ipmi/ipmi-rtc.c b/hw/ipmi/ipmi-rtc.c
index ad98f21..52da294 100644
--- a/hw/ipmi/ipmi-rtc.c
+++ b/hw/ipmi/ipmi-rtc.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
/*
* Talk to a Real Time Clock (RTC) over IPMI
*
diff --git a/hw/ipmi/ipmi-sel.c b/hw/ipmi/ipmi-sel.c
index bfce043..215b8ba 100644
--- a/hw/ipmi/ipmi-sel.c
+++ b/hw/ipmi/ipmi-sel.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. */
#define pr_fmt(fmt) "IPMI: " fmt
diff --git a/hw/ipmi/ipmi-sensor.c b/hw/ipmi/ipmi-sensor.c
index 68af5bd..857b789 100644
--- a/hw/ipmi/ipmi-sensor.c
+++ b/hw/ipmi/ipmi-sensor.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 <device.h>
diff --git a/hw/ipmi/test/run-fru.c b/hw/ipmi/test/run-fru.c
index 1951541..fa79c98 100644
--- a/hw/ipmi/test/run-fru.c
+++ b/hw/ipmi/test/run-fru.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. */
#include <unistd.h>
diff --git a/hw/lpc-mbox.c b/hw/lpc-mbox.c
index 71fc252..f5bb97e 100644
--- a/hw/lpc-mbox.c
+++ b/hw/lpc-mbox.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
/*
* LPC MBOX
*
diff --git a/hw/lpc-port80h.c b/hw/lpc-port80h.c
index b373af7..0d1fee9 100644
--- a/hw/lpc-port80h.c
+++ b/hw/lpc-port80h.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
/*
* op_display() but over the 1 byte LPC port 80h just like an original IBM PC
*
diff --git a/hw/lpc-rtc.c b/hw/lpc-rtc.c
index ba15941f..dc4a484 100644
--- a/hw/lpc-rtc.c
+++ b/hw/lpc-rtc.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
/*
* Real Time Clock hanging off LPC
*
diff --git a/hw/lpc-uart.c b/hw/lpc-uart.c
index b37e042..979a617 100644
--- a/hw/lpc-uart.c
+++ b/hw/lpc-uart.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
/*
* Serial port hanging off LPC
*
diff --git a/hw/lpc.c b/hw/lpc.c
index abf5497..c2a07a0 100644
--- a/hw/lpc.c
+++ b/hw/lpc.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
/*
* Low Pin Count (LPC) Bus.
*
diff --git a/hw/npu-hw-procedures.c b/hw/npu-hw-procedures.c
index 1c0cf1a..91bbb0f 100644
--- a/hw/npu-hw-procedures.c
+++ b/hw/npu-hw-procedures.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
/*
* NPU (NVLink1, POWER8NVL) Hardware Procedures
*
diff --git a/hw/npu-opal.c b/hw/npu-opal.c
index 91ecfc2..412ea46 100644
--- a/hw/npu-opal.c
+++ b/hw/npu-opal.c
@@ -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/hw/npu.c b/hw/npu.c
index cf971bd..9266f36 100644
--- a/hw/npu.c
+++ b/hw/npu.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
/*
* NVLink1, supported by the NPU (POWER8)
*
diff --git a/hw/npu2-common.c b/hw/npu2-common.c
index 4e5b104..3bc9bce 100644
--- a/hw/npu2-common.c
+++ b/hw/npu2-common.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. */
#include <skiboot.h>
diff --git a/hw/npu2-hw-procedures.c b/hw/npu2-hw-procedures.c
index 1f82b11..6236380 100644
--- a/hw/npu2-hw-procedures.c
+++ b/hw/npu2-hw-procedures.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
/*
* NPU2 (POWER9) Hardware Procedures
*
diff --git a/hw/npu2-opencapi.c b/hw/npu2-opencapi.c
index f0d245c..b03aad3 100644
--- a/hw/npu2-opencapi.c
+++ b/hw/npu2-opencapi.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
/*
* Support for OpenCAPI on POWER9 NPUs
*
diff --git a/hw/npu2.c b/hw/npu2.c
index be442ba..1624d52 100644
--- a/hw/npu2.c
+++ b/hw/npu2.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
/*
* NPU - NVlink and OpenCAPI
*
diff --git a/hw/npu3-hw-procedures.c b/hw/npu3-hw-procedures.c
index 86067a0..098e6e4 100644
--- a/hw/npu3-hw-procedures.c
+++ b/hw/npu3-hw-procedures.c
@@ -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/hw/npu3-nvlink.c b/hw/npu3-nvlink.c
index 4eb704b..42054cf 100644
--- a/hw/npu3-nvlink.c
+++ b/hw/npu3-nvlink.c
@@ -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/hw/npu3.c b/hw/npu3.c
index 65f505a..0346137 100644
--- a/hw/npu3.c
+++ b/hw/npu3.c
@@ -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/hw/nx-842.c b/hw/nx-842.c
index 933f2df..0cb87dc 100644
--- a/hw/nx-842.c
+++ b/hw/nx-842.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
/*
* NX unit 842 compression accellerator
*
diff --git a/hw/nx-compress.c b/hw/nx-compress.c
index 84b5a59..b230286 100644
--- a/hw/nx-compress.c
+++ b/hw/nx-compress.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
/*
* NX has 842 and GZIP (P9) accellerators
*
diff --git a/hw/nx-crypto.c b/hw/nx-crypto.c
index aa317de..8b8ff5e 100644
--- a/hw/nx-crypto.c
+++ b/hw/nx-crypto.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
/*
* NX Cryptographic accellerators
*
diff --git a/hw/nx-gzip.c b/hw/nx-gzip.c
index a259a09..9bc491e 100644
--- a/hw/nx-gzip.c
+++ b/hw/nx-gzip.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
/*
* NX GZIP (p9) accellerator support
*
diff --git a/hw/nx-rng.c b/hw/nx-rng.c
index 24038c8..274b332 100644
--- a/hw/nx-rng.c
+++ b/hw/nx-rng.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
/*
* NX Hardware Random Number Generator
*
diff --git a/hw/nx.c b/hw/nx.c
index c36bdab..1220480 100644
--- a/hw/nx.c
+++ b/hw/nx.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
/*
* NX Accellerator unit support
*
diff --git a/hw/occ-sensor.c b/hw/occ-sensor.c
index e9ac5df..524d00f 100644
--- a/hw/occ-sensor.c
+++ b/hw/occ-sensor.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
/*
* OCC (On Chip Controller) exports a bunch of sensors
*
diff --git a/hw/occ.c b/hw/occ.c
index 3542e44..76c7736 100644
--- a/hw/occ.c
+++ b/hw/occ.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
/*
* Interface with the On Chip Controller,
* which enforces power and thermal management
diff --git a/hw/p8-i2c.c b/hw/p8-i2c.c
index cb13442..eb9bbf5 100644
--- a/hw/p8-i2c.c
+++ b/hw/p8-i2c.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
/*
* P8 i2c master
*
diff --git a/hw/phb3.c b/hw/phb3.c
index aa439ee..8af6b61 100644
--- a/hw/phb3.c
+++ b/hw/phb3.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
/*
* PHB3: PCI Host Bridge 3, in POWER8
*
diff --git a/hw/phys-map.c b/hw/phys-map.c
index fd79b3c..ad04173 100644
--- a/hw/phys-map.c
+++ b/hw/phys-map.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
/*
* Physical memory map
*
diff --git a/hw/prd.c b/hw/prd.c
index a119b92..b9d04c7 100644
--- a/hw/prd.c
+++ b/hw/prd.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
/*
* PRD: Processor Runtime Diagnostics
*
diff --git a/hw/psi.c b/hw/psi.c
index eede4e5..63fcb25 100644
--- a/hw/psi.c
+++ b/hw/psi.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
/*
* Service Processor serial console handling code
*
diff --git a/hw/sbe-p8.c b/hw/sbe-p8.c
index a26883c..73fa5f1 100644
--- a/hw/sbe-p8.c
+++ b/hw/sbe-p8.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
/*
* POWER8 Self Boot Engine (SLW - SLeep/Winkle)
*
diff --git a/hw/sbe-p9.c b/hw/sbe-p9.c
index 53f378e..31f8cb9 100644
--- a/hw/sbe-p9.c
+++ b/hw/sbe-p9.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
/*
*
* P9 OPAL - SBE communication driver
diff --git a/hw/sfc-ctrl.c b/hw/sfc-ctrl.c
index d66be09..34b5b8e 100644
--- a/hw/sfc-ctrl.c
+++ b/hw/sfc-ctrl.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-2014 IBM Corp. */
#include <stdint.h>
diff --git a/hw/slw.c b/hw/slw.c
index 2f76197..beb129a 100644
--- a/hw/slw.c
+++ b/hw/slw.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
/*
* Everything to do with deep power saving (stop) states
* SLeep/Winkle, Handle ChipTOD chip & configure core timebases
diff --git a/hw/test/phys-map-test.c b/hw/test/phys-map-test.c
index cae7f91..2aabdb8 100644
--- a/hw/test/phys-map-test.c
+++ b/hw/test/phys-map-test.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
/*
* Physical memory map test
*
diff --git a/hw/test/run-port80h.c b/hw/test/run-port80h.c
index a45ea46..860a424 100644
--- a/hw/test/run-port80h.c
+++ b/hw/test/run-port80h.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
/*
* Test result of our LPC port 80h boot progress code
*
diff --git a/hw/vas.c b/hw/vas.c
index aebfebd..c70094b 100644
--- a/hw/vas.c
+++ b/hw/vas.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 <skiboot.h>
diff --git a/hw/xive.c b/hw/xive.c
index 41575da..9a36f1a 100644
--- a/hw/xive.c
+++ b/hw/xive.c
@@ -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/hw/xscom.c b/hw/xscom.c
index a851695..88e22da 100644
--- a/hw/xscom.c
+++ b/hw/xscom.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
/*
* XSCOM driver
*
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
diff --git a/libc/string/memcpy_from_ci.c b/libc/string/memcpy_from_ci.c
index 89fcd5a..103853b 100644
--- a/libc/string/memcpy_from_ci.c
+++ b/libc/string/memcpy_from_ci.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-2016 IBM Corp
*/
diff --git a/libc/test/run-ctype-test.c b/libc/test/run-ctype-test.c
index fa094ff..d491b49 100644
--- a/libc/test/run-ctype-test.c
+++ b/libc/test/run-ctype-test.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.
*
diff --git a/libc/test/run-ctype.c b/libc/test/run-ctype.c
index 43ec47d..a43d371 100644
--- a/libc/test/run-ctype.c
+++ b/libc/test/run-ctype.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.
*/
diff --git a/libc/test/run-memops-test.c b/libc/test/run-memops-test.c
index 9f1a2c5..5be0d9a 100644
--- a/libc/test/run-memops-test.c
+++ b/libc/test/run-memops-test.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.
*
diff --git a/libc/test/run-memops.c b/libc/test/run-memops.c
index 22aec2d..a00c2fb 100644
--- a/libc/test/run-memops.c
+++ b/libc/test/run-memops.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.
*/
diff --git a/libc/test/run-snprintf-test.c b/libc/test/run-snprintf-test.c
index 06428d5..a6ad023 100644
--- a/libc/test/run-snprintf-test.c
+++ b/libc/test/run-snprintf-test.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.
*
diff --git a/libc/test/run-snprintf.c b/libc/test/run-snprintf.c
index d7313c0..946d446 100644
--- a/libc/test/run-snprintf.c
+++ b/libc/test/run-snprintf.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.
*/
diff --git a/libc/test/run-stdlib-test.c b/libc/test/run-stdlib-test.c
index 77b4bcc..f7d7137 100644
--- a/libc/test/run-stdlib-test.c
+++ b/libc/test/run-stdlib-test.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.
*
diff --git a/libc/test/run-stdlib.c b/libc/test/run-stdlib.c
index 814289c..1749208 100644
--- a/libc/test/run-stdlib.c
+++ b/libc/test/run-stdlib.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.
*/
diff --git a/libc/test/run-time.c b/libc/test/run-time.c
index 138803d..95e83e5 100644
--- a/libc/test/run-time.c
+++ b/libc/test/run-time.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-2015 IBM Corp.
*/
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>
diff --git a/libstb/container-utils.c b/libstb/container-utils.c
index 919245a..625921e 100644
--- a/libstb/container-utils.c
+++ b/libstb/container-utils.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 "config.h"
diff --git a/libstb/container-utils.h b/libstb/container-utils.h
index d972f40..bb73145 100644
--- a/libstb/container-utils.h
+++ b/libstb/container-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 2017 IBM Corp. */
#ifndef _CREATE_CONTAINER_UTILS_H
diff --git a/libstb/container.c b/libstb/container.c
index 58fd18f..eca54cf 100644
--- a/libstb/container.c
+++ b/libstb/container.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-2016 IBM Corp. */
#include <skiboot.h>
diff --git a/libstb/container.h b/libstb/container.h
index c21943f..f0b54fc 100644
--- a/libstb/container.h
+++ b/libstb/container.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 __STB_CONTAINER_H
diff --git a/libstb/create-container.c b/libstb/create-container.c
index 689a5d5..2ca9a23 100644
--- a/libstb/create-container.c
+++ b/libstb/create-container.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 <config.h>
diff --git a/libstb/cvc.c b/libstb/cvc.c
index 356d36b..663e539 100644
--- a/libstb/cvc.c
+++ b/libstb/cvc.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. */
#ifndef pr_fmt
diff --git a/libstb/cvc.h b/libstb/cvc.h
index ef105f7..992cebf 100644
--- a/libstb/cvc.h
+++ b/libstb/cvc.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 __CVC_H
diff --git a/libstb/drivers/tpm_i2c_interface.c b/libstb/drivers/tpm_i2c_interface.c
index 7b45841..84cbab5 100644
--- a/libstb/drivers/tpm_i2c_interface.c
+++ b/libstb/drivers/tpm_i2c_interface.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 <skiboot.h>
diff --git a/libstb/drivers/tpm_i2c_interface.h b/libstb/drivers/tpm_i2c_interface.h
index 401cb08..514d8f8 100644
--- a/libstb/drivers/tpm_i2c_interface.h
+++ b/libstb/drivers/tpm_i2c_interface.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 __TPM_I2C_H
diff --git a/libstb/drivers/tpm_i2c_nuvoton.c b/libstb/drivers/tpm_i2c_nuvoton.c
index 2348e82..9a26fca 100644
--- a/libstb/drivers/tpm_i2c_nuvoton.c
+++ b/libstb/drivers/tpm_i2c_nuvoton.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 <timebase.h>
diff --git a/libstb/drivers/tpm_i2c_nuvoton.h b/libstb/drivers/tpm_i2c_nuvoton.h
index 2851f05..53cf1e1 100644
--- a/libstb/drivers/tpm_i2c_nuvoton.h
+++ b/libstb/drivers/tpm_i2c_nuvoton.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 __TPM_I2C_NUVOTON_H
diff --git a/libstb/print-container.c b/libstb/print-container.c
index b275715..d2f2e3f 100644
--- a/libstb/print-container.c
+++ b/libstb/print-container.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 <config.h>
diff --git a/libstb/secureboot.c b/libstb/secureboot.c
index 022e2aa..c869721 100644
--- a/libstb/secureboot.c
+++ b/libstb/secureboot.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. */
#ifndef pr_fmt
diff --git a/libstb/secureboot.h b/libstb/secureboot.h
index 426483f..0792dd5 100644
--- a/libstb/secureboot.h
+++ b/libstb/secureboot.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 __SECUREBOOT_H
diff --git a/libstb/secvar/Makefile.inc b/libstb/secvar/Makefile.inc
index f4b196d..b40bfc2 100644
--- a/libstb/secvar/Makefile.inc
+++ b/libstb/secvar/Makefile.inc
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: Apache-2.0
+# SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
# -*-Makefile-*-
SECVAR_DIR = $(SRC)/libstb/secvar
diff --git a/libstb/secvar/backend/Makefile.inc b/libstb/secvar/backend/Makefile.inc
index cc1a49f..6f491a6 100644
--- a/libstb/secvar/backend/Makefile.inc
+++ b/libstb/secvar/backend/Makefile.inc
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: Apache-2.0
+# SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
# -*-Makefile-*-
SECVAR_BACKEND_DIR = libstb/secvar/backend
diff --git a/libstb/secvar/secvar.h b/libstb/secvar/secvar.h
index 771ff64..a0cafbb 100644
--- a/libstb/secvar/secvar.h
+++ b/libstb/secvar/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 2013-2019 IBM Corp. */
#ifndef _SECVAR_H_
diff --git a/libstb/secvar/secvar_api.c b/libstb/secvar/secvar_api.c
index 349e8be..62c3250 100644
--- a/libstb/secvar/secvar_api.c
+++ b/libstb/secvar/secvar_api.c
@@ -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 pr_fmt
diff --git a/libstb/secvar/secvar_devtree.c b/libstb/secvar/secvar_devtree.c
index 4bff139..998093f 100644
--- a/libstb/secvar/secvar_devtree.c
+++ b/libstb/secvar/secvar_devtree.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. */
#include <device.h>
diff --git a/libstb/secvar/secvar_devtree.h b/libstb/secvar/secvar_devtree.h
index d383884..c1c923d 100644
--- a/libstb/secvar/secvar_devtree.h
+++ b/libstb/secvar/secvar_devtree.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 _SECVAR_DEVTREE_H_
diff --git a/libstb/secvar/secvar_main.c b/libstb/secvar/secvar_main.c
index 27e36ad..b40dd64 100644
--- a/libstb/secvar/secvar_main.c
+++ b/libstb/secvar/secvar_main.c
@@ -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 pr_fmt
diff --git a/libstb/secvar/secvar_util.c b/libstb/secvar/secvar_util.c
index a143d0b..2005de5 100644
--- a/libstb/secvar/secvar_util.c
+++ b/libstb/secvar/secvar_util.c
@@ -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 pr_fmt
diff --git a/libstb/secvar/storage/Makefile.inc b/libstb/secvar/storage/Makefile.inc
index b7a821e..3fd9543 100644
--- a/libstb/secvar/storage/Makefile.inc
+++ b/libstb/secvar/storage/Makefile.inc
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: Apache-2.0
+# SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
# -*-Makefile-*-
SECVAR_STORAGE_DIR = libstb/secvar/storage
diff --git a/libstb/secvar/test/Makefile.check b/libstb/secvar/test/Makefile.check
index 6dc24f1..b41eaf4 100644
--- a/libstb/secvar/test/Makefile.check
+++ b/libstb/secvar/test/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-*-
SECVAR_TEST_DIR = libstb/secvar/test
#SUBDIRS = $(SECVAR_TEST_DIR)
diff --git a/libstb/secvar/test/secvar-test-enqueue.c b/libstb/secvar/test/secvar-test-enqueue.c
index ba37ddb..61c22d1 100644
--- a/libstb/secvar/test/secvar-test-enqueue.c
+++ b/libstb/secvar/test/secvar-test-enqueue.c
@@ -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. */
#include "secvar_api_test.c"
diff --git a/libstb/secvar/test/secvar-test-getvar.c b/libstb/secvar/test/secvar-test-getvar.c
index da37cd2..53885ea 100644
--- a/libstb/secvar/test/secvar-test-getvar.c
+++ b/libstb/secvar/test/secvar-test-getvar.c
@@ -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. */
#include "secvar_api_test.c"
diff --git a/libstb/secvar/test/secvar-test-nextvar.c b/libstb/secvar/test/secvar-test-nextvar.c
index 0d46858..0b3dea4 100644
--- a/libstb/secvar/test/secvar-test-nextvar.c
+++ b/libstb/secvar/test/secvar-test-nextvar.c
@@ -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. */
#include "secvar_api_test.c"
diff --git a/libstb/secvar/test/secvar-test-void.c b/libstb/secvar/test/secvar-test-void.c
index b45e8cb..4411ab3 100644
--- a/libstb/secvar/test/secvar-test-void.c
+++ b/libstb/secvar/test/secvar-test-void.c
@@ -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. */
#include "secvar_api_test.c"
diff --git a/libstb/secvar/test/secvar_api_test.c b/libstb/secvar/test/secvar_api_test.c
index 2e959c9..8beb1b6 100644
--- a/libstb/secvar/test/secvar_api_test.c
+++ b/libstb/secvar/test/secvar_api_test.c
@@ -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. */
#include "secvar_common_test.c"
diff --git a/libstb/secvar/test/secvar_common_test.c b/libstb/secvar/test/secvar_common_test.c
index fbc2314..3bab5cf 100644
--- a/libstb/secvar/test/secvar_common_test.c
+++ b/libstb/secvar/test/secvar_common_test.c
@@ -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. */
#define SECBOOT_FILE "secboot.img"
diff --git a/libstb/status_codes.h b/libstb/status_codes.h
index 0f5e1a5..86ee9dd 100644
--- a/libstb/status_codes.h
+++ b/libstb/status_codes.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 __STB_STATUS_CODES_H
diff --git a/libstb/test/run-stb-container.c b/libstb/test/run-stb-container.c
index 8da8e6f..2f07875 100644
--- a/libstb/test/run-stb-container.c
+++ b/libstb/test/run-stb-container.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
/* Copyright 2016 IBM Corp. */
#include <config.h>
diff --git a/libstb/tpm_chip.c b/libstb/tpm_chip.c
index 51ba1be..12ba47f 100644
--- a/libstb/tpm_chip.c
+++ b/libstb/tpm_chip.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. */
#ifndef pr_fmt
diff --git a/libstb/tpm_chip.h b/libstb/tpm_chip.h
index dede420..b2459e4 100644
--- a/libstb/tpm_chip.h
+++ b/libstb/tpm_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-2018 IBM Corp. */
#ifndef __TPM_H
diff --git a/libstb/trustedboot.c b/libstb/trustedboot.c
index 3f977de..413862e 100644
--- a/libstb/trustedboot.c
+++ b/libstb/trustedboot.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. */
#ifndef pr_fmt
diff --git a/libstb/trustedboot.h b/libstb/trustedboot.h
index 17478c1..3b39ee3 100644
--- a/libstb/trustedboot.h
+++ b/libstb/trustedboot.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 __TRUSTEDBOOT_H
diff --git a/make_offsets.sh b/make_offsets.sh
index 0ce3473..1643f9d 100755
--- a/make_offsets.sh
+++ b/make_offsets.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 2012-2019 IBM Corp
cat <<EOF
diff --git a/platforms/astbmc/astbmc.h b/platforms/astbmc/astbmc.h
index a3b4a07..86631bc 100644
--- a/platforms/astbmc/astbmc.h
+++ b/platforms/astbmc/astbmc.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 __ASTBMC_H
diff --git a/platforms/astbmc/common.c b/platforms/astbmc/common.c
index de837f3..d96e070 100644
--- a/platforms/astbmc/common.c
+++ b/platforms/astbmc/common.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. */
#include <skiboot.h>
diff --git a/platforms/astbmc/firestone.c b/platforms/astbmc/firestone.c
index 5e30c25..ae5603e 100644
--- a/platforms/astbmc/firestone.c
+++ b/platforms/astbmc/firestone.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. */
#include <skiboot.h>
diff --git a/platforms/astbmc/habanero.c b/platforms/astbmc/habanero.c
index 0cec64f..b98ff89 100644
--- a/platforms/astbmc/habanero.c
+++ b/platforms/astbmc/habanero.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. */
#include <skiboot.h>
diff --git a/platforms/astbmc/palmetto.c b/platforms/astbmc/palmetto.c
index 8cfd48a..546d511 100644
--- a/platforms/astbmc/palmetto.c
+++ b/platforms/astbmc/palmetto.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. */
#include <skiboot.h>
diff --git a/platforms/astbmc/pnor.c b/platforms/astbmc/pnor.c
index ce0de07..64f2249 100644
--- a/platforms/astbmc/pnor.c
+++ b/platforms/astbmc/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-2019 IBM Corp. */
#include <skiboot.h>
diff --git a/platforms/astbmc/slots.c b/platforms/astbmc/slots.c
index 2f8cf0c..622483a 100644
--- a/platforms/astbmc/slots.c
+++ b/platforms/astbmc/slots.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-2018 IBM Corp. */
#include <skiboot.h>
diff --git a/platforms/astbmc/swift.c b/platforms/astbmc/swift.c
index a1040fb..991a79d 100644
--- a/platforms/astbmc/swift.c
+++ b/platforms/astbmc/swift.c
@@ -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/platforms/astbmc/witherspoon.c b/platforms/astbmc/witherspoon.c
index 0d8d33c..6387af4 100644
--- a/platforms/astbmc/witherspoon.c
+++ b/platforms/astbmc/witherspoon.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-2019 IBM Corp. */
#include <skiboot.h>
diff --git a/platforms/astbmc/zaius.c b/platforms/astbmc/zaius.c
index 36dee63..f3807a0 100644
--- a/platforms/astbmc/zaius.c
+++ b/platforms/astbmc/zaius.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-2019 IBM Corp. */
#include <skiboot.h>
diff --git a/platforms/ibm-fsp/common.c b/platforms/ibm-fsp/common.c
index 10bbff5..4a723b2 100644
--- a/platforms/ibm-fsp/common.c
+++ b/platforms/ibm-fsp/common.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. */
diff --git a/platforms/ibm-fsp/firenze-pci.c b/platforms/ibm-fsp/firenze-pci.c
index 12e0e98..5fbbc2f 100644
--- a/platforms/ibm-fsp/firenze-pci.c
+++ b/platforms/ibm-fsp/firenze-pci.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 pr_fmt(fmt) "FIRENZE-PCI: " fmt
diff --git a/platforms/ibm-fsp/firenze.c b/platforms/ibm-fsp/firenze.c
index f438904..887a9c0 100644
--- a/platforms/ibm-fsp/firenze.c
+++ b/platforms/ibm-fsp/firenze.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. */
#include <skiboot.h>
diff --git a/platforms/ibm-fsp/fsp-vpd.c b/platforms/ibm-fsp/fsp-vpd.c
index 5577796..52d2c82 100644
--- a/platforms/ibm-fsp/fsp-vpd.c
+++ b/platforms/ibm-fsp/fsp-vpd.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. */
#include <skiboot.h>
diff --git a/platforms/ibm-fsp/hostservices.c b/platforms/ibm-fsp/hostservices.c
index d61d583..81fd6bd 100644
--- a/platforms/ibm-fsp/hostservices.c
+++ b/platforms/ibm-fsp/hostservices.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. */
#include <stdint.h>
diff --git a/platforms/ibm-fsp/ibm-fsp.h b/platforms/ibm-fsp/ibm-fsp.h
index 145ac0a..c218669 100644
--- a/platforms/ibm-fsp/ibm-fsp.h
+++ b/platforms/ibm-fsp/ibm-fsp.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 __IBM_FSP_COMMON_H
diff --git a/platforms/ibm-fsp/lxvpd.c b/platforms/ibm-fsp/lxvpd.c
index a40308b..9b34a23 100644
--- a/platforms/ibm-fsp/lxvpd.c
+++ b/platforms/ibm-fsp/lxvpd.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 pr_fmt(fmt) "LXVPD: " fmt
diff --git a/platforms/ibm-fsp/lxvpd.h b/platforms/ibm-fsp/lxvpd.h
index d0fddd2..4b771f3 100644
--- a/platforms/ibm-fsp/lxvpd.h
+++ b/platforms/ibm-fsp/lxvpd.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 __LXVPD_H
diff --git a/platforms/ibm-fsp/zz.c b/platforms/ibm-fsp/zz.c
index 14a54d6..1513b62 100644
--- a/platforms/ibm-fsp/zz.c
+++ b/platforms/ibm-fsp/zz.c
@@ -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. */
#include <skiboot.h>
diff --git a/platforms/mambo/console.c b/platforms/mambo/console.c
index 4a601fa..6d5b20b 100644
--- a/platforms/mambo/console.c
+++ b/platforms/mambo/console.c
@@ -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. */
#include <skiboot.h>
diff --git a/platforms/mambo/mambo.c b/platforms/mambo/mambo.c
index aa1bf83..0c96100 100644
--- a/platforms/mambo/mambo.c
+++ b/platforms/mambo/mambo.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-2017 IBM Corp. */
#include <skiboot.h>
diff --git a/platforms/mambo/mambo.h b/platforms/mambo/mambo.h
index 1bd5278..0b3bb60 100644
--- a/platforms/mambo/mambo.h
+++ b/platforms/mambo/mambo.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 IBM Corp. */
#ifndef __MAMBO_H__
diff --git a/platforms/qemu/qemu.c b/platforms/qemu/qemu.c
index cbd6c27..96153e8 100644
--- a/platforms/qemu/qemu.c
+++ b/platforms/qemu/qemu.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. */
#include <skiboot.h>
diff --git a/skiboot.lds.S b/skiboot.lds.S
index 1822334..3431f1f 100644
--- a/skiboot.lds.S
+++ b/skiboot.lds.S
@@ -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/test/dt_common.c b/test/dt_common.c
index 0551a4a..98032c4 100644
--- a/test/dt_common.c
+++ b/test/dt_common.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-2017 IBM Corp. */
#include <skiboot.h>
diff --git a/test/hello_world/hello_kernel/hello_kernel.S b/test/hello_world/hello_kernel/hello_kernel.S
index 49fb775..4f774c1 100644
--- a/test/hello_world/hello_kernel/hello_kernel.S
+++ b/test/hello_world/hello_kernel/hello_kernel.S
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
/*
* hello_kernel.S!
*
diff --git a/test/sreset_world/sreset_kernel/sreset_kernel.S b/test/sreset_world/sreset_kernel/sreset_kernel.S
index 1e65d44..08960d5 100644
--- a/test/sreset_world/sreset_kernel/sreset_kernel.S
+++ b/test/sreset_world/sreset_kernel/sreset_kernel.S
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
/*
* Test the SRESET OPAL call in Mambo by
* having a bit of fun printing 'Hello World' from the SRESET vector.