summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Zammit <damien@zamaudio.com>2019-02-23 12:38:15 +1100
committerPatrick Georgi <pgeorgi@google.com>2019-02-25 11:19:37 +0000
commitf0a9128424f2c610756b97ef77f8fcd49a98f563 (patch)
tree70b69ed4f9c89c543c47c5de61c35b6a49ee5b18
parentb94ecc4e696cc63e2772657c915670c3fe057f5c (diff)
downloadcoreboot-f0a9128424f2c610756b97ef77f8fcd49a98f563.tar.xz
intelmetool: Use GPLv2+ where possible
Upstream intelmetool is out of date; I suggest I archive it instead of trying to merge coreboot's changes into it. However I would like to preserve the licensing of files in the tool as GPLv2+ where possible instead of GPLv2-only. Change-Id: I47b1ff2734f54c65f4214b39244bd868ef44b83c Signed-off-by: Damien Zammit <damien@zamaudio.com> Reviewed-on: https://review.coreboot.org/c/31587 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Philipp Deppenwiese <zaolin.daisuki@gmail.com>
-rw-r--r--util/intelmetool/Makefile2
-rw-r--r--util/intelmetool/intelmetool.c3
-rw-r--r--util/intelmetool/mmap.c2
-rw-r--r--util/intelmetool/mmap.h2
-rw-r--r--util/intelmetool/msr.c2
-rw-r--r--util/intelmetool/msr.h2
-rw-r--r--util/intelmetool/rcba.c7
-rw-r--r--util/intelmetool/rcba.h7
8 files changed, 15 insertions, 12 deletions
diff --git a/util/intelmetool/Makefile b/util/intelmetool/Makefile
index 128c1fe9d5..45a87c7e28 100644
--- a/util/intelmetool/Makefile
+++ b/util/intelmetool/Makefile
@@ -5,7 +5,7 @@
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License as
# published by the Free Software Foundation; either version 2 of
-# the License, or any later version.
+# the License, or (at your option) any later version.
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/util/intelmetool/intelmetool.c b/util/intelmetool/intelmetool.c
index 5981e9ddbd..5a0002596c 100644
--- a/util/intelmetool/intelmetool.c
+++ b/util/intelmetool/intelmetool.c
@@ -3,7 +3,8 @@
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License,
+ * or (at your option), any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/util/intelmetool/mmap.c b/util/intelmetool/mmap.c
index 0b6c9e1871..e3075a8121 100644
--- a/util/intelmetool/mmap.c
+++ b/util/intelmetool/mmap.c
@@ -5,7 +5,7 @@
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
* published by the Free Software Foundation; either version 2 of
- * the License, or any later version.
+ * the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/util/intelmetool/mmap.h b/util/intelmetool/mmap.h
index 2a7fa05308..31d8313bf3 100644
--- a/util/intelmetool/mmap.h
+++ b/util/intelmetool/mmap.h
@@ -5,7 +5,7 @@
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
* published by the Free Software Foundation; either version 2 of
- * the License, or any later version.
+ * the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/util/intelmetool/msr.c b/util/intelmetool/msr.c
index d1e510fd14..5c84f2b582 100644
--- a/util/intelmetool/msr.c
+++ b/util/intelmetool/msr.c
@@ -6,7 +6,7 @@
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
* published by the Free Software Foundation; either version 2 of
- * the License, or any later version.
+ * the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/util/intelmetool/msr.h b/util/intelmetool/msr.h
index 60e07b2409..1f6a1175af 100644
--- a/util/intelmetool/msr.h
+++ b/util/intelmetool/msr.h
@@ -6,7 +6,7 @@
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
* published by the Free Software Foundation; either version 2 of
- * the License, or any later version.
+ * the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/util/intelmetool/rcba.c b/util/intelmetool/rcba.c
index 6a09af687c..ebc2d9ca48 100644
--- a/util/intelmetool/rcba.c
+++ b/util/intelmetool/rcba.c
@@ -2,9 +2,10 @@
* Copyright (C) 2014 Damien Zammit <damien@zamaudio.com>
* Copyright (C) 2017 Patrick Rudolph <siro@das-labor.org>
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/util/intelmetool/rcba.h b/util/intelmetool/rcba.h
index e349d3d7fd..d40dcb9262 100644
--- a/util/intelmetool/rcba.h
+++ b/util/intelmetool/rcba.h
@@ -1,9 +1,10 @@
/*
* Copyright (C) 2017 Patrick Rudolph <siro@das-labor.org>
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of