git.openwrt.org Git - openwrt/staging/blocktrron.git/blob

   1 From fd0ab539d185a828f2071ee5f311bf101c7fea08 Mon Sep 17 00:00:00 2001
   2 From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
   3 Date: Fri, 4 May 2018 11:54:45 +0200
   4 Subject: [PATCH] ARM: dts: BCM5301X: Relicense Buffalo files to the GPL 2.0+ /
   5  MIT
   6 MIME-Version: 1.0
   7 Content-Type: text/plain; charset=UTF-8
   8 Content-Transfer-Encoding: 8bit
   9
  10 This matches licensing used by other BCM5301X files and is preferred as:
  11 1) GPL 2.0+ makes is clearly compatible with Linux kernel
  12 2) MIT is also permissive but preferred over ISC
  13
  14 These files were created and ever touched by a group of four people
  15 only: Felix, INAGAKI, Hauke and me.
  16
  17 Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
  18 Acked-by: Felix Fietkau <nbd@nbd.name>
  19 Acked-by: INAGAKI Hiroshi <musashino.open@gmail.com>
  20 Acked-by: Hauke Mehrtens <hauke@hauke-m.de>
  21 Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
  22 ---
  23  arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts |  3 +--
  24  arch/arm/boot/dts/bcm47081-buffalo-wzr-900dhp.dts | 13 +------------
  25  arch/arm/boot/dts/bcm4709-buffalo-wxr-1900dhp.dts |  3 +--
  26  3 files changed, 3 insertions(+), 16 deletions(-)
  27
  28 --- a/arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts
  29 +++ b/arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts
  30 @@ -1,10 +1,9 @@
  31 +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
  32  /*
  33   * Broadcom BCM470X / BCM5301X ARM platform code.
  34   * DTS for Buffalo WZR-1750DHP
  35   *
  36   * Copyright (C) 2014 Rafał Miłecki <zajec5@gmail.com>
  37 - *
  38 - * Licensed under the GNU/GPL. See COPYING for details.
  39   */
  40
  41  /dts-v1/;
  42 --- a/arch/arm/boot/dts/bcm47081-buffalo-wzr-900dhp.dts
  43 +++ b/arch/arm/boot/dts/bcm47081-buffalo-wzr-900dhp.dts
  44 @@ -1,20 +1,9 @@
  45 +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
  46  /*
  47   * Broadcom BCM470X / BCM5301X ARM platform code.
  48   * DTS for Buffalo WZR-900DHP
  49   *
  50   * Copyright (C) 2015 Rafał Miłecki <zajec5@gmail.com>
  51 - *
  52 - * Permission to use, copy, modify, and/or distribute this software for any
  53 - * purpose with or without fee is hereby granted, provided that the above
  54 - * copyright notice and this permission notice appear in all copies.
  55 - *
  56 - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
  57 - * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
  58 - * AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
  59 - * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
  60 - * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
  61 - * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  62 - * PERFORMANCE OF THIS SOFTWARE.
  63   */
  64
  65  /dts-v1/;
  66 --- a/arch/arm/boot/dts/bcm4709-buffalo-wxr-1900dhp.dts
  67 +++ b/arch/arm/boot/dts/bcm4709-buffalo-wxr-1900dhp.dts
  68 @@ -1,10 +1,9 @@
  69 +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
  70  /*
  71   * Broadcom BCM470X / BCM5301X ARM platform code.
  72   * DTS for Buffalo WXR-1900DHP
  73   *
  74   * Copyright (C) 2015 Felix Fietkau <nbd@openwrt.org>
  75 - *
  76 - * Licensed under the GNU/GPL. See COPYING for details.
  77   */
  78
  79  /dts-v1/;