lkml.org 
[lkml]   [2018]   [Dec]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v2 2/9] ARM: dts: imx7d-pico: Switch to SPDX identifier
    Date
    From: Fabio Estevam <festevam@gmail.com>

    Adopt the SPDX license identifier headers to ease license compliance
    management.

    Signed-off-by: Fabio Estevam <festevam@gmail.com>
    Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
    ---

    Changes in v2: None

    arch/arm/boot/dts/imx7d-pico-pi.dts | 44 ++---------------------------
    arch/arm/boot/dts/imx7d-pico.dtsi | 44 ++---------------------------
    2 files changed, 6 insertions(+), 82 deletions(-)

    diff --git a/arch/arm/boot/dts/imx7d-pico-pi.dts b/arch/arm/boot/dts/imx7d-pico-pi.dts
    index ee02d931cf49..33951f4c7f41 100644
    --- a/arch/arm/boot/dts/imx7d-pico-pi.dts
    +++ b/arch/arm/boot/dts/imx7d-pico-pi.dts
    @@ -1,44 +1,6 @@
    -/*
    - * Copyright 2017 NXP
    - *
    - * This file is dual-licensed: you can use it either under the terms
    - * of the GPL or the X11 license, at your option. Note that this dual
    - * licensing only applies to this file, and not this project as a
    - * whole.
    - *
    - * a) This file 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 file is distributed in the hope that it will be useful,
    - * but WITHOUT ANY WARRANTY; without even the implied warranty of
    - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
    - * GNU General Public License for more details.
    - *
    - * Or, alternatively,
    - *
    - * b) Permission is hereby granted, free of charge, to any person
    - * obtaining a copy of this software and associated documentation
    - * files (the "Software"), to deal in the Software without
    - * restriction, including without limitation the rights to use,
    - * copy, modify, merge, publish, distribute, sublicense, and/or
    - * sell copies of the Software, and to permit persons to whom the
    - * Software is furnished to do so, subject to the following
    - * conditions:
    - *
    - * The above copyright notice and this permission notice shall be
    - * included in all copies or substantial portions of the Software.
    - *
    - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
    - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
    - * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
    - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
    - * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
    - * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
    - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
    - * OTHER DEALINGS IN THE SOFTWARE.
    - */
    +// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
    +//
    +// Copyright 2017 NXP

    #include "imx7d-pico.dtsi"

    diff --git a/arch/arm/boot/dts/imx7d-pico.dtsi b/arch/arm/boot/dts/imx7d-pico.dtsi
    index 0df68e53e9fa..d957454ce16b 100644
    --- a/arch/arm/boot/dts/imx7d-pico.dtsi
    +++ b/arch/arm/boot/dts/imx7d-pico.dtsi
    @@ -1,44 +1,6 @@
    -/*
    - * Copyright 2017 NXP
    - *
    - * This file is dual-licensed: you can use it either under the terms
    - * of the GPL or the X11 license, at your option. Note that this dual
    - * licensing only applies to this file, and not this project as a
    - * whole.
    - *
    - * a) This file 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 file is distributed in the hope that it will be useful,
    - * but WITHOUT ANY WARRANTY; without even the implied warranty of
    - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
    - * GNU General Public License for more details.
    - *
    - * Or, alternatively,
    - *
    - * b) Permission is hereby granted, free of charge, to any person
    - * obtaining a copy of this software and associated documentation
    - * files (the "Software"), to deal in the Software without
    - * restriction, including without limitation the rights to use,
    - * copy, modify, merge, publish, distribute, sublicense, and/or
    - * sell copies of the Software, and to permit persons to whom the
    - * Software is furnished to do so, subject to the following
    - * conditions:
    - *
    - * The above copyright notice and this permission notice shall be
    - * included in all copies or substantial portions of the Software.
    - *
    - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
    - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
    - * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
    - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
    - * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
    - * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
    - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
    - * OTHER DEALINGS IN THE SOFTWARE.
    - */
    +// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
    +//
    +// Copyright 2017 NXP

    /dts-v1/;

    --
    2.19.2
    \
     
     \ /
      Last update: 2018-12-06 11:09    [W:3.447 / U:0.016 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site