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