aboutsummaryrefslogtreecommitdiff
path: root/external/mambo
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/mambo
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/mambo')
-rw-r--r--external/mambo/Makefile2
-rw-r--r--external/mambo/mambo-socket-proxy.c2
-rw-r--r--external/mambo/mambo_utils.tcl2
-rw-r--r--external/mambo/qtrace_utils.tcl2
-rw-r--r--external/mambo/skiboot.tcl2
5 files changed, 5 insertions, 5 deletions
diff --git a/external/mambo/Makefile b/external/mambo/Makefile
index d750b98..942ebf2 100644
--- a/external/mambo/Makefile
+++ b/external/mambo/Makefile
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: Apache-2.0
+# SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
CFLAGS=-O2 -m64 -pthread -Werror -Wall
diff --git a/external/mambo/mambo-socket-proxy.c b/external/mambo/mambo-socket-proxy.c
index 16053e7..64b6770 100644
--- a/external/mambo/mambo-socket-proxy.c
+++ b/external/mambo/mambo-socket-proxy.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
/*
* Compile with:
* gcc -static -O2 mambo-socket-proxy.c -o mambo-socket-proxy -pthread
diff --git a/external/mambo/mambo_utils.tcl b/external/mambo/mambo_utils.tcl
index 8bde1e1..96f8971 100644
--- a/external/mambo/mambo_utils.tcl
+++ b/external/mambo/mambo_utils.tcl
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: Apache-2.0
+# SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
#
# Make Mambo behave a bit more like gdb
#
diff --git a/external/mambo/qtrace_utils.tcl b/external/mambo/qtrace_utils.tcl
index 3fbcd59..bb20b31 100644
--- a/external/mambo/qtrace_utils.tcl
+++ b/external/mambo/qtrace_utils.tcl
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: Apache-2.0
+# SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
if { [file exists $env(LIB_DIR)/perf/qtrace.tcl] == 1} {
if { [catch {source $env(LIB_DIR)/perf/qtrace.tcl} issue ] } {
diff --git a/external/mambo/skiboot.tcl b/external/mambo/skiboot.tcl
index 15d00a4..6003fcb 100644
--- a/external/mambo/skiboot.tcl
+++ b/external/mambo/skiboot.tcl
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: Apache-2.0
+# SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
#
# scripts to run skiboot (and a payload) with Mambo (otherwise known as the
# POWER[89] Functional Simulator)