With them parentheses removed: Acked-by: Marcel Ziswiler On April 10, 2019 9:10:06 AM GMT+02:00, Igor Opaniuk wrote: >Replace boiler plate licenses texts with the SPDX license >identifiers in Colibri/Apalis DTS files. > >Signed-off-by: Igor Opaniuk >--- > arch/arm/boot/dts/imx6q-apalis-eval.dts | 40 +----------------- > arch/arm/boot/dts/imx6q-apalis-ixora-v1.1.dts | 40 +----------------- > arch/arm/boot/dts/imx6q-apalis-ixora.dts | 40 +----------------- > arch/arm/boot/dts/imx6qdl-apalis.dtsi | 40 +----------------- > arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi | 39 +----------------- > arch/arm/boot/dts/imx7-colibri.dtsi | 39 +----------------- > arch/arm/boot/dts/imx7d-colibri-eval-v3.dts | 39 +----------------- > arch/arm/boot/dts/imx7d-colibri.dtsi | 41 +------------------ > arch/arm/boot/dts/imx7s-colibri-eval-v3.dts | 41 +------------------ > arch/arm/boot/dts/imx7s-colibri.dtsi | 41 +------------------ > arch/arm/boot/dts/vf-colibri-eval-v3.dtsi | 40 +----------------- > arch/arm/boot/dts/vf-colibri.dtsi | 38 +---------------- > arch/arm/boot/dts/vf500-colibri-eval-v3.dts | 40 +----------------- > arch/arm/boot/dts/vf500-colibri.dtsi | 39 +----------------- > arch/arm/boot/dts/vf610-colibri-eval-v3.dts | 38 +---------------- > arch/arm/boot/dts/vf610-colibri.dtsi | 40 +----------------- > arch/arm/boot/dts/vf610m4-colibri.dts | 40 +----------------- > 17 files changed, 29 insertions(+), 646 deletions(-) > >diff --git a/arch/arm/boot/dts/imx6q-apalis-eval.dts >b/arch/arm/boot/dts/imx6q-apalis-eval.dts >index 0edd3043d9c1..621e9ee5bbeb 100644 >--- a/arch/arm/boot/dts/imx6q-apalis-eval.dts >+++ b/arch/arm/boot/dts/imx6q-apalis-eval.dts >@@ -1,44 +1,8 @@ >+// SPDX-License-Identifier: (GPL-2.0 OR X11) > /* >- * Copyright 2014-2017 Toradex AG >+ * Copyright 2014-2019 Toradex AG > * Copyright 2012 Freescale Semiconductor, Inc. > * Copyright 2011 Linaro Ltd. >- * >- * 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 >- * version 2 as published by the Free Software Foundation. >- * >- * 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. > */ > > /dts-v1/; >diff --git a/arch/arm/boot/dts/imx6q-apalis-ixora-v1.1.dts >b/arch/arm/boot/dts/imx6q-apalis-ixora-v1.1.dts >index b94bb687be6b..1e365e2636c4 100644 >--- a/arch/arm/boot/dts/imx6q-apalis-ixora-v1.1.dts >+++ b/arch/arm/boot/dts/imx6q-apalis-ixora-v1.1.dts >@@ -1,44 +1,8 @@ >+// SPDX-License-Identifier: (GPL-2.0 OR X11) > /* >- * Copyright 2014-2017 Toradex AG >+ * Copyright 2014-2019 Toradex AG > * Copyright 2012 Freescale Semiconductor, Inc. > * Copyright 2011 Linaro Ltd. >- * >- * 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 >- * version 2 as published by the Free Software Foundation. >- * >- * 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. > */ > > /dts-v1/; >diff --git a/arch/arm/boot/dts/imx6q-apalis-ixora.dts >b/arch/arm/boot/dts/imx6q-apalis-ixora.dts >index 302fd6adc8a7..deb5509d3597 100644 >--- a/arch/arm/boot/dts/imx6q-apalis-ixora.dts >+++ b/arch/arm/boot/dts/imx6q-apalis-ixora.dts >@@ -1,44 +1,8 @@ >+// SPDX-License-Identifier: (GPL-2.0 OR X11) > /* >- * Copyright 2014-2017 Toradex AG >+ * Copyright 2014-2019 Toradex AG > * Copyright 2012 Freescale Semiconductor, Inc. > * Copyright 2011 Linaro Ltd. >- * >- * 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 >- * version 2 as published by the Free Software Foundation. >- * >- * 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. > */ > > /dts-v1/; >diff --git a/arch/arm/boot/dts/imx6qdl-apalis.dtsi >b/arch/arm/boot/dts/imx6qdl-apalis.dtsi >index 7c4ad541c3f5..031c021a7fc5 100644 >--- a/arch/arm/boot/dts/imx6qdl-apalis.dtsi >+++ b/arch/arm/boot/dts/imx6qdl-apalis.dtsi >@@ -1,44 +1,8 @@ >+// SPDX-License-Identifier: (GPL-2.0 OR X11) > /* >- * Copyright 2014-2017 Toradex AG >+ * Copyright 2014-2019 Toradex AG > * Copyright 2012 Freescale Semiconductor, Inc. > * Copyright 2011 Linaro Ltd. >- * >- * 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 >- * version 2 as published by the Free Software Foundation. >- * >- * 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. > */ > > #include >diff --git a/arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi >b/arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi >index 3f2746169181..43b6be76941b 100644 >--- a/arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi >+++ b/arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi >@@ -1,43 +1,6 @@ >+// SPDX-License-Identifier: (GPL-2.0+ OR X11) > /* > * Copyright 2016 Toradex AG >- * >- * 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. > */ > > / { >diff --git a/arch/arm/boot/dts/imx7-colibri.dtsi >b/arch/arm/boot/dts/imx7-colibri.dtsi >index 895fbde4d433..c53e9576813b 100644 >--- a/arch/arm/boot/dts/imx7-colibri.dtsi >+++ b/arch/arm/boot/dts/imx7-colibri.dtsi >@@ -1,43 +1,6 @@ >+// SPDX-License-Identifier: (GPL-2.0+ OR X11) > /* > * Copyright 2016 Toradex AG >- * >- * 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. > */ > > / { >diff --git a/arch/arm/boot/dts/imx7d-colibri-eval-v3.dts >b/arch/arm/boot/dts/imx7d-colibri-eval-v3.dts >index 136e11ab4893..5077ec355725 100644 >--- a/arch/arm/boot/dts/imx7d-colibri-eval-v3.dts >+++ b/arch/arm/boot/dts/imx7d-colibri-eval-v3.dts >@@ -1,43 +1,6 @@ >+// SPDX-License-Identifier: (GPL-2.0+ OR X11) > /* > * Copyright 2016 Toradex AG >- * >- * 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. > */ > > /dts-v1/; >diff --git a/arch/arm/boot/dts/imx7d-colibri.dtsi >b/arch/arm/boot/dts/imx7d-colibri.dtsi >index e2e327f437e3..fc5573171114 100644 >--- a/arch/arm/boot/dts/imx7d-colibri.dtsi >+++ b/arch/arm/boot/dts/imx7d-colibri.dtsi >@@ -1,43 +1,6 @@ >+// SPDX-License-Identifier: (GPL-2.0+ OR X11) > /* >- * Copyright 2016 Toradex AG >- * >- * 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. >+ * Copyright 2016-2019 Toradex AG > */ > > #include "imx7d.dtsi" >diff --git a/arch/arm/boot/dts/imx7s-colibri-eval-v3.dts >b/arch/arm/boot/dts/imx7s-colibri-eval-v3.dts >index bd2a49c1ade6..c12bb60b6acb 100644 >--- a/arch/arm/boot/dts/imx7s-colibri-eval-v3.dts >+++ b/arch/arm/boot/dts/imx7s-colibri-eval-v3.dts >@@ -1,43 +1,6 @@ >+// SPDX-License-Identifier: (GPL-2.0+ OR X11) > /* >- * Copyright 2016 Toradex AG >- * >- * 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. >+ * Copyright 2016-2019 Toradex AG > */ > > /dts-v1/; >diff --git a/arch/arm/boot/dts/imx7s-colibri.dtsi >b/arch/arm/boot/dts/imx7s-colibri.dtsi >index 1fb1ec5d3d70..3f3e0fbc8597 100644 >--- a/arch/arm/boot/dts/imx7s-colibri.dtsi >+++ b/arch/arm/boot/dts/imx7s-colibri.dtsi >@@ -1,43 +1,6 @@ >+// SPDX-License-Identifier: (GPL-2.0+ OR X11) > /* >- * Copyright 2016 Toradex AG >- * >- * 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. >+ * Copyright 2016-2019 Toradex AG > */ > > #include "imx7s.dtsi" >diff --git a/arch/arm/boot/dts/vf-colibri-eval-v3.dtsi >b/arch/arm/boot/dts/vf-colibri-eval-v3.dtsi >index e2da122a63f4..e5337a93c3d1 100644 >--- a/arch/arm/boot/dts/vf-colibri-eval-v3.dtsi >+++ b/arch/arm/boot/dts/vf-colibri-eval-v3.dtsi >@@ -1,42 +1,6 @@ >+// SPDX-License-Identifier: (GPL-2.0 OR X11) > /* >- * Copyright 2014 Toradex AG >- * >- * 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 >- * version 2 as published by the Free Software Foundation. >- * >- * 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. >+ * Copyright 2014-2016 Toradex AG > */ > > / { >diff --git a/arch/arm/boot/dts/vf-colibri.dtsi >b/arch/arm/boot/dts/vf-colibri.dtsi >index b6a1eeeb2bb4..34a93fe90a5c 100644 >--- a/arch/arm/boot/dts/vf-colibri.dtsi >+++ b/arch/arm/boot/dts/vf-colibri.dtsi >@@ -1,42 +1,6 @@ >+// SPDX-License-Identifier: (GPL-2.0 OR X11) > /* > * Copyright 2014 Toradex AG >- * >- * 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 >- * version 2 as published by the Free Software Foundation. >- * >- * 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. > */ > > / { >diff --git a/arch/arm/boot/dts/vf500-colibri-eval-v3.dts >b/arch/arm/boot/dts/vf500-colibri-eval-v3.dts >index 076998968fb5..a4b97e9d22d9 100644 >--- a/arch/arm/boot/dts/vf500-colibri-eval-v3.dts >+++ b/arch/arm/boot/dts/vf500-colibri-eval-v3.dts >@@ -1,42 +1,6 @@ >+// SPDX-License-Identifier: (GPL-2.0 OR X11) > /* >- * Copyright 2014 Toradex AG >- * >- * 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 >- * version 2 as published by the Free Software Foundation. >- * >- * 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. >+ * Copyright 2014-2019 Toradex AG > */ > > /dts-v1/; >diff --git a/arch/arm/boot/dts/vf500-colibri.dtsi >b/arch/arm/boot/dts/vf500-colibri.dtsi >index 237b0246fa84..54e96b311a48 100644 >--- a/arch/arm/boot/dts/vf500-colibri.dtsi >+++ b/arch/arm/boot/dts/vf500-colibri.dtsi >@@ -1,42 +1,7 @@ >+// SPDX-License-Identifier: (GPL-2.0 OR X11) > /* >- * Copyright 2014 Toradex AG >+ * Copyright 2014-2019 Toradex AG > * >- * This file is dual-licensed: you can use it either under the terms >- -- Sent from my Android device with K-9 Mail. Please excuse my brevity.