aboutsummaryrefslogtreecommitdiff
path: root/hw
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 /hw
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>
Diffstat (limited to 'hw')
-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
85 files changed, 85 insertions, 85 deletions
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
*