aboutsummaryrefslogtreecommitdiff
path: root/external/gard
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 /external/gard
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 'external/gard')
-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
5 files changed, 5 insertions, 5 deletions
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