From: "Stefan Riedmüller" <s.riedmueller@phytec.de>
To: Roland Hieber <rhi@pengutronix.de>
Cc: barebox@lists.infradead.org
Subject: Re: [PATCH 2/7] ARM: dts: imx6: pcaaxl3: Update license and model description
Date: Mon, 9 Dec 2019 11:48:55 +0100 [thread overview]
Message-ID: <6a2b5330-ecb7-a6d2-3fca-ee05b54662e6@phytec.de> (raw)
In-Reply-To: <20191209102059.hq3ujnzcqwh3g63t@pengutronix.de>
Hi Roland,
On 09.12.19 11:20, Roland Hieber wrote:
> On Mon, Dec 09, 2019 at 10:01:43AM +0100, Stefan Riedmueller wrote:
>> Make use of SPDX license identifiers and update copyright notices and
>> model descriptions of the phyCARD-i.MX 6 SOM.
>>
>> Signed-off-by: Stefan Riedmueller <s.riedmueller@phytec.de>
>> ---
>> arch/arm/dts/imx6q-phytec-pbaa03.dts | 13 ++++---------
>> arch/arm/dts/imx6q-phytec-pcaaxl3.dtsi | 14 +++-----------
>> 2 files changed, 7 insertions(+), 20 deletions(-)
>>
>> diff --git a/arch/arm/dts/imx6q-phytec-pbaa03.dts b/arch/arm/dts/imx6q-phytec-pbaa03.dts
>> index 4724a02ad7d8..b11b8b3f93fe 100644
>> --- a/arch/arm/dts/imx6q-phytec-pbaa03.dts
>> +++ b/arch/arm/dts/imx6q-phytec-pbaa03.dts
>> @@ -1,19 +1,14 @@
>> +// SPDX-License-Identifier: (GPL-2.0-or-later)
>> /*
>> - * Copyright 2014 Christian Hemp, Phytec Messtechnik GmbH
>> - *
>> - * The code contained herein is licensed under the GNU General Public
>> - * License. You may obtain a copy of the GNU General Public License
>> - * Version 2 or later at the following locations:
>> - *
>> - * http://www.opensource.org/licenses/gpl-license.html
>> - * http://www.gnu.org/copyleft/gpl.html
>> + * Copyright (C) 2014 PHYTEC Messtechnik GmbH
>> + * Author: Christian Hemp <c.hemp@phytec.de>
>> */
>>
>> /dts-v1/;
>> #include "imx6q-phytec-pcaaxl3.dtsi"
>>
>> / {
>> - model = "Phytec phyCARD-i.MX6 Quad Carrier-Board";
>> + model = "PHYTEC phyCARD-i.MX6 Quad";
>> compatible = "phytec,imx6q-pbaa03", "phytec,imx6q-pcaaxl3", "fsl,imx6q";
>>
>> chosen {
>> diff --git a/arch/arm/dts/imx6q-phytec-pcaaxl3.dtsi b/arch/arm/dts/imx6q-phytec-pcaaxl3.dtsi
>> index db986f87ef26..5e0495996d52 100644
>> --- a/arch/arm/dts/imx6q-phytec-pcaaxl3.dtsi
>> +++ b/arch/arm/dts/imx6q-phytec-pcaaxl3.dtsi
>> @@ -1,21 +1,13 @@
>> +// SPDX-License-Identifier: (GPL-2.0-or-later)
>> /*
>> - * Copyright 2014444 Christian Hemp, Phytec Messtechnik GmbH
>
> Oh, code from the future :)
>
>> - *
>> - * The code contained herein is licensed under the GNU General Public
>> - * License. You may obtain a copy of the GNU General Public License
>> - * Version 2 or later at the following locations:
>> - *
>> - * http://www.opensource.org/licenses/gpl-license.html
>> - * http://www.gnu.org/copyleft/gpl.html
>> + * Copyright (C) 2014 PHYTEC Messtechnik GmbH
>> + * Author: Christian Hemp <c.hemp@phytec.de>
>> */
>
> For the license part:
> Reviewed-by: Roland Hieber <rhi@pengutronix.de>
>
>>
>> #include <arm/imx6q.dtsi>
>> #include "imx6q.dtsi"
>>
>> / {
>> - model = "Phytec phyCARD-i.MX6 Quad";
>> - compatible = "phytec,imx6q-pcaaxl3", "fsl,imx6q";
>> -
>
> ... but this looks like an accidental change to me, or did you really
> want to have a device tree without a compatible?
Actually, yes I did. In one of the other patches the file gets renamed to an
imx6qdl-* file to show the possibility to use it with an i.MX
6DualLight/Solo as well. So the compatible is decided in another file. But
maybe I should put this hunk into the other patch. I just found another
thing myself so I will send a v2 anyway.
Regards,
Stefan
>
> - Roland
>
>> chosen {
>> environment-nand {
>> compatible = "barebox,environment";
>> --
>> 2.7.4
>>
>>
>> _______________________________________________
>> barebox mailing list
>> barebox@lists.infradead.org
>> http://lists.infradead.org/mailman/listinfo/barebox
>>
>
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
next prev parent reply other threads:[~2019-12-09 10:49 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-09 9:01 [PATCH 1/7] ARM: dts: imx6: pcaaxl3: Order nodes alphabetically Stefan Riedmueller
2019-12-09 9:01 ` [PATCH 2/7] ARM: dts: imx6: pcaaxl3: Update license and model description Stefan Riedmueller
2019-12-09 10:20 ` Roland Hieber
2019-12-09 10:48 ` Stefan Riedmüller [this message]
2019-12-09 9:01 ` [PATCH 3/7] ARM: dts: imx6: pcaaxl3: Make use of the simpler name phycard Stefan Riedmueller
2019-12-09 9:01 ` [PATCH 4/7] ARM: dts: imx6: phycard: Make eeprom configurable Stefan Riedmueller
2019-12-09 9:01 ` [PATCH 5/7] ARM: dts: imx6: phycard: Use partname for environment device-path Stefan Riedmueller
2019-12-09 9:01 ` [PATCH 6/7] ARM: dts: imx6: phycard: Switch to new partitions binding Stefan Riedmueller
2019-12-09 9:01 ` [PATCH 7/7] ARM: dts: imx6: phytec: Increase NAND barebox partition size Stefan Riedmueller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=6a2b5330-ecb7-a6d2-3fca-ee05b54662e6@phytec.de \
--to=s.riedmueller@phytec.de \
--cc=barebox@lists.infradead.org \
--cc=rhi@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox