[Skiboot] [PATCH 1/2] Re-license contributions from Dan Horák
Oliver O'Halloran
oohall at gmail.com
Mon Mar 16 12:27:39 AEDT 2020
Cc: Dan Horák <dan at danny.cz>
Signed-off-by: Oliver O'Halloran <oohall at gmail.com>
---
external/gard/rules.mk | 2 +-
external/xscom-utils/Makefile | 2 +-
platforms/astbmc/garrison.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/external/gard/rules.mk b/external/gard/rules.mk
index 8db66b889a0d..92ceb9bc0d54 100644
--- a/external/gard/rules.mk
+++ b/external/gard/rules.mk
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: Apache-2.0
+# SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
.DEFAULT_GOAL := all
override CFLAGS += -O2 -Wall -Werror -Wno-stringop-truncation -I.
diff --git a/external/xscom-utils/Makefile b/external/xscom-utils/Makefile
index b0b10891edef..69ce87a72bb3 100644
--- a/external/xscom-utils/Makefile
+++ b/external/xscom-utils/Makefile
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: Apache-2.0
+# SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
CC = $(CROSS_COMPILE)gcc
XSCOM_VERSION ?= $(shell ../../make_version.sh xscom-utils)
diff --git a/platforms/astbmc/garrison.c b/platforms/astbmc/garrison.c
index caf6113687be..e698e2f6883a 100644
--- a/platforms/astbmc/garrison.c
+++ b/platforms/astbmc/garrison.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>
--
2.21.1
More information about the Skiboot
mailing list