From a5764dd3be19b25b9a82249a3a8ec239b590d9df Mon Sep 17 00:00:00 2001 From: Oliver O'Halloran Date: Fri, 13 Mar 2020 11:29:23 +1100 Subject: =?UTF-8?q?Re-license=20contributions=20from=20Dan=20Hor=C3=A1k?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Dan Horák Signed-off-by: Oliver O'Halloran --- 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 8db66b8..92ceb9b 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 b0b1089..69ce87a 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 caf6113..e698e2f 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 -- cgit v1.1