Skip to content

Commit db05490

Browse files
Bence CsókásShawn Guo
authored andcommitted
ARM: dts: imx6-karo: Replace license text comment with SPDX identifier
Replace verbatim license text with a `SPDX-License-Identifier` The comment header mis-attributes this license to be "X11", but the license text does not include the last line "Except as contained in this notice, the name of the X Consortium shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from the X Consortium.". Therefore, this license is actually equivalent to the SPDX "MIT" license (confirmed by text diffing). Cc: Lothar Waßmann <LW@KARO-electronics.de> Acked-By: Lothar Waßmann <LW@KARO-electronics.de> Signed-off-by: Bence Csókás <csokas.bence@prolan.hu> Signed-off-by: Shawn Guo <shawnguo@kernel.org>
1 parent c343d58 commit db05490

35 files changed

Lines changed: 35 additions & 1301 deletions

arch/arm/boot/dts/nxp/imx/imx53-tx53-x03x.dts

Lines changed: 1 addition & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,6 @@
1+
// SPDX-License-Identifier: (GPL-2.0-only OR MIT)
12
/*
23
* Copyright 2013-2017 Lothar Waßmann <LW@KARO-electronics.de>
3-
*
4-
* This file is dual-licensed: you can use it either under the terms
5-
* of the GPL or the X11 license, at your option. Note that this dual
6-
* licensing only applies to this file, and not this project as a
7-
* whole.
8-
*
9-
* a) This file is free software; you can redistribute it and/or
10-
* modify it under the terms of the GNU General Public License
11-
* version 2 as published by the Free Software Foundation.
12-
*
13-
* This file is distributed in the hope that it will be useful,
14-
* but WITHOUT ANY WARRANTY; without even the implied warranty of
15-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16-
* GNU General Public License for more details.
17-
*
18-
* Or, alternatively,
19-
*
20-
* b) Permission is hereby granted, free of charge, to any person
21-
* obtaining a copy of this software and associated documentation
22-
* files (the "Software"), to deal in the Software without
23-
* restriction, including without limitation the rights to use,
24-
* copy, modify, merge, publish, distribute, sublicense, and/or
25-
* sell copies of the Software, and to permit persons to whom the
26-
* Software is furnished to do so, subject to the following
27-
* conditions:
28-
*
29-
* The above copyright notice and this permission notice shall be
30-
* included in all copies or substantial portions of the Software.
31-
*
32-
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
33-
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
34-
* OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
35-
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
36-
* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
37-
* WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
38-
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
39-
* OTHER DEALINGS IN THE SOFTWARE.
404
*/
415

426
/dts-v1/;

arch/arm/boot/dts/nxp/imx/imx53-tx53-x13x.dts

Lines changed: 1 addition & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,6 @@
1+
// SPDX-License-Identifier: (GPL-2.0-only OR MIT)
12
/*
23
* Copyright 2013-2017 Lothar Waßmann <LW@KARO-electronics.de>
3-
*
4-
* This file is dual-licensed: you can use it either under the terms
5-
* of the GPL or the X11 license, at your option. Note that this dual
6-
* licensing only applies to this file, and not this project as a
7-
* whole.
8-
*
9-
* a) This file is free software; you can redistribute it and/or
10-
* modify it under the terms of the GNU General Public License
11-
* version 2 as published by the Free Software Foundation.
12-
*
13-
* This file is distributed in the hope that it will be useful,
14-
* but WITHOUT ANY WARRANTY; without even the implied warranty of
15-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16-
* GNU General Public License for more details.
17-
*
18-
* Or, alternatively,
19-
*
20-
* b) Permission is hereby granted, free of charge, to any person
21-
* obtaining a copy of this software and associated documentation
22-
* files (the "Software"), to deal in the Software without
23-
* restriction, including without limitation the rights to use,
24-
* copy, modify, merge, publish, distribute, sublicense, and/or
25-
* sell copies of the Software, and to permit persons to whom the
26-
* Software is furnished to do so, subject to the following
27-
* conditions:
28-
*
29-
* The above copyright notice and this permission notice shall be
30-
* included in all copies or substantial portions of the Software.
31-
*
32-
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
33-
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
34-
* OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
35-
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
36-
* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
37-
* WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
38-
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
39-
* OTHER DEALINGS IN THE SOFTWARE.
40-
* The code contained herein is licensed under the GNU General Public
41-
* License. You may obtain a copy of the GNU General Public License
42-
* Version 2 at the following locations:
43-
*
44-
* http://www.opensource.org/licenses/gpl-license.html
45-
* http://www.gnu.org/copyleft/gpl.html
464
*/
475

486
/dts-v1/;

arch/arm/boot/dts/nxp/imx/imx53-tx53.dtsi

Lines changed: 1 addition & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,9 @@
1+
// SPDX-License-Identifier: (GPL-2.0-only OR MIT)
12
/*
23
* Copyright 2012-2017 <LW@KARO-electronics.de>
34
* based on imx53-qsb.dts
45
* Copyright 2011 Freescale Semiconductor, Inc.
56
* Copyright 2011 Linaro Ltd.
6-
*
7-
* This file is dual-licensed: you can use it either under the terms
8-
* of the GPL or the X11 license, at your option. Note that this dual
9-
* licensing only applies to this file, and not this project as a
10-
* whole.
11-
*
12-
* a) This file is free software; you can redistribute it and/or
13-
* modify it under the terms of the GNU General Public License
14-
* version 2 as published by the Free Software Foundation.
15-
*
16-
* This file is distributed in the hope that it will be useful,
17-
* but WITHOUT ANY WARRANTY; without even the implied warranty of
18-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
19-
* GNU General Public License for more details.
20-
*
21-
* Or, alternatively,
22-
*
23-
* b) Permission is hereby granted, free of charge, to any person
24-
* obtaining a copy of this software and associated documentation
25-
* files (the "Software"), to deal in the Software without
26-
* restriction, including without limitation the rights to use,
27-
* copy, modify, merge, publish, distribute, sublicense, and/or
28-
* sell copies of the Software, and to permit persons to whom the
29-
* Software is furnished to do so, subject to the following
30-
* conditions:
31-
*
32-
* The above copyright notice and this permission notice shall be
33-
* included in all copies or substantial portions of the Software.
34-
*
35-
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
36-
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
37-
* OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
38-
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
39-
* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
40-
* WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
41-
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
42-
* OTHER DEALINGS IN THE SOFTWARE.
437
*/
448

459
#include "imx53.dtsi"

arch/arm/boot/dts/nxp/imx/imx6dl-tx6dl-comtft.dts

Lines changed: 1 addition & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,6 @@
1+
// SPDX-License-Identifier: (GPL-2.0-only OR MIT)
12
/*
23
* Copyright 2014-2017 Lothar Waßmann <LW@KARO-electronics.de>
3-
*
4-
* This file is dual-licensed: you can use it either under the terms
5-
* of the GPL or the X11 license, at your option. Note that this dual
6-
* licensing only applies to this file, and not this project as a
7-
* whole.
8-
*
9-
* a) This file is free software; you can redistribute it and/or
10-
* modify it under the terms of the GNU General Public License
11-
* version 2 as published by the Free Software Foundation.
12-
*
13-
* This file is distributed in the hope that it will be useful,
14-
* but WITHOUT ANY WARRANTY; without even the implied warranty of
15-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16-
* GNU General Public License for more details.
17-
*
18-
* Or, alternatively,
19-
*
20-
* b) Permission is hereby granted, free of charge, to any person
21-
* obtaining a copy of this software and associated documentation
22-
* files (the "Software"), to deal in the Software without
23-
* restriction, including without limitation the rights to use,
24-
* copy, modify, merge, publish, distribute, sublicense, and/or
25-
* sell copies of the Software, and to permit persons to whom the
26-
* Software is furnished to do so, subject to the following
27-
* conditions:
28-
*
29-
* The above copyright notice and this permission notice shall be
30-
* included in all copies or substantial portions of the Software.
31-
*
32-
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
33-
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
34-
* OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
35-
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
36-
* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
37-
* WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
38-
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
39-
* OTHER DEALINGS IN THE SOFTWARE.
404
*/
415

426
/dts-v1/;

arch/arm/boot/dts/nxp/imx/imx6dl-tx6s-8034-mb7.dts

Lines changed: 1 addition & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,6 @@
1+
// SPDX-License-Identifier: (GPL-2.0-only OR MIT)
12
/*
23
* Copyright 2017 Lothar Waßmann <LW@KARO-electronics.de>
3-
*
4-
* This file is dual-licensed: you can use it either under the terms
5-
* of the GPL or the X11 license, at your option. Note that this dual
6-
* licensing only applies to this file, and not this project as a
7-
* whole.
8-
*
9-
* a) This file is free software; you can redistribute it and/or
10-
* modify it under the terms of the GNU General Public License
11-
* version 2 as published by the Free Software Foundation.
12-
*
13-
* This file is distributed in the hope that it will be useful,
14-
* but WITHOUT ANY WARRANTY; without even the implied warranty of
15-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16-
* GNU General Public License for more details.
17-
*
18-
* Or, alternatively,
19-
*
20-
* b) Permission is hereby granted, free of charge, to any person
21-
* obtaining a copy of this software and associated documentation
22-
* files (the "Software"), to deal in the Software without
23-
* restriction, including without limitation the rights to use,
24-
* copy, modify, merge, publish, distribute, sublicense, and/or
25-
* sell copies of the Software, and to permit persons to whom the
26-
* Software is furnished to do so, subject to the following
27-
* conditions:
28-
*
29-
* The above copyright notice and this permission notice shall be
30-
* included in all copies or substantial portions of the Software.
31-
*
32-
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
33-
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
34-
* OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
35-
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
36-
* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
37-
* WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
38-
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
39-
* OTHER DEALINGS IN THE SOFTWARE.
404
*/
415

426
/dts-v1/;

arch/arm/boot/dts/nxp/imx/imx6dl-tx6s-8034.dts

Lines changed: 1 addition & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,6 @@
1+
// SPDX-License-Identifier: (GPL-2.0-only OR MIT)
12
/*
23
* Copyright 2015-2017 Lothar Waßmann <LW@KARO-electronics.de>
3-
*
4-
* This file is dual-licensed: you can use it either under the terms
5-
* of the GPL or the X11 license, at your option. Note that this dual
6-
* licensing only applies to this file, and not this project as a
7-
* whole.
8-
*
9-
* a) This file is free software; you can redistribute it and/or
10-
* modify it under the terms of the GNU General Public License
11-
* version 2 as published by the Free Software Foundation.
12-
*
13-
* This file is distributed in the hope that it will be useful,
14-
* but WITHOUT ANY WARRANTY; without even the implied warranty of
15-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16-
* GNU General Public License for more details.
17-
*
18-
* Or, alternatively,
19-
*
20-
* b) Permission is hereby granted, free of charge, to any person
21-
* obtaining a copy of this software and associated documentation
22-
* files (the "Software"), to deal in the Software without
23-
* restriction, including without limitation the rights to use,
24-
* copy, modify, merge, publish, distribute, sublicense, and/or
25-
* sell copies of the Software, and to permit persons to whom the
26-
* Software is furnished to do so, subject to the following
27-
* conditions:
28-
*
29-
* The above copyright notice and this permission notice shall be
30-
* included in all copies or substantial portions of the Software.
31-
*
32-
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
33-
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
34-
* OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
35-
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
36-
* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
37-
* WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
38-
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
39-
* OTHER DEALINGS IN THE SOFTWARE.
404
*/
415

426
/dts-v1/;

arch/arm/boot/dts/nxp/imx/imx6dl-tx6s-8035-mb7.dts

Lines changed: 1 addition & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,6 @@
1+
// SPDX-License-Identifier: (GPL-2.0-only OR MIT)
12
/*
23
* Copyright 2017 Lothar Waßmann <LW@KARO-electronics.de>
3-
*
4-
* This file is dual-licensed: you can use it either under the terms
5-
* of the GPL or the X11 license, at your option. Note that this dual
6-
* licensing only applies to this file, and not this project as a
7-
* whole.
8-
*
9-
* a) This file is free software; you can redistribute it and/or
10-
* modify it under the terms of the GNU General Public License
11-
* version 2 as published by the Free Software Foundation.
12-
*
13-
* This file is distributed in the hope that it will be useful,
14-
* but WITHOUT ANY WARRANTY; without even the implied warranty of
15-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16-
* GNU General Public License for more details.
17-
*
18-
* Or, alternatively,
19-
*
20-
* b) Permission is hereby granted, free of charge, to any person
21-
* obtaining a copy of this software and associated documentation
22-
* files (the "Software"), to deal in the Software without
23-
* restriction, including without limitation the rights to use,
24-
* copy, modify, merge, publish, distribute, sublicense, and/or
25-
* sell copies of the Software, and to permit persons to whom the
26-
* Software is furnished to do so, subject to the following
27-
* conditions:
28-
*
29-
* The above copyright notice and this permission notice shall be
30-
* included in all copies or substantial portions of the Software.
31-
*
32-
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
33-
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
34-
* OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
35-
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
36-
* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
37-
* WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
38-
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
39-
* OTHER DEALINGS IN THE SOFTWARE.
404
*/
415

426
/dts-v1/;

arch/arm/boot/dts/nxp/imx/imx6dl-tx6s-8035.dts

Lines changed: 1 addition & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,6 @@
1+
// SPDX-License-Identifier: (GPL-2.0-only OR MIT)
12
/*
23
* Copyright 2015-2017 Lothar Waßmann <LW@KARO-electronics.de>
3-
*
4-
* This file is dual-licensed: you can use it either under the terms
5-
* of the GPL or the X11 license, at your option. Note that this dual
6-
* licensing only applies to this file, and not this project as a
7-
* whole.
8-
*
9-
* a) This file is free software; you can redistribute it and/or
10-
* modify it under the terms of the GNU General Public License
11-
* version 2 as published by the Free Software Foundation.
12-
*
13-
* This file is distributed in the hope that it will be useful,
14-
* but WITHOUT ANY WARRANTY; without even the implied warranty of
15-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16-
* GNU General Public License for more details.
17-
*
18-
* Or, alternatively,
19-
*
20-
* b) Permission is hereby granted, free of charge, to any person
21-
* obtaining a copy of this software and associated documentation
22-
* files (the "Software"), to deal in the Software without
23-
* restriction, including without limitation the rights to use,
24-
* copy, modify, merge, publish, distribute, sublicense, and/or
25-
* sell copies of the Software, and to permit persons to whom the
26-
* Software is furnished to do so, subject to the following
27-
* conditions:
28-
*
29-
* The above copyright notice and this permission notice shall be
30-
* included in all copies or substantial portions of the Software.
31-
*
32-
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
33-
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
34-
* OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
35-
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
36-
* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
37-
* WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
38-
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
39-
* OTHER DEALINGS IN THE SOFTWARE.
404
*/
415

426
/dts-v1/;

0 commit comments

Comments
 (0)