diff options
| author | Oliver O'Halloran <oohall@gmail.com> | 2020-03-13 11:29:23 +1100 |
|---|---|---|
| committer | Oliver O'Halloran <oohall@gmail.com> | 2020-03-13 11:36:53 +1100 |
| commit | a5764dd3be19b25b9a82249a3a8ec239b590d9df (patch) | |
| tree | 1810ad53a0587f38d3e5ebec86b2f33dfb0904b4 | |
| parent | e19dddc58280e6120459053dfcbf9c026b0ac4f9 (diff) | |
| download | skiboot-a5764dd3be19b25b9a82249a3a8ec239b590d9df.zip skiboot-a5764dd3be19b25b9a82249a3a8ec239b590d9df.tar.gz skiboot-a5764dd3be19b25b9a82249a3a8ec239b590d9df.tar.bz2 | |
Re-license contributions from Dan Horák
Cc: Dan Horák <dan@danny.cz>
Signed-off-by: Oliver O'Halloran <oohall@gmail.com>
| -rw-r--r-- | external/gard/rules.mk | 2 | ||||
| -rw-r--r-- | external/xscom-utils/Makefile | 2 | ||||
| -rw-r--r-- | 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 <skiboot.h> |