* [PATCH 2/7] ARM: dts: imx6: pcaaxl3: Update license and model description
2019-12-09 9:01 [PATCH 1/7] ARM: dts: imx6: pcaaxl3: Order nodes alphabetically Stefan Riedmueller
@ 2019-12-09 9:01 ` Stefan Riedmueller
2019-12-09 10:20 ` Roland Hieber
2019-12-09 9:01 ` [PATCH 3/7] ARM: dts: imx6: pcaaxl3: Make use of the simpler name phycard Stefan Riedmueller
` (4 subsequent siblings)
5 siblings, 1 reply; 9+ messages in thread
From: Stefan Riedmueller @ 2019-12-09 9:01 UTC (permalink / raw)
To: barebox
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
- *
- * 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>
*/
#include <arm/imx6q.dtsi>
#include "imx6q.dtsi"
/ {
- model = "Phytec phyCARD-i.MX6 Quad";
- compatible = "phytec,imx6q-pcaaxl3", "fsl,imx6q";
-
chosen {
environment-nand {
compatible = "barebox,environment";
--
2.7.4
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PATCH 2/7] ARM: dts: imx6: pcaaxl3: Update license and model description
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
0 siblings, 1 reply; 9+ messages in thread
From: Roland Hieber @ 2019-12-09 10:20 UTC (permalink / raw)
To: Stefan Riedmueller; +Cc: barebox
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?
- Roland
> chosen {
> environment-nand {
> compatible = "barebox,environment";
> --
> 2.7.4
>
>
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox
>
--
Roland Hieber, Pengutronix e.K. | r.hieber@pengutronix.de |
Steuerwalder Str. 21 | https://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PATCH 2/7] ARM: dts: imx6: pcaaxl3: Update license and model description
2019-12-09 10:20 ` Roland Hieber
@ 2019-12-09 10:48 ` Stefan Riedmüller
0 siblings, 0 replies; 9+ messages in thread
From: Stefan Riedmüller @ 2019-12-09 10:48 UTC (permalink / raw)
To: Roland Hieber; +Cc: barebox
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
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH 3/7] ARM: dts: imx6: pcaaxl3: Make use of the simpler name phycard
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 9:01 ` Stefan Riedmueller
2019-12-09 9:01 ` [PATCH 4/7] ARM: dts: imx6: phycard: Make eeprom configurable Stefan Riedmueller
` (3 subsequent siblings)
5 siblings, 0 replies; 9+ messages in thread
From: Stefan Riedmueller @ 2019-12-09 9:01 UTC (permalink / raw)
To: barebox
Use the simpler name phycard instead of the article number pcaaxl3
for device tree file names and image names of the phyCARD-i.MX 6.
Signed-off-by: Stefan Riedmueller <s.riedmueller@phytec.de>
---
arch/arm/boards/phytec-som-imx6/lowlevel.c | 6 ++---
arch/arm/dts/Makefile | 2 +-
...-phytec-pbaa03.dts => imx6q-phytec-phycard.dts} | 2 +-
...caaxl3.dtsi => imx6qdl-phytec-phycard-som.dtsi} | 0
images/Makefile.imx | 28 +++++++++++-----------
5 files changed, 19 insertions(+), 19 deletions(-)
rename arch/arm/dts/{imx6q-phytec-pbaa03.dts => imx6q-phytec-phycard.dts} (90%)
rename arch/arm/dts/{imx6q-phytec-pcaaxl3.dtsi => imx6qdl-phytec-phycard-som.dtsi} (100%)
diff --git a/arch/arm/boards/phytec-som-imx6/lowlevel.c b/arch/arm/boards/phytec-som-imx6/lowlevel.c
index 2de84169c692..900aa19c19ea 100644
--- a/arch/arm/boards/phytec-som-imx6/lowlevel.c
+++ b/arch/arm/boards/phytec-som-imx6/lowlevel.c
@@ -90,9 +90,9 @@ static void __noreturn start_imx6_phytec_common(uint32_t size,
__dtb_##fdt_name##_start); \
}
-PHYTEC_ENTRY(start_phytec_pbaa03_1gib, imx6q_phytec_pbaa03, SZ_1G, true);
-PHYTEC_ENTRY(start_phytec_pbaa03_1gib_1bank, imx6q_phytec_pbaa03, SZ_1G, true);
-PHYTEC_ENTRY(start_phytec_pbaa03_2gib, imx6q_phytec_pbaa03, SZ_2G, true);
+PHYTEC_ENTRY(start_phytec_phycard_imx6q_1gib, imx6q_phytec_phycard, SZ_1G, true);
+PHYTEC_ENTRY(start_phytec_phycard_imx6q_1gib_1bank, imx6q_phytec_phycard, SZ_1G, true);
+PHYTEC_ENTRY(start_phytec_phycard_imx6q_2gib, imx6q_phytec_phycard, SZ_2G, true);
PHYTEC_ENTRY(start_phytec_pbab01_512mb_1bank, imx6q_phytec_pbab01, SZ_512M, true);
PHYTEC_ENTRY(start_phytec_pbab01_1gib, imx6q_phytec_pbab01, SZ_1G, true);
diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
index 294a0bfa5525..5f854bd22f2f 100644
--- a/arch/arm/dts/Makefile
+++ b/arch/arm/dts/Makefile
@@ -51,7 +51,7 @@ lwl-dtb-$(CONFIG_MACH_PHYTEC_SOM_AM335X) += am335x-phytec-phyflex-som.dtb.o am33
am335x-phytec-phycore-som-nand-no-eeprom.dtb.o am335x-phytec-phycore-som-nand-no-spi-no-eeprom.dtb.o \
am335x-phytec-phycore-som-emmc.dtb.o \
am335x-phytec-phycard-som.dtb.o am335x-phytec-phycard-som-mlo.dtb.o
-lwl-dtb-$(CONFIG_MACH_PHYTEC_SOM_IMX6) += imx6q-phytec-pbaa03.dtb.o \
+lwl-dtb-$(CONFIG_MACH_PHYTEC_SOM_IMX6) += imx6q-phytec-phycard.dtb.o \
imx6s-phytec-pbab01.dtb.o \
imx6dl-phytec-pbab01.dtb.o \
imx6q-phytec-pbab01.dtb.o \
diff --git a/arch/arm/dts/imx6q-phytec-pbaa03.dts b/arch/arm/dts/imx6q-phytec-phycard.dts
similarity index 90%
rename from arch/arm/dts/imx6q-phytec-pbaa03.dts
rename to arch/arm/dts/imx6q-phytec-phycard.dts
index b11b8b3f93fe..cfcdcd2a1343 100644
--- a/arch/arm/dts/imx6q-phytec-pbaa03.dts
+++ b/arch/arm/dts/imx6q-phytec-phycard.dts
@@ -5,7 +5,7 @@
*/
/dts-v1/;
-#include "imx6q-phytec-pcaaxl3.dtsi"
+#include "imx6qdl-phytec-phycard-som.dtsi"
/ {
model = "PHYTEC phyCARD-i.MX6 Quad";
diff --git a/arch/arm/dts/imx6q-phytec-pcaaxl3.dtsi b/arch/arm/dts/imx6qdl-phytec-phycard-som.dtsi
similarity index 100%
rename from arch/arm/dts/imx6q-phytec-pcaaxl3.dtsi
rename to arch/arm/dts/imx6qdl-phytec-phycard-som.dtsi
diff --git a/images/Makefile.imx b/images/Makefile.imx
index a8f8a9b7d622..fea43e0e5516 100644
--- a/images/Makefile.imx
+++ b/images/Makefile.imx
@@ -416,20 +416,20 @@ CFG_start_imx6s_riotboard.pblb.imximg = $(board)/embest-riotboard/flash-header-e
FILE_barebox-embest-imx6s-riotboard.img = start_imx6s_riotboard.pblb.imximg
image-$(CONFIG_MACH_EMBEST_RIOTBOARD) += barebox-embest-imx6s-riotboard.img
-pblb-$(CONFIG_MACH_PHYTEC_SOM_IMX6) += start_phytec_pbaa03_1gib
-CFG_start_phytec_pbaa03_1gib.pblb.imximg = $(board)/phytec-som-imx6/flash-header-phytec-pcaaxl3-1gib.imxcfg
-FILE_barebox-phytec-pbaa03-1gib.img = start_phytec_pbaa03_1gib.pblb.imximg
-image-$(CONFIG_MACH_PHYTEC_SOM_IMX6) += barebox-phytec-pbaa03-1gib.img
-
-pblb-$(CONFIG_MACH_PHYTEC_SOM_IMX6) += start_phytec_pbaa03_1gib_1bank
-CFG_start_phytec_pbaa03_1gib_1bank.pblb.imximg = $(board)/phytec-som-imx6/flash-header-phytec-pcaaxl3-1gib-1bank.imxcfg
-FILE_barebox-phytec-pbaa03-1gib-1bank.img = start_phytec_pbaa03_1gib_1bank.pblb.imximg
-image-$(CONFIG_MACH_PHYTEC_SOM_IMX6) += barebox-phytec-pbaa03-1gib-1bank.img
-
-pblb-$(CONFIG_MACH_PHYTEC_SOM_IMX6) += start_phytec_pbaa03_2gib
-CFG_start_phytec_pbaa03_2gib.pblb.imximg = $(board)/phytec-som-imx6/flash-header-phytec-pcaaxl3-2gib.imxcfg
-FILE_barebox-phytec-pbaa03-2gib.img = start_phytec_pbaa03_2gib.pblb.imximg
-image-$(CONFIG_MACH_PHYTEC_SOM_IMX6) += barebox-phytec-pbaa03-2gib.img
+pblb-$(CONFIG_MACH_PHYTEC_SOM_IMX6) += start_phytec_phycard_imx6q_1gib
+CFG_start_phytec_phycard_imx6q_1gib.pblb.imximg = $(board)/phytec-som-imx6/flash-header-phytec-pcaaxl3-1gib.imxcfg
+FILE_barebox-phytec-phycard-imx6q-1gib.img = start_phytec_phycard_imx6q_1gib.pblb.imximg
+image-$(CONFIG_MACH_PHYTEC_SOM_IMX6) += barebox-phytec-phycard-imx6q-1gib.img
+
+pblb-$(CONFIG_MACH_PHYTEC_SOM_IMX6) += start_phytec_phycard_imx6q_1gib_1bank
+CFG_start_phytec_phycard_imx6q_1gib_1bank.pblb.imximg = $(board)/phytec-som-imx6/flash-header-phytec-pcaaxl3-1gib-1bank.imxcfg
+FILE_barebox-phytec-phycard-imx6q-1gib-1bank.img = start_phytec_phycard_imx6q_1gib_1bank.pblb.imximg
+image-$(CONFIG_MACH_PHYTEC_SOM_IMX6) += barebox-phytec-phycard-imx6q-1gib-1bank.img
+
+pblb-$(CONFIG_MACH_PHYTEC_SOM_IMX6) += start_phytec_phycard_imx6q_2gib
+CFG_start_phytec_phycard_imx6q_2gib.pblb.imximg = $(board)/phytec-som-imx6/flash-header-phytec-pcaaxl3-2gib.imxcfg
+FILE_barebox-phytec-phycard-imx6q-2gib.img = start_phytec_phycard_imx6q_2gib.pblb.imximg
+image-$(CONFIG_MACH_PHYTEC_SOM_IMX6) += barebox-phytec-phycard-imx6q-2gib.img
pblb-$(CONFIG_MACH_PHYTEC_SOM_IMX6) += start_phytec_phycore_imx6q_som_nand_1gib
CFG_start_phytec_phycore_imx6q_som_nand_1gib.pblb.imximg = $(board)/phytec-som-imx6/flash-header-phytec-pcm058-1gib.imxcfg
--
2.7.4
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 9+ messages in thread* [PATCH 4/7] ARM: dts: imx6: phycard: Make eeprom configurable
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 9:01 ` [PATCH 3/7] ARM: dts: imx6: pcaaxl3: Make use of the simpler name phycard Stefan Riedmueller
@ 2019-12-09 9:01 ` Stefan Riedmueller
2019-12-09 9:01 ` [PATCH 5/7] ARM: dts: imx6: phycard: Use partname for environment device-path Stefan Riedmueller
` (2 subsequent siblings)
5 siblings, 0 replies; 9+ messages in thread
From: Stefan Riedmueller @ 2019-12-09 9:01 UTC (permalink / raw)
To: barebox
The EEPROM is a configurable option. So make it configurable from the
dts file.
Signed-off-by: Stefan Riedmueller <s.riedmueller@phytec.de>
---
arch/arm/dts/imx6q-phytec-phycard.dts | 4 ++++
arch/arm/dts/imx6qdl-phytec-phycard-som.dtsi | 1 +
2 files changed, 5 insertions(+)
diff --git a/arch/arm/dts/imx6q-phytec-phycard.dts b/arch/arm/dts/imx6q-phytec-phycard.dts
index cfcdcd2a1343..f06acb010095 100644
--- a/arch/arm/dts/imx6q-phytec-phycard.dts
+++ b/arch/arm/dts/imx6q-phytec-phycard.dts
@@ -16,6 +16,10 @@
};
};
+&eeprom {
+ status = "okay";
+};
+
&fec {
status = "okay";
};
diff --git a/arch/arm/dts/imx6qdl-phytec-phycard-som.dtsi b/arch/arm/dts/imx6qdl-phytec-phycard-som.dtsi
index 5e0495996d52..78fc0c719637 100644
--- a/arch/arm/dts/imx6qdl-phytec-phycard-som.dtsi
+++ b/arch/arm/dts/imx6qdl-phytec-phycard-som.dtsi
@@ -66,6 +66,7 @@
eeprom: m24c32@50 {
compatible = "st,24c32", "at24";
reg = <0x50>;
+ status = "disabled";
};
};
--
2.7.4
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 9+ messages in thread* [PATCH 5/7] ARM: dts: imx6: phycard: Use partname for environment device-path
2019-12-09 9:01 [PATCH 1/7] ARM: dts: imx6: pcaaxl3: Order nodes alphabetically Stefan Riedmueller
` (2 preceding siblings ...)
2019-12-09 9:01 ` [PATCH 4/7] ARM: dts: imx6: phycard: Make eeprom configurable Stefan Riedmueller
@ 2019-12-09 9:01 ` 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
5 siblings, 0 replies; 9+ messages in thread
From: Stefan Riedmueller @ 2019-12-09 9:01 UTC (permalink / raw)
To: barebox
Change environment device-path from using a separate label to
referencing a device plus partname.
Signed-off-by: Stefan Riedmueller <s.riedmueller@phytec.de>
---
arch/arm/dts/imx6qdl-phytec-phycard-som.dtsi | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/arch/arm/dts/imx6qdl-phytec-phycard-som.dtsi b/arch/arm/dts/imx6qdl-phytec-phycard-som.dtsi
index 78fc0c719637..c28076294092 100644
--- a/arch/arm/dts/imx6qdl-phytec-phycard-som.dtsi
+++ b/arch/arm/dts/imx6qdl-phytec-phycard-som.dtsi
@@ -11,13 +11,13 @@
chosen {
environment-nand {
compatible = "barebox,environment";
- device-path = &environment_nand;
+ device-path = &gpmi, "partname:barebox-environment";
status = "disabled";
};
environment-sd3 {
compatible = "barebox,environment";
- device-path = &environment_usdhc3;
+ device-path = &usdhc3, "partname:barebox-environment";
status = "disabled";
};
};
@@ -46,7 +46,7 @@
reg = <0x0 0x400000>;
};
- environment_nand: partition@400000 {
+ partition@400000 {
label = "barebox-environment";
reg = <0x400000 0x20000>;
};
@@ -168,7 +168,8 @@
label = "barebox";
reg = <0x0 0xe0000>;
};
- environment_usdhc3: partition@e0000 {
+
+ partition@e0000 {
label = "barebox-environment";
reg = <0xe0000 0x20000>;
};
--
2.7.4
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 9+ messages in thread* [PATCH 6/7] ARM: dts: imx6: phycard: Switch to new partitions binding
2019-12-09 9:01 [PATCH 1/7] ARM: dts: imx6: pcaaxl3: Order nodes alphabetically Stefan Riedmueller
` (3 preceding siblings ...)
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 ` Stefan Riedmueller
2019-12-09 9:01 ` [PATCH 7/7] ARM: dts: imx6: phytec: Increase NAND barebox partition size Stefan Riedmueller
5 siblings, 0 replies; 9+ messages in thread
From: Stefan Riedmueller @ 2019-12-09 9:01 UTC (permalink / raw)
To: barebox
The SD card interface is still using the legacy partition binding.
Change this by switching to the new bindings.
Signed-off-by: Stefan Riedmueller <s.riedmueller@phytec.de>
---
arch/arm/dts/imx6qdl-phytec-phycard-som.dtsi | 21 ++++++++++++---------
1 file changed, 12 insertions(+), 9 deletions(-)
diff --git a/arch/arm/dts/imx6qdl-phytec-phycard-som.dtsi b/arch/arm/dts/imx6qdl-phytec-phycard-som.dtsi
index c28076294092..d607bfd0d95f 100644
--- a/arch/arm/dts/imx6qdl-phytec-phycard-som.dtsi
+++ b/arch/arm/dts/imx6qdl-phytec-phycard-som.dtsi
@@ -161,16 +161,19 @@
cd-gpios = <&gpio5 22 0>;
status = "disabled";
- #address-cells = <1>;
- #size-cells = <1>;
+ partitions {
+ compatible = "fixed-partitions";
+ #address-cells = <1>;
+ #size-cells = <1>;
- partition@0 {
- label = "barebox";
- reg = <0x0 0xe0000>;
- };
+ partition@0 {
+ label = "barebox";
+ reg = <0x0 0xe0000>;
+ };
- partition@e0000 {
- label = "barebox-environment";
- reg = <0xe0000 0x20000>;
+ partition@e0000 {
+ label = "barebox-environment";
+ reg = <0xe0000 0x20000>;
+ };
};
};
--
2.7.4
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 9+ messages in thread* [PATCH 7/7] ARM: dts: imx6: phytec: Increase NAND barebox partition size
2019-12-09 9:01 [PATCH 1/7] ARM: dts: imx6: pcaaxl3: Order nodes alphabetically Stefan Riedmueller
` (4 preceding siblings ...)
2019-12-09 9:01 ` [PATCH 6/7] ARM: dts: imx6: phycard: Switch to new partitions binding Stefan Riedmueller
@ 2019-12-09 9:01 ` Stefan Riedmueller
5 siblings, 0 replies; 9+ messages in thread
From: Stefan Riedmueller @ 2019-12-09 9:01 UTC (permalink / raw)
To: barebox
For NAND flash with eraseblock size 1 MB and more the current
barebox partition size is not sufficient. The 4 FCB copies alone occupy
the 4 MB partition size. Increase the partition size to 16 MB to be fit
for the future and leaving some blocks for bad block handling as well.
Signed-off-by: Stefan Riedmueller <s.riedmueller@phytec.de>
---
arch/arm/dts/imx6qdl-phytec-pfla02.dtsi | 6 +++---
arch/arm/dts/imx6qdl-phytec-phycard-som.dtsi | 6 +++---
arch/arm/dts/imx6qdl-phytec-phycore-som.dtsi | 6 +++---
3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/arch/arm/dts/imx6qdl-phytec-pfla02.dtsi b/arch/arm/dts/imx6qdl-phytec-pfla02.dtsi
index 846ebbe6b18b..841ad653b26d 100644
--- a/arch/arm/dts/imx6qdl-phytec-pfla02.dtsi
+++ b/arch/arm/dts/imx6qdl-phytec-pfla02.dtsi
@@ -98,17 +98,17 @@
partition@0 {
label = "barebox";
- reg = <0x0 0x400000>;
+ reg = <0x0 0x1000000>;
};
partition@400000 {
label = "barebox-environment";
- reg = <0x400000 0x100000>;
+ reg = <0x1000000 0x100000>;
};
partition@500000 {
label = "root";
- reg = <0x500000 0x0>;
+ reg = <0x1100000 0x0>;
};
};
};
diff --git a/arch/arm/dts/imx6qdl-phytec-phycard-som.dtsi b/arch/arm/dts/imx6qdl-phytec-phycard-som.dtsi
index d607bfd0d95f..251134424470 100644
--- a/arch/arm/dts/imx6qdl-phytec-phycard-som.dtsi
+++ b/arch/arm/dts/imx6qdl-phytec-phycard-som.dtsi
@@ -43,17 +43,17 @@
partition@0 {
label = "barebox";
- reg = <0x0 0x400000>;
+ reg = <0x0 0x1000000>;
};
partition@400000 {
label = "barebox-environment";
- reg = <0x400000 0x20000>;
+ reg = <0x1000000 0x100000>;
};
partition@420000 {
label = "root";
- reg = <0x420000 0x0>;
+ reg = <0x1100000 0x0>;
};
};
};
diff --git a/arch/arm/dts/imx6qdl-phytec-phycore-som.dtsi b/arch/arm/dts/imx6qdl-phytec-phycore-som.dtsi
index 1d39368165db..2e03c08aa8e5 100644
--- a/arch/arm/dts/imx6qdl-phytec-phycore-som.dtsi
+++ b/arch/arm/dts/imx6qdl-phytec-phycore-som.dtsi
@@ -138,17 +138,17 @@
partition@0 {
label = "barebox";
- reg = <0x0 0x400000>;
+ reg = <0x0 0x1000000>;
};
partition@400000 {
label = "barebox-environment";
- reg = <0x400000 0x100000>;
+ reg = <0x1000000 0x100000>;
};
partition@500000 {
label = "root";
- reg = <0x500000 0x0>;
+ reg = <0x1100000 0x0>;
};
};
};
--
2.7.4
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 9+ messages in thread