From ec1fde57979ab9331fc939633b0461ef4af7def7 Mon Sep 17 00:00:00 2001 From: Ivan De Cesaris Date: Mon, 26 Oct 2015 16:50:34 +0100 Subject: [PATCH] quark: updating license to GPLv2+ Intel is relicensing our contributions to OpenOCD under GPL version 2 or any later version. We previously contributed code under GPL version 2 only. It was not our intention to differ from the standard OpenOCD license. We're correcting that here. This also applies retroactively to previous versions of our contributions to OpenOCD. Change-Id: I5e831ed95d03d2044d8e5a8375b21c6e52c933d7 Signed-off-by: Ivan De Cesaris Reviewed-on: http://openocd.zylin.com/3044 Tested-by: jenkins Reviewed-by: Andreas Fritiofson --- src/target/lakemont.c | 5 +++-- src/target/lakemont.h | 5 +++-- src/target/quark_x10xx.c | 5 +++-- src/target/x86_32_common.c | 5 +++-- src/target/x86_32_common.h | 5 +++-- 5 files changed, 15 insertions(+), 10 deletions(-) diff --git a/src/target/lakemont.c b/src/target/lakemont.c index 17b0c12ae..055d94340 100644 --- a/src/target/lakemont.c +++ b/src/target/lakemont.c @@ -8,8 +8,9 @@ * Jeffrey Maxwell (jeffrey.r.maxwell@intel.com) * * This program is free software; you can redistribute it and/or modify - * it under the terms of version 2 of the GNU General Public License as - * published by the Free Software Foundation. + * 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/src/target/lakemont.h b/src/target/lakemont.h index e5729aee0..30b34b3f2 100644 --- a/src/target/lakemont.h +++ b/src/target/lakemont.h @@ -8,8 +8,9 @@ * Jeffrey Maxwell (jeffrey.r.maxwell@intel.com) * * This program is free software; you can redistribute it and/or modify - * it under the terms of version 2 of the GNU General Public License as - * published by the Free Software Foundation. + * 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/src/target/quark_x10xx.c b/src/target/quark_x10xx.c index 05818b7c1..9a1ccb65d 100644 --- a/src/target/quark_x10xx.c +++ b/src/target/quark_x10xx.c @@ -8,8 +8,9 @@ * Jeffrey Maxwell (jeffrey.r.maxwell@intel.com) * * This program is free software; you can redistribute it and/or modify - * it under the terms of version 2 of the GNU General Public License as - * published by the Free Software Foundation. + * 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/src/target/x86_32_common.c b/src/target/x86_32_common.c index 6bcd4aff2..3a26f71d1 100644 --- a/src/target/x86_32_common.c +++ b/src/target/x86_32_common.c @@ -8,8 +8,9 @@ * Jeffrey Maxwell (jeffrey.r.maxwell@intel.com) * * This program is free software; you can redistribute it and/or modify - * it under the terms of version 2 of the GNU General Public License as - * published by the Free Software Foundation. + * 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/src/target/x86_32_common.h b/src/target/x86_32_common.h index 83973b84a..af57a5f7e 100644 --- a/src/target/x86_32_common.h +++ b/src/target/x86_32_common.h @@ -8,8 +8,9 @@ * Jeffrey Maxwell (jeffrey.r.maxwell@intel.com) * * This program is free software; you can redistribute it and/or modify - * it under the terms of version 2 of the GNU General Public License as - * published by the Free Software Foundation. + * 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