aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOliver O'Halloran <oohall@gmail.com>2019-11-05 20:33:33 +1100
committerOliver O'Halloran <oohall@gmail.com>2020-03-12 20:34:02 +1100
commite19dddc58280e6120459053dfcbf9c026b0ac4f9 (patch)
treef476afeae6b010576d5e83500efefe9fdc85738b
parent49496485fe9df08633d0db70c1cdbf15ff533991 (diff)
downloadskiboot-e19dddc58280e6120459053dfcbf9c026b0ac4f9.zip
skiboot-e19dddc58280e6120459053dfcbf9c026b0ac4f9.tar.gz
skiboot-e19dddc58280e6120459053dfcbf9c026b0ac4f9.tar.bz2
Re-license contributions from Raptor Computer Systems
The following files contain contributions from Timothy Pearson at Raptor Computer Systems. He has agreed to re-license these contributions as Dual Apache 2.0 / GPLv2+, so amend the SPDX tag to reflect that. hw/phb4.c include/phb4.h include/platform.h platforms/astbmc/talos.c platforms/astbmc/romulus.c Cc: Timothy Pearson <tpearson@raptorengineering.com> Signed-off-by: Oliver O'Halloran <oohall@gmail.com>
-rw-r--r--hw/phb4.c2
-rw-r--r--include/phb4.h2
-rw-r--r--include/platform.h2
-rw-r--r--platforms/astbmc/romulus.c2
-rw-r--r--platforms/astbmc/talos.c2
5 files changed, 5 insertions, 5 deletions
diff --git a/hw/phb4.c b/hw/phb4.c
index ed7f4e5..f17625b 100644
--- a/hw/phb4.c
+++ b/hw/phb4.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
/*
* PHB4: PCI Host Bridge 4, in POWER9
*
diff --git a/include/phb4.h b/include/phb4.h
index 3dd0a5c..6d5fd51 100644
--- a/include/phb4.h
+++ b/include/phb4.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_H
diff --git a/include/platform.h b/include/platform.h
index 671878b..6aa263a 100644
--- a/include/platform.h
+++ b/include/platform.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 __PLATFORM_H
diff --git a/platforms/astbmc/romulus.c b/platforms/astbmc/romulus.c
index 2f3a0a4..9afb7d3 100644
--- a/platforms/astbmc/romulus.c
+++ b/platforms/astbmc/romulus.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/talos.c b/platforms/astbmc/talos.c
index 55a3385..a5a37d3 100644
--- a/platforms/astbmc/talos.c
+++ b/platforms/astbmc/talos.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.
* Copyright 2018-2019 Raptor Engineering, LLC