This updates the licenses of the files authored by me under lib/arm and lib/aarch64 to be both 2-clause BSD and GPL v2+
Signed-off-by: Ard Biesheuvel ard.biesheuvel@linaro.org --- gnuefi/crt0-efi-arm.S | 15 +++++++++++---- lib/aarch64/initplat.c | 17 +++++++++++------ lib/aarch64/math.c | 17 +++++++++++------ lib/arm/initplat.c | 17 +++++++++++------ lib/arm/math.c | 17 +++++++++++------ 5 files changed, 55 insertions(+), 28 deletions(-)
diff --git a/gnuefi/crt0-efi-arm.S b/gnuefi/crt0-efi-arm.S index 3efaf78ebf7f..c5bb6d482dac 100644 --- a/gnuefi/crt0-efi-arm.S +++ b/gnuefi/crt0-efi-arm.S @@ -3,10 +3,17 @@ * * Copright (C) 2014 Linaro Ltd. ard.biesheuvel@linaro.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; either version 2 of the License, or (at your option) - * any later version. + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice and this list of conditions, without modification. + * 2. The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * Alternatively, this software may be distributed 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. */
.section .text.head diff --git a/lib/aarch64/initplat.c b/lib/aarch64/initplat.c index 1c34cefa1769..b4d29a93bba1 100644 --- a/lib/aarch64/initplat.c +++ b/lib/aarch64/initplat.c @@ -1,13 +1,18 @@ /* - * aarch64/initplat.c - * * Copright (C) 2014 Linaro Ltd. * Author: Ard Biesheuvel ard.biesheuvel@linaro.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; either version 2 of the License, or (at your option) - * any later version. + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice and this list of conditions, without modification. + * 2. The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * Alternatively, this software may be distributed 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. */
#include "lib.h" diff --git a/lib/aarch64/math.c b/lib/aarch64/math.c index d836965891a1..8c16444667f3 100644 --- a/lib/aarch64/math.c +++ b/lib/aarch64/math.c @@ -1,13 +1,18 @@ /* - * crt0-efi-aarch64.S - PE/COFF header for Aarch64 EFI applications - * * Copright (C) 2014 Linaro Ltd. * Author: Ard Biesheuvel ard.biesheuvel@linaro.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; either version 2 of the License, or (at your option) - * any later version. + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice and this list of conditions, without modification. + * 2. The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * Alternatively, this software may be distributed 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. */
#include "lib.h" diff --git a/lib/arm/initplat.c b/lib/arm/initplat.c index 934289c2c3d2..a90a457580f6 100644 --- a/lib/arm/initplat.c +++ b/lib/arm/initplat.c @@ -1,13 +1,18 @@ /* - * aarch64/initplat.c - * * Copright (C) 2014 Linaro Ltd. * Author: Ard Biesheuvel ard.biesheuvel@linaro.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; either version 2 of the License, or (at your option) - * any later version. + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice and this list of conditions, without modification. + * 2. The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * Alternatively, this software may be distributed 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. */
#include "lib.h" diff --git a/lib/arm/math.c b/lib/arm/math.c index 2502a8e0e286..adf79f949d2d 100644 --- a/lib/arm/math.c +++ b/lib/arm/math.c @@ -1,13 +1,18 @@ /* - * arm/math.c - math routines for ARM - * * Copright (C) 2014 Linaro Ltd. * Author: Ard Biesheuvel ard.biesheuvel@linaro.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; either version 2 of the License, or (at your option) - * any later version. + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice and this list of conditions, without modification. + * 2. The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * Alternatively, this software may be distributed 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. */
#include "lib.h"