diff options
author | Gregory CLEMENT <gregory.clement@bootlin.com> | 2018-03-15 07:04:17 -0400 |
---|---|---|
committer | Gregory CLEMENT <gregory.clement@bootlin.com> | 2018-03-27 09:20:43 -0400 |
commit | 34456c7acd1df9c8862a5a049797b89d413aef4e (patch) | |
tree | 48311723e0b74e28fae4740d99673aa81149c09c | |
parent | 45d33aa5d7cf27ff95bee7021e11bb3bc228848c (diff) |
arm: dts: armada-xp-db-xc3-24g4xg: use SPDX-License-Identifier
Follow the recent trend for the license description, and also fix the
wrongly stated X11 to MIT.
As already pointed on the DT ML, the X11 license text [1] is explicitly
for the X Consortium and has a couple of extra clauses. The MIT
license text [2] is actually what the current DT files claim.
[1] https://spdx.org/licenses/X11.html
[2] https://spdx.org/licenses/MIT.html
Cc: Chris Packham <chris.packham@alliedtelesis.co.nz>
Acked-by: Chris Packham <chris.packham@alliedtelesis.co.nz>
Acked-by: Jason Cooper <jason@lakedaemon.net>
Signed-off-by: Gregory CLEMENT <gregory.clement@bootlin.com>
-rw-r--r-- | arch/arm/boot/dts/armada-xp-db-xc3-24g4xg.dts | 39 |
1 files changed, 1 insertions, 38 deletions
diff --git a/arch/arm/boot/dts/armada-xp-db-xc3-24g4xg.dts b/arch/arm/boot/dts/armada-xp-db-xc3-24g4xg.dts index 06fce35d7491..a0ebb52683f1 100644 --- a/arch/arm/boot/dts/armada-xp-db-xc3-24g4xg.dts +++ b/arch/arm/boot/dts/armada-xp-db-xc3-24g4xg.dts | |||
@@ -1,3 +1,4 @@ | |||
1 | // SPDX-License-Identifier: (GPL-2.0+ OR MIT) | ||
1 | /* | 2 | /* |
2 | * Device Tree file for DB-XC3-24G4XG board | 3 | * Device Tree file for DB-XC3-24G4XG board |
3 | * | 4 | * |
@@ -5,44 +6,6 @@ | |||
5 | * | 6 | * |
6 | * Based on armada-xp-db.dts | 7 | * Based on armada-xp-db.dts |
7 | * | 8 | * |
8 | * This file is dual-licensed: you can use it either under the terms | ||
9 | * of the GPL or the X11 license, at your option. Note that this dual | ||
10 | * licensing only applies to this file, and not this project as a | ||
11 | * whole. | ||
12 | * | ||
13 | * a) This file is free software; you can redistribute it and/or | ||
14 | * modify it under the terms of the GNU General Public License as | ||
15 | * published by the Free Software Foundation; either version 2 of the | ||
16 | * License, or (at your option) any later version. | ||
17 | * | ||
18 | * This file is distributed in the hope that it will be useful, | ||
19 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
20 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
21 | * GNU General Public License for more details. | ||
22 | * | ||
23 | * Or, alternatively, | ||
24 | * | ||
25 | * b) Permission is hereby granted, free of charge, to any person | ||
26 | * obtaining a copy of this software and associated documentation | ||
27 | * files (the "Software"), to deal in the Software without | ||
28 | * restriction, including without limitation the rights to use, | ||
29 | * copy, modify, merge, publish, distribute, sublicense, and/or | ||
30 | * sell copies of the Software, and to permit persons to whom the | ||
31 | * Software is furnished to do so, subject to the following | ||
32 | * conditions: | ||
33 | * | ||
34 | * The above copyright notice and this permission notice shall be | ||
35 | * included in all copies or substantial portions of the Software. | ||
36 | * | ||
37 | * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, | ||
38 | * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES | ||
39 | * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND | ||
40 | * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT | ||
41 | * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, | ||
42 | * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING | ||
43 | * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR | ||
44 | * OTHER DEALINGS IN THE SOFTWARE. | ||
45 | * | ||
46 | * Note: this Device Tree assumes that the bootloader has remapped the | 9 | * Note: this Device Tree assumes that the bootloader has remapped the |
47 | * internal registers to 0xf1000000 (instead of the default | 10 | * internal registers to 0xf1000000 (instead of the default |
48 | * 0xd0000000). The 0xf1000000 is the default used by the recent, | 11 | * 0xd0000000). The 0xf1000000 is the default used by the recent, |