aboutsummaryrefslogtreecommitdiff
path: root/hdata/test
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 /hdata/test
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 'hdata/test')
-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
4 files changed, 4 insertions, 4 deletions
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>