Skip to content

Commit b23de67

Browse files
Bence CsókásShawn Guo
authored andcommitted
ARM: dts: imx6-gw: 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: Tim Harvey <[email protected]> Signed-off-by: Bence Csókás <[email protected]> Acked-by: Tim Harvey <[email protected]> Signed-off-by: Shawn Guo <[email protected]>
1 parent 201e419 commit b23de67

15 files changed

+15
-645
lines changed

arch/arm/boot/dts/nxp/imx/imx6dl-gw551x.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 2014 Gateworks Corporation
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 as
11-
* published by the Free Software Foundation; either version 2 of
12-
* the License, or (at your option) any later version.
13-
*
14-
* This file is distributed in the hope that it will be useful,
15-
* but WITHOUT ANY WARRANTY; without even the implied warranty of
16-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
17-
* GNU General Public License for more details.
18-
*
19-
* You should have received a copy of the GNU General Public
20-
* License along with this file; if not, write to the Free
21-
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
22-
* MA 02110-1301 USA
23-
*
24-
* Or, alternatively,
25-
*
26-
* b) Permission is hereby granted, free of charge, to any person
27-
* obtaining a copy of this software and associated documentation
28-
* files (the "Software"), to deal in the Software without
29-
* restriction, including without limitation the rights to use,
30-
* copy, modify, merge, publish, distribute, sublicense, and/or
31-
* sell copies of the Software, and to permit persons to whom the
32-
* Software is furnished to do so, subject to the following
33-
* conditions:
34-
*
35-
* The above copyright notice and this permission notice shall be
36-
* included in all copies or substantial portions of the Software.
37-
*
38-
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
39-
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
40-
* OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
41-
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
42-
* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
43-
* WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
44-
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
45-
* OTHER DEALINGS IN THE SOFTWARE.
464
*/
475

486
/dts-v1/;

arch/arm/boot/dts/nxp/imx/imx6dl-gw553x.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 2016 Gateworks Corporation
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 as
11-
* published by the Free Software Foundation; either version 2 of
12-
* the License, or (at your option) any later version.
13-
*
14-
* This file is distributed in the hope that it will be useful,
15-
* but WITHOUT ANY WARRANTY; without even the implied warranty of
16-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
17-
* GNU General Public License for more details.
18-
*
19-
* You should have received a copy of the GNU General Public
20-
* License along with this file; if not, write to the Free
21-
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
22-
* MA 02110-1301 USA
23-
*
24-
* Or, alternatively,
25-
*
26-
* b) Permission is hereby granted, free of charge, to any person
27-
* obtaining a copy of this software and associated documentation
28-
* files (the "Software"), to deal in the Software without
29-
* restriction, including without limitation the rights to use,
30-
* copy, modify, merge, publish, distribute, sublicense, and/or
31-
* sell copies of the Software, and to permit persons to whom the
32-
* Software is furnished to do so, subject to the following
33-
* conditions:
34-
*
35-
* The above copyright notice and this permission notice shall be
36-
* included in all copies or substantial portions of the Software.
37-
*
38-
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
39-
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
40-
* OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
41-
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
42-
* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
43-
* WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
44-
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
45-
* OTHER DEALINGS IN THE SOFTWARE.
464
*/
475

486
/dts-v1/;

arch/arm/boot/dts/nxp/imx/imx6dl-gw560x.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 2017 Gateworks Corporation
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 as
11-
* published by the Free Software Foundation; either version 2 of
12-
* the License, or (at your option) any later version.
13-
*
14-
* This file is distributed in the hope that it will be useful,
15-
* but WITHOUT ANY WARRANTY; without even the implied warranty of
16-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
17-
* GNU General Public License for more details.
18-
*
19-
* You should have received a copy of the GNU General Public
20-
* License along with this file; if not, write to the Free
21-
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
22-
* MA 02110-1301 USA
23-
*
24-
* Or, alternatively,
25-
*
26-
* b) Permission is hereby granted, free of charge, to any person
27-
* obtaining a copy of this software and associated documentation
28-
* files (the "Software"), to deal in the Software without
29-
* restriction, including without limitation the rights to use,
30-
* copy, modify, merge, publish, distribute, sublicense, and/or
31-
* sell copies of the Software, and to permit persons to whom the
32-
* Software is furnished to do so, subject to the following
33-
* conditions:
34-
*
35-
* The above copyright notice and this permission notice shall be
36-
* included in all copies or substantial portions of the Software.
37-
*
38-
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
39-
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
40-
* OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
41-
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
42-
* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
43-
* WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
44-
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
45-
* OTHER DEALINGS IN THE SOFTWARE.
464
*/
475

486
/dts-v1/;

arch/arm/boot/dts/nxp/imx/imx6dl-gw5903.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 2017 Gateworks Corporation
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 as
11-
* published by the Free Software Foundation; either version 2 of
12-
* the License, or (at your option) any later version.
13-
*
14-
* This file is distributed in the hope that it will be useful,
15-
* but WITHOUT ANY WARRANTY; without even the implied warranty of
16-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
17-
* GNU General Public License for more details.
18-
*
19-
* You should have received a copy of the GNU General Public
20-
* License along with this file; if not, write to the Free
21-
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
22-
* MA 02110-1301 USA
23-
*
24-
* Or, alternatively,
25-
*
26-
* b) Permission is hereby granted, free of charge, to any person
27-
* obtaining a copy of this software and associated documentation
28-
* files (the "Software"), to deal in the Software without
29-
* restriction, including without limitation the rights to use,
30-
* copy, modify, merge, publish, distribute, sublicense, and/or
31-
* sell copies of the Software, and to permit persons to whom the
32-
* Software is furnished to do so, subject to the following
33-
* conditions:
34-
*
35-
* The above copyright notice and this permission notice shall be
36-
* included in all copies or substantial portions of the Software.
37-
*
38-
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
39-
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
40-
* OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
41-
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
42-
* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
43-
* WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
44-
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
45-
* OTHER DEALINGS IN THE SOFTWARE.
464
*/
475

486
/dts-v1/;

arch/arm/boot/dts/nxp/imx/imx6dl-gw5904.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 2017 Gateworks Corporation
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 as
11-
* published by the Free Software Foundation; either version 2 of
12-
* the License, or (at your option) any later version.
13-
*
14-
* This file is distributed in the hope that it will be useful,
15-
* but WITHOUT ANY WARRANTY; without even the implied warranty of
16-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
17-
* GNU General Public License for more details.
18-
*
19-
* You should have received a copy of the GNU General Public
20-
* License along with this file; if not, write to the Free
21-
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
22-
* MA 02110-1301 USA
23-
*
24-
* Or, alternatively,
25-
*
26-
* b) Permission is hereby granted, free of charge, to any person
27-
* obtaining a copy of this software and associated documentation
28-
* files (the "Software"), to deal in the Software without
29-
* restriction, including without limitation the rights to use,
30-
* copy, modify, merge, publish, distribute, sublicense, and/or
31-
* sell copies of the Software, and to permit persons to whom the
32-
* Software is furnished to do so, subject to the following
33-
* conditions:
34-
*
35-
* The above copyright notice and this permission notice shall be
36-
* included in all copies or substantial portions of the Software.
37-
*
38-
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
39-
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
40-
* OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
41-
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
42-
* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
43-
* WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
44-
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
45-
* OTHER DEALINGS IN THE SOFTWARE.
464
*/
475

486
/dts-v1/;

arch/arm/boot/dts/nxp/imx/imx6q-gw551x.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 2014 Gateworks Corporation
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 as
11-
* published by the Free Software Foundation; either version 2 of
12-
* the License, or (at your option) any later version.
13-
*
14-
* This file is distributed in the hope that it will be useful,
15-
* but WITHOUT ANY WARRANTY; without even the implied warranty of
16-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
17-
* GNU General Public License for more details.
18-
*
19-
* You should have received a copy of the GNU General Public
20-
* License along with this file; if not, write to the Free
21-
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
22-
* MA 02110-1301 USA
23-
*
24-
* Or, alternatively,
25-
*
26-
* b) Permission is hereby granted, free of charge, to any person
27-
* obtaining a copy of this software and associated documentation
28-
* files (the "Software"), to deal in the Software without
29-
* restriction, including without limitation the rights to use,
30-
* copy, modify, merge, publish, distribute, sublicense, and/or
31-
* sell copies of the Software, and to permit persons to whom the
32-
* Software is furnished to do so, subject to the following
33-
* conditions:
34-
*
35-
* The above copyright notice and this permission notice shall be
36-
* included in all copies or substantial portions of the Software.
37-
*
38-
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
39-
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
40-
* OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
41-
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
42-
* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
43-
* WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
44-
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
45-
* OTHER DEALINGS IN THE SOFTWARE.
464
*/
475

486
/dts-v1/;

arch/arm/boot/dts/nxp/imx/imx6q-gw553x.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 2016 Gateworks Corporation
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 as
11-
* published by the Free Software Foundation; either version 2 of
12-
* the License, or (at your option) any later version.
13-
*
14-
* This file is distributed in the hope that it will be useful,
15-
* but WITHOUT ANY WARRANTY; without even the implied warranty of
16-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
17-
* GNU General Public License for more details.
18-
*
19-
* You should have received a copy of the GNU General Public
20-
* License along with this file; if not, write to the Free
21-
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
22-
* MA 02110-1301 USA
23-
*
24-
* Or, alternatively,
25-
*
26-
* b) Permission is hereby granted, free of charge, to any person
27-
* obtaining a copy of this software and associated documentation
28-
* files (the "Software"), to deal in the Software without
29-
* restriction, including without limitation the rights to use,
30-
* copy, modify, merge, publish, distribute, sublicense, and/or
31-
* sell copies of the Software, and to permit persons to whom the
32-
* Software is furnished to do so, subject to the following
33-
* conditions:
34-
*
35-
* The above copyright notice and this permission notice shall be
36-
* included in all copies or substantial portions of the Software.
37-
*
38-
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
39-
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
40-
* OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
41-
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
42-
* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
43-
* WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
44-
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
45-
* OTHER DEALINGS IN THE SOFTWARE.
464
*/
475

486
/dts-v1/;

arch/arm/boot/dts/nxp/imx/imx6q-gw560x.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 2017 Gateworks Corporation
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 as
11-
* published by the Free Software Foundation; either version 2 of
12-
* the License, or (at your option) any later version.
13-
*
14-
* This file is distributed in the hope that it will be useful,
15-
* but WITHOUT ANY WARRANTY; without even the implied warranty of
16-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
17-
* GNU General Public License for more details.
18-
*
19-
* You should have received a copy of the GNU General Public
20-
* License along with this file; if not, write to the Free
21-
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
22-
* MA 02110-1301 USA
23-
*
24-
* Or, alternatively,
25-
*
26-
* b) Permission is hereby granted, free of charge, to any person
27-
* obtaining a copy of this software and associated documentation
28-
* files (the "Software"), to deal in the Software without
29-
* restriction, including without limitation the rights to use,
30-
* copy, modify, merge, publish, distribute, sublicense, and/or
31-
* sell copies of the Software, and to permit persons to whom the
32-
* Software is furnished to do so, subject to the following
33-
* conditions:
34-
*
35-
* The above copyright notice and this permission notice shall be
36-
* included in all copies or substantial portions of the Software.
37-
*
38-
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
39-
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
40-
* OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
41-
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
42-
* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
43-
* WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
44-
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
45-
* OTHER DEALINGS IN THE SOFTWARE.
464
*/
475

486
/dts-v1/;

0 commit comments

Comments
 (0)