mail archive of the barebox mailing list
 help / color / mirror / Atom feed
* [PATCH 00/10] Rework towards phytec-som-imx6 and new variants
@ 2015-11-06 10:21 Stefan Christ
  2015-11-06 10:21 ` [PATCH 01/10] ARM: imx6: phycard: use numeric suffix in device tree Stefan Christ
                   ` (10 more replies)
  0 siblings, 11 replies; 16+ messages in thread
From: Stefan Christ @ 2015-11-06 10:21 UTC (permalink / raw)
  To: barebox

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset=y, Size: 8283 bytes --]

Hi,

the patchstack first refactors the phyCARD-i.MX6 and phyFLEX-i.MX6 to a common
phytec-som-imx6. Then some phyFLEX-i.MX6 variants and the new phyCORE-i.MX6 are
added plus some environment updates and one image rename patch.

Mit freundlichen Grüßen / Kind regards,
        Stefan Christ


Christian Hemp (3):
  ARM: phytec-som-imx6: update environment
  ARM: imx6q: Add support for Phytec phyCORE-i.MX6 SOM
  ARM: imx6dl: Add support for Phytec phyCORE-i.MX6 SOM

Stefan Christ (7):
  ARM: imx6: phycard: use numeric suffix in device tree
  boards: Add phytec-som-imx6
  ARM: phytec-som-imx6: set loadaddr to start of DDR memory.
  ARM: pfla02: append suffix 1bank
  ARM: imx6q: pfla02: Add support for 512MiB RAM on one bank
  ARM: imx6dl: pfla02: Add support for 128MB and 256MB RAM
  ARM: imx6q: pfla02: add phyFLEX-i.MX6 DualLite 1GiB on one bank

 arch/arm/boards/Makefile                           |   3 +-
 arch/arm/boards/phytec-phycard-imx6/Makefile       |   3 -
 arch/arm/boards/phytec-phycard-imx6/board.c        |  52 ----
 .../defaultenv-phycard-imx6/boot/nand              |   7 -
 .../defaultenv-phycard-imx6/boot/sd-ext3           |   6 -
 .../defaultenv-phycard-imx6/nv/boot.default        |   1 -
 .../defaultenv-phycard-imx6/nv/hostname            |   1 -
 arch/arm/boards/phytec-phycard-imx6/lowlevel.c     |  69 ------
 arch/arm/boards/phytec-phyflex-imx6/Makefile       |   3 -
 .../defaultenv-phyflex-imx6/boot/sd-ext3           |   6 -
 .../defaultenv-phyflex-imx6/nv/boot.default        |   1 -
 .../defaultenv-phyflex-imx6/nv/hostname            |   1 -
 arch/arm/boards/phytec-som-imx6/Makefile           |   4 +
 .../board.c                                        |  82 ++++---
 .../defaultenv-physom-imx6-mira}/init/automount    |   2 +-
 .../defaultenv-physom-imx6/boot/mmc                |   5 +
 .../defaultenv-physom-imx6}/boot/nand              |   1 -
 .../defaultenv-physom-imx6/boot/spi                |   5 +
 .../defaultenv-physom-imx6}/init/automount         |   0
 .../defaultenv-physom-imx6/init/bootsource         |  15 ++
 .../flash-header-phytec-pcaaxl3-1gib-1bank.imxcfg  |   0
 .../flash-header-phytec-pcaaxl3-1gib.imxcfg        |   0
 .../flash-header-phytec-pcaaxl3-2gib.imxcfg        |   0
 .../flash-header-phytec-pcaaxl3.h                  |   2 +-
 .../flash-header-phytec-pcm058-1gib.imxcfg         |   8 +
 .../phytec-som-imx6/flash-header-phytec-pcm058.h   | 102 ++++++++
 .../flash-header-phytec-pcm058dl-256mb.imxcfg      |   8 +
 .../phytec-som-imx6/flash-header-phytec-pcm058dl.h |  98 ++++++++
 .../flash-header-phytec-pfla02-1gib-1bank.imxcfg   |   0
 .../flash-header-phytec-pfla02-1gib.imxcfg         |   0
 .../flash-header-phytec-pfla02-2gib.imxcfg         |   0
 .../flash-header-phytec-pfla02-4gib.imxcfg         |   0
 .../flash-header-phytec-pfla02-512mb-1bank.imxcfg  |   8 +
 .../flash-header-phytec-pfla02.h                   |   2 +-
 .../flash-header-phytec-pfla02dl-1gib-1bank.imxcfg |   8 +
 .../flash-header-phytec-pfla02dl-1gib.imxcfg       |   0
 .../flash-header-phytec-pfla02dl.h                 |   2 +-
 .../flash-header-phytec-pfla02s-128mb-1bank.imxcfg |   8 +
 .../flash-header-phytec-pfla02s-256mb-1bank.imxcfg |   8 +
 ...flash-header-phytec-pfla02s-512mb-1bank.imxcfg} |   0
 .../lowlevel.c                                     |  30 ++-
 arch/arm/configs/imx_v7_defconfig                  |   3 +-
 arch/arm/dts/Makefile                              |  11 +-
 arch/arm/dts/imx6dl-phytec-phycore-som-nand.dts    |  61 +++++
 arch/arm/dts/imx6q-phytec-pcaaxl3.dtsi             |   2 +-
 arch/arm/dts/imx6q-phytec-phycore-som-emmc.dts     |  50 ++++
 arch/arm/dts/imx6q-phytec-phycore-som-nand.dts     |  72 ++++++
 arch/arm/dts/imx6qdl-phytec-phycore-som.dtsi       | 266 +++++++++++++++++++++
 arch/arm/mach-imx/Kconfig                          |  11 +-
 images/Makefile.imx                                | 109 ++++++---
 50 files changed, 892 insertions(+), 244 deletions(-)
 delete mode 100644 arch/arm/boards/phytec-phycard-imx6/Makefile
 delete mode 100644 arch/arm/boards/phytec-phycard-imx6/board.c
 delete mode 100644 arch/arm/boards/phytec-phycard-imx6/defaultenv-phycard-imx6/boot/nand
 delete mode 100644 arch/arm/boards/phytec-phycard-imx6/defaultenv-phycard-imx6/boot/sd-ext3
 delete mode 100644 arch/arm/boards/phytec-phycard-imx6/defaultenv-phycard-imx6/nv/boot.default
 delete mode 100644 arch/arm/boards/phytec-phycard-imx6/defaultenv-phycard-imx6/nv/hostname
 delete mode 100644 arch/arm/boards/phytec-phycard-imx6/lowlevel.c
 delete mode 100644 arch/arm/boards/phytec-phyflex-imx6/Makefile
 delete mode 100644 arch/arm/boards/phytec-phyflex-imx6/defaultenv-phyflex-imx6/boot/sd-ext3
 delete mode 100644 arch/arm/boards/phytec-phyflex-imx6/defaultenv-phyflex-imx6/nv/boot.default
 delete mode 100644 arch/arm/boards/phytec-phyflex-imx6/defaultenv-phyflex-imx6/nv/hostname
 create mode 100644 arch/arm/boards/phytec-som-imx6/Makefile
 rename arch/arm/boards/{phytec-phyflex-imx6 => phytec-som-imx6}/board.c (61%)
 rename arch/arm/boards/{phytec-phyflex-imx6/defaultenv-phyflex-imx6 => phytec-som-imx6/defaultenv-physom-imx6-mira}/init/automount (73%)
 create mode 100644 arch/arm/boards/phytec-som-imx6/defaultenv-physom-imx6/boot/mmc
 rename arch/arm/boards/{phytec-phyflex-imx6/defaultenv-phyflex-imx6 => phytec-som-imx6/defaultenv-physom-imx6}/boot/nand (93%)
 create mode 100644 arch/arm/boards/phytec-som-imx6/defaultenv-physom-imx6/boot/spi
 rename arch/arm/boards/{phytec-phycard-imx6/defaultenv-phycard-imx6 => phytec-som-imx6/defaultenv-physom-imx6}/init/automount (100%)
 create mode 100644 arch/arm/boards/phytec-som-imx6/defaultenv-physom-imx6/init/bootsource
 rename arch/arm/boards/{phytec-phycard-imx6 => phytec-som-imx6}/flash-header-phytec-pcaaxl3-1gib-1bank.imxcfg (100%)
 rename arch/arm/boards/{phytec-phycard-imx6 => phytec-som-imx6}/flash-header-phytec-pcaaxl3-1gib.imxcfg (100%)
 rename arch/arm/boards/{phytec-phycard-imx6 => phytec-som-imx6}/flash-header-phytec-pcaaxl3-2gib.imxcfg (100%)
 rename arch/arm/boards/{phytec-phycard-imx6 => phytec-som-imx6}/flash-header-phytec-pcaaxl3.h (99%)
 create mode 100644 arch/arm/boards/phytec-som-imx6/flash-header-phytec-pcm058-1gib.imxcfg
 create mode 100644 arch/arm/boards/phytec-som-imx6/flash-header-phytec-pcm058.h
 create mode 100644 arch/arm/boards/phytec-som-imx6/flash-header-phytec-pcm058dl-256mb.imxcfg
 create mode 100644 arch/arm/boards/phytec-som-imx6/flash-header-phytec-pcm058dl.h
 rename arch/arm/boards/{phytec-phyflex-imx6 => phytec-som-imx6}/flash-header-phytec-pfla02-1gib-1bank.imxcfg (100%)
 rename arch/arm/boards/{phytec-phyflex-imx6 => phytec-som-imx6}/flash-header-phytec-pfla02-1gib.imxcfg (100%)
 rename arch/arm/boards/{phytec-phyflex-imx6 => phytec-som-imx6}/flash-header-phytec-pfla02-2gib.imxcfg (100%)
 rename arch/arm/boards/{phytec-phyflex-imx6 => phytec-som-imx6}/flash-header-phytec-pfla02-4gib.imxcfg (100%)
 create mode 100644 arch/arm/boards/phytec-som-imx6/flash-header-phytec-pfla02-512mb-1bank.imxcfg
 rename arch/arm/boards/{phytec-phyflex-imx6 => phytec-som-imx6}/flash-header-phytec-pfla02.h (99%)
 create mode 100644 arch/arm/boards/phytec-som-imx6/flash-header-phytec-pfla02dl-1gib-1bank.imxcfg
 rename arch/arm/boards/{phytec-phyflex-imx6 => phytec-som-imx6}/flash-header-phytec-pfla02dl-1gib.imxcfg (100%)
 rename arch/arm/boards/{phytec-phyflex-imx6 => phytec-som-imx6}/flash-header-phytec-pfla02dl.h (99%)
 create mode 100644 arch/arm/boards/phytec-som-imx6/flash-header-phytec-pfla02s-128mb-1bank.imxcfg
 create mode 100644 arch/arm/boards/phytec-som-imx6/flash-header-phytec-pfla02s-256mb-1bank.imxcfg
 rename arch/arm/boards/{phytec-phyflex-imx6/flash-header-phytec-pfla02s-512mb.imxcfg => phytec-som-imx6/flash-header-phytec-pfla02s-512mb-1bank.imxcfg} (100%)
 rename arch/arm/boards/{phytec-phyflex-imx6 => phytec-som-imx6}/lowlevel.c (56%)
 create mode 100644 arch/arm/dts/imx6dl-phytec-phycore-som-nand.dts
 create mode 100644 arch/arm/dts/imx6q-phytec-phycore-som-emmc.dts
 create mode 100644 arch/arm/dts/imx6q-phytec-phycore-som-nand.dts
 create mode 100644 arch/arm/dts/imx6qdl-phytec-phycore-som.dtsi

-- 
1.9.1



[-- Attachment #2: Type: text/plain, Size: 149 bytes --]

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 16+ messages in thread
* [PATCH 01/10] ARM: imx6: phycard: use numeric suffix in device tree
  2015-11-06 10:21 [PATCH 00/10] Rework towards phytec-som-imx6 and new variants Stefan Christ
@ 2015-11-06 10:21 ` Stefan Christ
  2015-11-06 10:21 ` [PATCH 02/10] boards: Add phytec-som-imx6 Stefan Christ
                   ` (9 subsequent siblings)
  10 siblings, 0 replies; 16+ messages in thread
From: Stefan Christ @ 2015-11-06 10:21 UTC (permalink / raw)
  To: barebox

Use numeric suffix for 'environment-sd3' in device tree.  This patch
prepares phytec-phycard-imx6 for the SOM unification.

Signed-off-by: Christian Hemp <c.hemp@phytec.de>
Signed-off-by: Stefan Christ <s.christ@phytec.de>
---
 arch/arm/boards/phytec-phycard-imx6/board.c | 2 +-
 arch/arm/dts/imx6q-phytec-pcaaxl3.dtsi      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm/boards/phytec-phycard-imx6/board.c b/arch/arm/boards/phytec-phycard-imx6/board.c
index 27b84aa..84224b3 100644
--- a/arch/arm/boards/phytec-phycard-imx6/board.c
+++ b/arch/arm/boards/phytec-phycard-imx6/board.c
@@ -35,7 +35,7 @@ static int phytec_pcaaxl3_init(void)
 
 	switch (bootsource_get()) {
 	case BOOTSOURCE_MMC:
-		of_device_enable_path("/chosen/environment-sd");
+		of_device_enable_path("/chosen/environment-sd3");
 		break;
 	default:
 	case BOOTSOURCE_NAND:
diff --git a/arch/arm/dts/imx6q-phytec-pcaaxl3.dtsi b/arch/arm/dts/imx6q-phytec-pcaaxl3.dtsi
index 97cf78a..0522465 100644
--- a/arch/arm/dts/imx6q-phytec-pcaaxl3.dtsi
+++ b/arch/arm/dts/imx6q-phytec-pcaaxl3.dtsi
@@ -17,7 +17,7 @@
 	compatible = "phytec,imx6q-pcaaxl3", "fsl,imx6q";
 
 	chosen {
-		environment-sd {
+		environment-sd3 {
 			compatible = "barebox,environment";
 			device-path = &environment_usdhc3;
 			status = "disabled";
-- 
1.9.1


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 16+ messages in thread
* [PATCH 02/10] boards: Add phytec-som-imx6
  2015-11-06 10:21 [PATCH 00/10] Rework towards phytec-som-imx6 and new variants Stefan Christ
  2015-11-06 10:21 ` [PATCH 01/10] ARM: imx6: phycard: use numeric suffix in device tree Stefan Christ
@ 2015-11-06 10:21 ` Stefan Christ
  2015-11-06 10:21 ` [PATCH 03/10] ARM: phytec-som-imx6: set loadaddr to start of DDR memory Stefan Christ
                   ` (8 subsequent siblings)
  10 siblings, 0 replies; 16+ messages in thread
From: Stefan Christ @ 2015-11-06 10:21 UTC (permalink / raw)
  To: barebox

The main idea behind this patch is to avoid redundant code.  Because of
the module similarities of all i.MX6 based phytec boards, we can merge
its code.

The phytec-som-imx6 merges the code of all i.MX6 based phytec SOMs.  So
we will have only one "board" in the barebox for phyCARD-i.MX6 and
phyFLEX-i.MX6.

Signed-off-by: Stefan Christ <s.christ@phytec.de>
---
 arch/arm/boards/Makefile                           |  3 +-
 arch/arm/boards/phytec-phycard-imx6/board.c        | 52 ----------------
 .../defaultenv-phycard-imx6/boot/nand              |  7 ---
 .../defaultenv-phycard-imx6/nv/hostname            |  1 -
 arch/arm/boards/phytec-phycard-imx6/lowlevel.c     | 69 ----------------------
 arch/arm/boards/phytec-phyflex-imx6/Makefile       |  3 -
 .../defaultenv-phyflex-imx6/boot/sd-ext3           |  6 --
 .../defaultenv-phyflex-imx6/init/automount         | 14 -----
 .../defaultenv-phyflex-imx6/nv/boot.default        |  1 -
 .../defaultenv-phyflex-imx6/nv/hostname            |  1 -
 .../Makefile                                       |  2 +-
 .../board.c                                        | 69 ++++++++++++----------
 .../defaultenv-physom-imx6}/boot/nand              |  0
 .../defaultenv-physom-imx6}/boot/sd-ext3           |  0
 .../defaultenv-physom-imx6}/init/automount         |  0
 .../defaultenv-physom-imx6}/nv/boot.default        |  0
 .../flash-header-phytec-pcaaxl3-1gib-1bank.imxcfg  |  0
 .../flash-header-phytec-pcaaxl3-1gib.imxcfg        |  0
 .../flash-header-phytec-pcaaxl3-2gib.imxcfg        |  0
 .../flash-header-phytec-pcaaxl3.h                  |  0
 .../flash-header-phytec-pfla02-1gib-1bank.imxcfg   |  0
 .../flash-header-phytec-pfla02-1gib.imxcfg         |  0
 .../flash-header-phytec-pfla02-2gib.imxcfg         |  0
 .../flash-header-phytec-pfla02-4gib.imxcfg         |  0
 .../flash-header-phytec-pfla02.h                   |  0
 .../flash-header-phytec-pfla02dl-1gib.imxcfg       |  0
 .../flash-header-phytec-pfla02dl.h                 |  0
 .../flash-header-phytec-pfla02s-512mb.imxcfg       |  0
 .../lowlevel.c                                     | 16 +++--
 arch/arm/configs/imx_v7_defconfig                  |  3 +-
 arch/arm/dts/Makefile                              |  8 ++-
 arch/arm/mach-imx/Kconfig                          | 11 +---
 images/Makefile.imx                                | 66 ++++++++++-----------
 33 files changed, 94 insertions(+), 238 deletions(-)
 delete mode 100644 arch/arm/boards/phytec-phycard-imx6/board.c
 delete mode 100644 arch/arm/boards/phytec-phycard-imx6/defaultenv-phycard-imx6/boot/nand
 delete mode 100644 arch/arm/boards/phytec-phycard-imx6/defaultenv-phycard-imx6/nv/hostname
 delete mode 100644 arch/arm/boards/phytec-phycard-imx6/lowlevel.c
 delete mode 100644 arch/arm/boards/phytec-phyflex-imx6/Makefile
 delete mode 100644 arch/arm/boards/phytec-phyflex-imx6/defaultenv-phyflex-imx6/boot/sd-ext3
 delete mode 100644 arch/arm/boards/phytec-phyflex-imx6/defaultenv-phyflex-imx6/init/automount
 delete mode 100644 arch/arm/boards/phytec-phyflex-imx6/defaultenv-phyflex-imx6/nv/boot.default
 delete mode 100644 arch/arm/boards/phytec-phyflex-imx6/defaultenv-phyflex-imx6/nv/hostname
 rename arch/arm/boards/{phytec-phycard-imx6 => phytec-som-imx6}/Makefile (51%)
 rename arch/arm/boards/{phytec-phyflex-imx6 => phytec-som-imx6}/board.c (69%)
 rename arch/arm/boards/{phytec-phyflex-imx6/defaultenv-phyflex-imx6 => phytec-som-imx6/defaultenv-physom-imx6}/boot/nand (100%)
 rename arch/arm/boards/{phytec-phycard-imx6/defaultenv-phycard-imx6 => phytec-som-imx6/defaultenv-physom-imx6}/boot/sd-ext3 (100%)
 rename arch/arm/boards/{phytec-phycard-imx6/defaultenv-phycard-imx6 => phytec-som-imx6/defaultenv-physom-imx6}/init/automount (100%)
 rename arch/arm/boards/{phytec-phycard-imx6/defaultenv-phycard-imx6 => phytec-som-imx6/defaultenv-physom-imx6}/nv/boot.default (100%)
 rename arch/arm/boards/{phytec-phycard-imx6 => phytec-som-imx6}/flash-header-phytec-pcaaxl3-1gib-1bank.imxcfg (100%)
 rename arch/arm/boards/{phytec-phycard-imx6 => phytec-som-imx6}/flash-header-phytec-pcaaxl3-1gib.imxcfg (100%)
 rename arch/arm/boards/{phytec-phycard-imx6 => phytec-som-imx6}/flash-header-phytec-pcaaxl3-2gib.imxcfg (100%)
 rename arch/arm/boards/{phytec-phycard-imx6 => phytec-som-imx6}/flash-header-phytec-pcaaxl3.h (100%)
 rename arch/arm/boards/{phytec-phyflex-imx6 => phytec-som-imx6}/flash-header-phytec-pfla02-1gib-1bank.imxcfg (100%)
 rename arch/arm/boards/{phytec-phyflex-imx6 => phytec-som-imx6}/flash-header-phytec-pfla02-1gib.imxcfg (100%)
 rename arch/arm/boards/{phytec-phyflex-imx6 => phytec-som-imx6}/flash-header-phytec-pfla02-2gib.imxcfg (100%)
 rename arch/arm/boards/{phytec-phyflex-imx6 => phytec-som-imx6}/flash-header-phytec-pfla02-4gib.imxcfg (100%)
 rename arch/arm/boards/{phytec-phyflex-imx6 => phytec-som-imx6}/flash-header-phytec-pfla02.h (100%)
 rename arch/arm/boards/{phytec-phyflex-imx6 => phytec-som-imx6}/flash-header-phytec-pfla02dl-1gib.imxcfg (100%)
 rename arch/arm/boards/{phytec-phyflex-imx6 => phytec-som-imx6}/flash-header-phytec-pfla02dl.h (100%)
 rename arch/arm/boards/{phytec-phyflex-imx6 => phytec-som-imx6}/flash-header-phytec-pfla02s-512mb.imxcfg (100%)
 rename arch/arm/boards/{phytec-phyflex-imx6 => phytec-som-imx6}/lowlevel.c (76%)

diff --git a/arch/arm/boards/Makefile b/arch/arm/boards/Makefile
index 013229d..d587169 100644
--- a/arch/arm/boards/Makefile
+++ b/arch/arm/boards/Makefile
@@ -79,13 +79,12 @@ obj-$(CONFIG_MACH_PANDA)			+= panda/
 obj-$(CONFIG_MACH_PCA100)			+= phytec-phycard-imx27/
 obj-$(CONFIG_MACH_PCAAL1)			+= phytec-phycard-omap3/
 obj-$(CONFIG_MACH_PCAAXL2)			+= phytec-phycard-omap4/
-obj-$(CONFIG_MACH_PCAAXL3)			+= phytec-phycard-imx6/
 obj-$(CONFIG_MACH_PCM037)			+= phytec-phycore-imx31/
 obj-$(CONFIG_MACH_PCM038)			+= phytec-phycore-imx27/
 obj-$(CONFIG_MACH_PCM043)			+= phytec-phycore-imx35/
 obj-$(CONFIG_MACH_PCM049)			+= phytec-phycore-omap4460/
 obj-$(CONFIG_MACH_PHYTEC_SOM_AM335X)		+= phytec-som-am335x/
-obj-$(CONFIG_MACH_PHYTEC_PFLA02)		+= phytec-phyflex-imx6/
+obj-$(CONFIG_MACH_PHYTEC_SOM_IMX6)		+= phytec-som-imx6/
 obj-$(CONFIG_MACH_PLATHOME_OPENBLOCKS_AX3)	+= plathome-openblocks-ax3/
 obj-$(CONFIG_MACH_PLATHOME_OPENBLOCKS_A6)	+= plathome-openblocks-a6/
 obj-$(CONFIG_MACH_PM9261)			+= pm9261/
diff --git a/arch/arm/boards/phytec-phycard-imx6/board.c b/arch/arm/boards/phytec-phycard-imx6/board.c
deleted file mode 100644
index 84224b3..0000000
--- a/arch/arm/boards/phytec-phycard-imx6/board.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (C) 2014 Christian Hemp, Phytec Messtechnik GmbH
- *
- * This program 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 program 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.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation.
- *
- */
-
-#include <envfs.h>
-#include <environment.h>
-#include <bootsource.h>
-#include <common.h>
-#include <gpio.h>
-#include <init.h>
-#include <of.h>
-
-#include <mach/bbu.h>
-#include <mach/imx6.h>
-
-static int phytec_pcaaxl3_init(void)
-{
-	if (!of_machine_is_compatible("phytec,imx6q-pcaaxl3"))
-		return 0;
-
-	switch (bootsource_get()) {
-	case BOOTSOURCE_MMC:
-		of_device_enable_path("/chosen/environment-sd3");
-		break;
-	default:
-	case BOOTSOURCE_NAND:
-		of_device_enable_path("/chosen/environment-nand");
-		break;
-	}
-
-	imx6_bbu_nand_register_handler("nand", BBU_HANDLER_FLAG_DEFAULT);
-
-	defaultenv_append_directory(defaultenv_phycard_imx6);
-
-	return 0;
-}
-device_initcall(phytec_pcaaxl3_init);
diff --git a/arch/arm/boards/phytec-phycard-imx6/defaultenv-phycard-imx6/boot/nand b/arch/arm/boards/phytec-phycard-imx6/defaultenv-phycard-imx6/boot/nand
deleted file mode 100644
index 3f3a9aa..0000000
--- a/arch/arm/boards/phytec-phycard-imx6/defaultenv-phycard-imx6/boot/nand
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-global.bootm.image="/dev/nand0.kernel.bb"
-global.bootm.oftree="/dev/nand0.oftree.bb"
-bootargs-ip
-global.linux.bootargs.dyn.root="root=ubi0:root ubi.mtd=root rootfstype=ubifs rw"
-
diff --git a/arch/arm/boards/phytec-phycard-imx6/defaultenv-phycard-imx6/nv/hostname b/arch/arm/boards/phytec-phycard-imx6/defaultenv-phycard-imx6/nv/hostname
deleted file mode 100644
index 47b16cc..0000000
--- a/arch/arm/boards/phytec-phycard-imx6/defaultenv-phycard-imx6/nv/hostname
+++ /dev/null
@@ -1 +0,0 @@
-phyCARD-i.MX6
diff --git a/arch/arm/boards/phytec-phycard-imx6/lowlevel.c b/arch/arm/boards/phytec-phycard-imx6/lowlevel.c
deleted file mode 100644
index 09ab645..0000000
--- a/arch/arm/boards/phytec-phycard-imx6/lowlevel.c
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright (C) 2014 Christian Hemp <c.hemp@phytec.de>
- *
- * This program 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 program 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.
- *
- */
-#include <debug_ll.h>
-#include <common.h>
-#include <linux/sizes.h>
-#include <io.h>
-#include <asm/barebox-arm-head.h>
-#include <asm/barebox-arm.h>
-#include <asm/sections.h>
-#include <asm/cache.h>
-#include <asm/mmu.h>
-#include <mach/imx6.h>
-
-static inline void setup_uart(void)
-{
-	void __iomem *iomuxbase = IOMEM(MX6_IOMUXC_BASE_ADDR);
-
-	writel(0x4, iomuxbase + 0x01f8);
-
-	imx6_ungate_all_peripherals();
-	imx6_uart_setup_ll();
-
-	putc_ll('>');
-}
-
-extern char __dtb_imx6q_phytec_pbaa03_start[];
-
-static void __noreturn start_imx6q_phytec_pbaa03_common(uint32_t size)
-{
-	void *fdt;
-
-	imx6_cpu_lowlevel_init();
-
-	arm_setup_stack(0x00920000 - 8);
-
-	if (IS_ENABLED(CONFIG_DEBUG_LL))
-		setup_uart();
-
-	fdt = __dtb_imx6q_phytec_pbaa03_start - get_runtime_offset();
-
-	barebox_arm_entry(0x10000000, size, fdt);
-}
-
-ENTRY_FUNCTION(start_phytec_pbaa03_1gib, r0, r1, r2)
-{
-	start_imx6q_phytec_pbaa03_common(SZ_1G);
-}
-
-ENTRY_FUNCTION(start_phytec_pbaa03_1gib_1bank, r0, r1, r2)
-{
-	start_imx6q_phytec_pbaa03_common(SZ_1G);
-}
-
-ENTRY_FUNCTION(start_phytec_pbaa03_2gib, r0, r1, r2)
-{
-	start_imx6q_phytec_pbaa03_common(SZ_2G);
-}
diff --git a/arch/arm/boards/phytec-phyflex-imx6/Makefile b/arch/arm/boards/phytec-phyflex-imx6/Makefile
deleted file mode 100644
index 11e1c7d..0000000
--- a/arch/arm/boards/phytec-phyflex-imx6/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-obj-y += board.o
-lwl-y += lowlevel.o
-bbenv-y += defaultenv-phyflex-imx6
diff --git a/arch/arm/boards/phytec-phyflex-imx6/defaultenv-phyflex-imx6/boot/sd-ext3 b/arch/arm/boards/phytec-phyflex-imx6/defaultenv-phyflex-imx6/boot/sd-ext3
deleted file mode 100644
index fd35fe0..0000000
--- a/arch/arm/boards/phytec-phyflex-imx6/defaultenv-phyflex-imx6/boot/sd-ext3
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-global.bootm.image="/mnt/mmc/linuximage"
-global.bootm.oftree="/mnt/mmc/oftree"
-bootargs-ip
-global.linux.bootargs.dyn.root="root=/dev/mmcblk0p2 rootfstype=ext3 rootwait rw"
diff --git a/arch/arm/boards/phytec-phyflex-imx6/defaultenv-phyflex-imx6/init/automount b/arch/arm/boards/phytec-phyflex-imx6/defaultenv-phyflex-imx6/init/automount
deleted file mode 100644
index 49d99bd..0000000
--- a/arch/arm/boards/phytec-phyflex-imx6/defaultenv-phyflex-imx6/init/automount
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-
-if [ "$1" = menu ]; then
-	init-menu-add-entry "$0" "Automountpoints"
-	exit
-fi
-
-# automount tftp server based on $eth0.serverip
-
-mkdir -p /mnt/tftp
-automount /mnt/tftp 'ifup eth0 && mount -t tftp $eth0.serverip /mnt/tftp'
-
-mkdir -p /mnt/mmc
-automount -d /mnt/mmc 'mmc2.probe=1 && [ -e /dev/mmc2.0 ] && mount /dev/mmc2.0 /mnt/mmc'
diff --git a/arch/arm/boards/phytec-phyflex-imx6/defaultenv-phyflex-imx6/nv/boot.default b/arch/arm/boards/phytec-phyflex-imx6/defaultenv-phyflex-imx6/nv/boot.default
deleted file mode 100644
index 026a25c..0000000
--- a/arch/arm/boards/phytec-phyflex-imx6/defaultenv-phyflex-imx6/nv/boot.default
+++ /dev/null
@@ -1 +0,0 @@
-nand
diff --git a/arch/arm/boards/phytec-phyflex-imx6/defaultenv-phyflex-imx6/nv/hostname b/arch/arm/boards/phytec-phyflex-imx6/defaultenv-phyflex-imx6/nv/hostname
deleted file mode 100644
index 192f6b4..0000000
--- a/arch/arm/boards/phytec-phyflex-imx6/defaultenv-phyflex-imx6/nv/hostname
+++ /dev/null
@@ -1 +0,0 @@
-phyFLEX-i.MX6
diff --git a/arch/arm/boards/phytec-phycard-imx6/Makefile b/arch/arm/boards/phytec-som-imx6/Makefile
similarity index 51%
rename from arch/arm/boards/phytec-phycard-imx6/Makefile
rename to arch/arm/boards/phytec-som-imx6/Makefile
index de67f04..7e385c2 100644
--- a/arch/arm/boards/phytec-phycard-imx6/Makefile
+++ b/arch/arm/boards/phytec-som-imx6/Makefile
@@ -1,3 +1,3 @@
 obj-y += board.o
 lwl-y += lowlevel.o
-bbenv-y += defaultenv-phycard-imx6
+bbenv-y += defaultenv-physom-imx6
diff --git a/arch/arm/boards/phytec-phyflex-imx6/board.c b/arch/arm/boards/phytec-som-imx6/board.c
similarity index 69%
rename from arch/arm/boards/phytec-phyflex-imx6/board.c
rename to arch/arm/boards/phytec-som-imx6/board.c
index d3100c8..2afe685 100644
--- a/arch/arm/boards/phytec-phyflex-imx6/board.c
+++ b/arch/arm/boards/phytec-som-imx6/board.c
@@ -1,5 +1,7 @@
 /*
  * Copyright (C) 2013 Sascha Hauer, Pengutronix
+ * Copyright (C) 2015 PHYTEC Messtechnik GmbH,
+ * Author: Stefan Christ <s.christ@phytec.de>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -16,7 +18,7 @@
  * Foundation.
  *
  */
-#define pr_fmt(fmt) "phyFLEX-i.MX6: " fmt
+#define pr_fmt(fmt) "phySOM-i.MX6: " fmt
 
 #include <malloc.h>
 #include <envfs.h>
@@ -83,24 +85,34 @@ static unsigned int get_module_rev(void)
 	return 16 - val;
 }
 
-static int phytec_pfla02_init(void)
+static int physom_imx6_devices_init(void)
 {
 	int ret;
-	char *environment_path, *envdev;
+	char *environment_path, *default_environment_path;
+	char *envdev, *default_envdev;
 
-	if (!of_machine_is_compatible("phytec,imx6q-pfla02") &&
-			!of_machine_is_compatible("phytec,imx6dl-pfla02") &&
-			!of_machine_is_compatible("phytec,imx6s-pfla02"))
-		return 0;
+	if (of_machine_is_compatible("phytec,imx6q-pfla02")
+		|| of_machine_is_compatible("phytec,imx6dl-pfla02")
+		|| of_machine_is_compatible("phytec,imx6s-pfla02")) {
 
-	phyflex_err006282_workaround();
+		phyflex_err006282_workaround();
 
-	imx6_bbu_nand_register_handler("nand", BBU_HANDLER_FLAG_DEFAULT);
+		pfla02_module_revision = get_module_rev();
+		globalvar_add_simple_int("board.revision", &pfla02_module_revision, "%u");
+		pr_info("Module Revision: %u\n", pfla02_module_revision);
+
+		barebox_set_hostname("phyFLEX-i.MX6");
+		default_environment_path = "/chosen/environment-spinor";
+		default_envdev = "SPI NOR flash";
+
+	} else if (of_machine_is_compatible("phytec,imx6q-pcaaxl3")) {
 
-	pfla02_module_revision = get_module_rev();
-	globalvar_add_simple_int("board.revision", &pfla02_module_revision, "%u");
+		barebox_set_hostname("phyCARD-i.MX6");
+		default_environment_path = "/chosen/environment-nand";
+		default_envdev = "NAND flash";
 
-	pr_info("Module Revision: %u\n", pfla02_module_revision);
+	} else
+		return 0;
 
 	switch (bootsource_get()) {
 	case BOOTSOURCE_MMC:
@@ -112,35 +124,30 @@ static int phytec_pfla02_init(void)
 		environment_path = asprintf("/chosen/environment-nand");
 		envdev = "NAND flash";
 		break;
-	default:
 	case BOOTSOURCE_SPI:
 		environment_path = asprintf("/chosen/environment-spinor");
 		envdev = "SPI NOR flash";
 		break;
+	default:
+		environment_path = asprintf(default_environment_path);
+		envdev = default_envdev;
+		break;
 	}
 
-	ret = of_device_enable_path(environment_path);
-	if (ret < 0)
-		pr_warn("Failed to enable environment partition '%s' (%d)\n",
-			environment_path, ret);
-
-	free(environment_path);
+	if (environment_path) {
+		ret = of_device_enable_path(environment_path);
+		if (ret < 0)
+			pr_warn("Failed to enable environment partition '%s' (%d)\n",
+				environment_path, ret);
+		free(environment_path);
+	}
 
 	pr_notice("Using environment in %s\n", envdev);
 
-	return 0;
-}
-device_initcall(phytec_pfla02_init);
-
-static int phytec_pbab0x_init(void)
-{
-	if (!of_machine_is_compatible("phytec,imx6x-pbab01") &&
-		!of_machine_is_compatible("phytec,imx6dl-pbab05") &&
-		!of_machine_is_compatible("phytec,imx6q-pbab02"))
-		return 0;
+	imx6_bbu_nand_register_handler("nand", BBU_HANDLER_FLAG_DEFAULT);
 
-	defaultenv_append_directory(defaultenv_phyflex_imx6);
+	defaultenv_append_directory(defaultenv_physom_imx6);
 
 	return 0;
 }
-device_initcall(phytec_pbab0x_init);
+device_initcall(physom_imx6_devices_init);
diff --git a/arch/arm/boards/phytec-phyflex-imx6/defaultenv-phyflex-imx6/boot/nand b/arch/arm/boards/phytec-som-imx6/defaultenv-physom-imx6/boot/nand
similarity index 100%
rename from arch/arm/boards/phytec-phyflex-imx6/defaultenv-phyflex-imx6/boot/nand
rename to arch/arm/boards/phytec-som-imx6/defaultenv-physom-imx6/boot/nand
diff --git a/arch/arm/boards/phytec-phycard-imx6/defaultenv-phycard-imx6/boot/sd-ext3 b/arch/arm/boards/phytec-som-imx6/defaultenv-physom-imx6/boot/sd-ext3
similarity index 100%
rename from arch/arm/boards/phytec-phycard-imx6/defaultenv-phycard-imx6/boot/sd-ext3
rename to arch/arm/boards/phytec-som-imx6/defaultenv-physom-imx6/boot/sd-ext3
diff --git a/arch/arm/boards/phytec-phycard-imx6/defaultenv-phycard-imx6/init/automount b/arch/arm/boards/phytec-som-imx6/defaultenv-physom-imx6/init/automount
similarity index 100%
rename from arch/arm/boards/phytec-phycard-imx6/defaultenv-phycard-imx6/init/automount
rename to arch/arm/boards/phytec-som-imx6/defaultenv-physom-imx6/init/automount
diff --git a/arch/arm/boards/phytec-phycard-imx6/defaultenv-phycard-imx6/nv/boot.default b/arch/arm/boards/phytec-som-imx6/defaultenv-physom-imx6/nv/boot.default
similarity index 100%
rename from arch/arm/boards/phytec-phycard-imx6/defaultenv-phycard-imx6/nv/boot.default
rename to arch/arm/boards/phytec-som-imx6/defaultenv-physom-imx6/nv/boot.default
diff --git a/arch/arm/boards/phytec-phycard-imx6/flash-header-phytec-pcaaxl3-1gib-1bank.imxcfg b/arch/arm/boards/phytec-som-imx6/flash-header-phytec-pcaaxl3-1gib-1bank.imxcfg
similarity index 100%
rename from arch/arm/boards/phytec-phycard-imx6/flash-header-phytec-pcaaxl3-1gib-1bank.imxcfg
rename to arch/arm/boards/phytec-som-imx6/flash-header-phytec-pcaaxl3-1gib-1bank.imxcfg
diff --git a/arch/arm/boards/phytec-phycard-imx6/flash-header-phytec-pcaaxl3-1gib.imxcfg b/arch/arm/boards/phytec-som-imx6/flash-header-phytec-pcaaxl3-1gib.imxcfg
similarity index 100%
rename from arch/arm/boards/phytec-phycard-imx6/flash-header-phytec-pcaaxl3-1gib.imxcfg
rename to arch/arm/boards/phytec-som-imx6/flash-header-phytec-pcaaxl3-1gib.imxcfg
diff --git a/arch/arm/boards/phytec-phycard-imx6/flash-header-phytec-pcaaxl3-2gib.imxcfg b/arch/arm/boards/phytec-som-imx6/flash-header-phytec-pcaaxl3-2gib.imxcfg
similarity index 100%
rename from arch/arm/boards/phytec-phycard-imx6/flash-header-phytec-pcaaxl3-2gib.imxcfg
rename to arch/arm/boards/phytec-som-imx6/flash-header-phytec-pcaaxl3-2gib.imxcfg
diff --git a/arch/arm/boards/phytec-phycard-imx6/flash-header-phytec-pcaaxl3.h b/arch/arm/boards/phytec-som-imx6/flash-header-phytec-pcaaxl3.h
similarity index 100%
rename from arch/arm/boards/phytec-phycard-imx6/flash-header-phytec-pcaaxl3.h
rename to arch/arm/boards/phytec-som-imx6/flash-header-phytec-pcaaxl3.h
diff --git a/arch/arm/boards/phytec-phyflex-imx6/flash-header-phytec-pfla02-1gib-1bank.imxcfg b/arch/arm/boards/phytec-som-imx6/flash-header-phytec-pfla02-1gib-1bank.imxcfg
similarity index 100%
rename from arch/arm/boards/phytec-phyflex-imx6/flash-header-phytec-pfla02-1gib-1bank.imxcfg
rename to arch/arm/boards/phytec-som-imx6/flash-header-phytec-pfla02-1gib-1bank.imxcfg
diff --git a/arch/arm/boards/phytec-phyflex-imx6/flash-header-phytec-pfla02-1gib.imxcfg b/arch/arm/boards/phytec-som-imx6/flash-header-phytec-pfla02-1gib.imxcfg
similarity index 100%
rename from arch/arm/boards/phytec-phyflex-imx6/flash-header-phytec-pfla02-1gib.imxcfg
rename to arch/arm/boards/phytec-som-imx6/flash-header-phytec-pfla02-1gib.imxcfg
diff --git a/arch/arm/boards/phytec-phyflex-imx6/flash-header-phytec-pfla02-2gib.imxcfg b/arch/arm/boards/phytec-som-imx6/flash-header-phytec-pfla02-2gib.imxcfg
similarity index 100%
rename from arch/arm/boards/phytec-phyflex-imx6/flash-header-phytec-pfla02-2gib.imxcfg
rename to arch/arm/boards/phytec-som-imx6/flash-header-phytec-pfla02-2gib.imxcfg
diff --git a/arch/arm/boards/phytec-phyflex-imx6/flash-header-phytec-pfla02-4gib.imxcfg b/arch/arm/boards/phytec-som-imx6/flash-header-phytec-pfla02-4gib.imxcfg
similarity index 100%
rename from arch/arm/boards/phytec-phyflex-imx6/flash-header-phytec-pfla02-4gib.imxcfg
rename to arch/arm/boards/phytec-som-imx6/flash-header-phytec-pfla02-4gib.imxcfg
diff --git a/arch/arm/boards/phytec-phyflex-imx6/flash-header-phytec-pfla02.h b/arch/arm/boards/phytec-som-imx6/flash-header-phytec-pfla02.h
similarity index 100%
rename from arch/arm/boards/phytec-phyflex-imx6/flash-header-phytec-pfla02.h
rename to arch/arm/boards/phytec-som-imx6/flash-header-phytec-pfla02.h
diff --git a/arch/arm/boards/phytec-phyflex-imx6/flash-header-phytec-pfla02dl-1gib.imxcfg b/arch/arm/boards/phytec-som-imx6/flash-header-phytec-pfla02dl-1gib.imxcfg
similarity index 100%
rename from arch/arm/boards/phytec-phyflex-imx6/flash-header-phytec-pfla02dl-1gib.imxcfg
rename to arch/arm/boards/phytec-som-imx6/flash-header-phytec-pfla02dl-1gib.imxcfg
diff --git a/arch/arm/boards/phytec-phyflex-imx6/flash-header-phytec-pfla02dl.h b/arch/arm/boards/phytec-som-imx6/flash-header-phytec-pfla02dl.h
similarity index 100%
rename from arch/arm/boards/phytec-phyflex-imx6/flash-header-phytec-pfla02dl.h
rename to arch/arm/boards/phytec-som-imx6/flash-header-phytec-pfla02dl.h
diff --git a/arch/arm/boards/phytec-phyflex-imx6/flash-header-phytec-pfla02s-512mb.imxcfg b/arch/arm/boards/phytec-som-imx6/flash-header-phytec-pfla02s-512mb.imxcfg
similarity index 100%
rename from arch/arm/boards/phytec-phyflex-imx6/flash-header-phytec-pfla02s-512mb.imxcfg
rename to arch/arm/boards/phytec-som-imx6/flash-header-phytec-pfla02s-512mb.imxcfg
diff --git a/arch/arm/boards/phytec-phyflex-imx6/lowlevel.c b/arch/arm/boards/phytec-som-imx6/lowlevel.c
similarity index 76%
rename from arch/arm/boards/phytec-phyflex-imx6/lowlevel.c
rename to arch/arm/boards/phytec-som-imx6/lowlevel.c
index 82c0244..a3d375e 100644
--- a/arch/arm/boards/phytec-phyflex-imx6/lowlevel.c
+++ b/arch/arm/boards/phytec-som-imx6/lowlevel.c
@@ -1,5 +1,7 @@
 /*
  * Copyright (C) 2013 Sascha Hauer <s.hauer@pengutronix.de>
+ * Copyright (C) 2015 PHYTEC Messtechnik GmbH,
+ * Author: Stefan Christ <s.christ@phytec.de>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -38,10 +40,10 @@ static inline void setup_uart(void)
 
 #define SZ_4G 0xEFFFFFF8
 
-BAREBOX_IMD_TAG_STRING(phyflex_mx6_memsize_SZ_512M, IMD_TYPE_PARAMETER, "memsize=512", 0);
-BAREBOX_IMD_TAG_STRING(phyflex_mx6_memsize_SZ_1G, IMD_TYPE_PARAMETER, "memsize=1024", 0);
-BAREBOX_IMD_TAG_STRING(phyflex_mx6_memsize_SZ_2G, IMD_TYPE_PARAMETER, "memsize=2048", 0);
-BAREBOX_IMD_TAG_STRING(phyflex_mx6_memsize_SZ_4G, IMD_TYPE_PARAMETER, "memsize=4096", 0);
+BAREBOX_IMD_TAG_STRING(physom_mx6_memsize_SZ_512M, IMD_TYPE_PARAMETER, "memsize=512", 0);
+BAREBOX_IMD_TAG_STRING(physom_mx6_memsize_SZ_1G, IMD_TYPE_PARAMETER, "memsize=1024", 0);
+BAREBOX_IMD_TAG_STRING(physom_mx6_memsize_SZ_2G, IMD_TYPE_PARAMETER, "memsize=2048", 0);
+BAREBOX_IMD_TAG_STRING(physom_mx6_memsize_SZ_4G, IMD_TYPE_PARAMETER, "memsize=4096", 0);
 
 static void __noreturn start_imx6_phytec_common(uint32_t size,
 						bool do_early_uart_config,
@@ -65,12 +67,16 @@ static void __noreturn start_imx6_phytec_common(uint32_t size,
 	{								\
 		extern char __dtb_##fdt_name##_start[];			\
 									\
-		IMD_USED(phyflex_mx6_memsize_##memory_size);		\
+		IMD_USED(physom_mx6_memsize_##memory_size);		\
 									\
 		start_imx6_phytec_common(memory_size, do_early_uart_config, \
 					 __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_pbab01_1gib, imx6q_phytec_pbab01, SZ_1G, true);
 PHYTEC_ENTRY(start_phytec_pbab01_1gib_1bank, imx6q_phytec_pbab01, SZ_1G, true);
 PHYTEC_ENTRY(start_phytec_pbab01_2gib, imx6q_phytec_pbab01, SZ_2G, true);
diff --git a/arch/arm/configs/imx_v7_defconfig b/arch/arm/configs/imx_v7_defconfig
index ec91460..27dea1a 100644
--- a/arch/arm/configs/imx_v7_defconfig
+++ b/arch/arm/configs/imx_v7_defconfig
@@ -6,8 +6,7 @@ CONFIG_MACH_FREESCALE_MX51_PDK=y
 CONFIG_MACH_FREESCALE_MX53_LOCO=y
 CONFIG_MACH_TQMA53=y
 CONFIG_MACH_FREESCALE_MX53_VMX53=y
-CONFIG_MACH_PCAAXL3=y
-CONFIG_MACH_PHYTEC_PFLA02=y
+CONFIG_MACH_PHYTEC_SOM_IMX6=y
 CONFIG_MACH_DFI_FS700_M60=y
 CONFIG_MACH_GUF_SANTARO=y
 CONFIG_MACH_REALQ7=y
diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
index 60880e4..1a9e85f 100644
--- a/arch/arm/dts/Makefile
+++ b/arch/arm/dts/Makefile
@@ -31,7 +31,6 @@ pbl-dtb-$(CONFIG_MACH_NITROGEN6X) += imx6q-nitrogen6x.dtb.o imx6dl-nitrogen6x.dt
 pbl-dtb-$(CONFIG_MACH_NVIDIA_BEAVER) += tegra30-beaver.dtb.o
 pbl-dtb-$(CONFIG_MACH_NVIDIA_JETSON) += tegra124-jetson-tk1.dtb.o
 pbl-dtb-$(CONFIG_MACH_PCA100) += imx27-phytec-phycard-s-rdk-bb.dtb.o
-pbl-dtb-$(CONFIG_MACH_PCAAXL3) += imx6q-phytec-pbaa03.dtb.o
 pbl-dtb-$(CONFIG_MACH_PCM038) += imx27-phytec-phycore-rdk.dtb.o
 pbl-dtb-$(CONFIG_MACH_PHYTEC_SOM_AM335X) += am335x-phytec-phyflex-som.dtb.o am335x-phytec-phyflex-som-mlo.dtb.o \
 	am335x-phytec-phyflex-som-no-spi.dtb.o am335x-phytec-phyflex-som-no-eeprom.dtb.o \
@@ -39,7 +38,12 @@ pbl-dtb-$(CONFIG_MACH_PHYTEC_SOM_AM335X) += am335x-phytec-phyflex-som.dtb.o am33
 	am335x-phytec-phycore-som.dtb.o am335x-phytec-phycore-som-no-spi.dtb.o am335x-phytec-phycore-som-mlo.dtb.o \
 	am335x-phytec-phycore-som-no-eeprom.dtb.o am335x-phytec-phycore-som-no-spi-no-eeprom.dtb.o \
 	am335x-phytec-phycard-som.dtb.o am335x-phytec-phycard-som-mlo.dtb.o
-pbl-dtb-$(CONFIG_MACH_PHYTEC_PFLA02) += imx6s-phytec-pbab01.dtb.o imx6dl-phytec-pbab01.dtb.o imx6q-phytec-pbab01.dtb.o imx6q-phytec-phyboard-alcor.dtb.o imx6dl-phytec-phyboard-subra.dtb.o
+pbl-dtb-$(CONFIG_MACH_PHYTEC_SOM_IMX6) += imx6q-phytec-pbaa03.dtb.o \
+				imx6s-phytec-pbab01.dtb.o \
+				imx6dl-phytec-pbab01.dtb.o \
+				imx6q-phytec-pbab01.dtb.o \
+				imx6q-phytec-phyboard-alcor.dtb.o \
+				imx6dl-phytec-phyboard-subra.dtb.o
 pbl-dtb-$(CONFIG_MACH_PLATHOME_OPENBLOCKS_AX3) += armada-xp-openblocks-ax3-4-bb.dtb.o
 pbl-dtb-$(CONFIG_MACH_PLATHOME_OPENBLOCKS_A6) += kirkwood-openblocks_a6-bb.dtb.o
 pbl-dtb-$(CONFIG_MACH_RADXA_ROCK) += rk3188-radxarock.dtb.o
diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig
index f2dc52d..82e4e9d 100644
--- a/arch/arm/mach-imx/Kconfig
+++ b/arch/arm/mach-imx/Kconfig
@@ -34,11 +34,10 @@ config ARCH_TEXT_BASE
 	default 0x4fc00000 if MACH_REALQ7
 	default 0x4fc00000 if MACH_GK802
 	default 0x2fc00000 if MACH_TQMA6X
-	default 0x4fc00000 if MACH_PHYTEC_PFLA02
 	default 0x4fc00000 if MACH_DFI_FS700_M60
 	default 0x4fc00000 if MACH_UDOO
 	default 0x4fc00000 if MACH_VARISCITE_MX6
-	default 0x4fc00000 if MACH_PCAAXL3
+	default 0x4fc00000 if MACH_PHYTEC_SOM_IMX6
 
 config ARCH_IMX_INTERNAL_BOOT
 	bool "support internal boot mode"
@@ -268,14 +267,10 @@ config MACH_FREESCALE_MX53_VMX53
 	  Say Y here if you are using the Voipac Technologies X53-DMM-668
 	  module equipped with a Freescale i.MX53 Processor
 
-config MACH_PCAAXL3
-        bool "Phytec phyCARD-i.MX6 Quad"
+config MACH_PHYTEC_SOM_IMX6
+        bool "Phytec phyCARD-i.MX6 and phyFLEX-i.MX6"
         select ARCH_IMX6
 
-config MACH_PHYTEC_PFLA02
-	bool "Phytec phyFLEX-i.MX6"
-	select ARCH_IMX6
-
 config MACH_DFI_FS700_M60
 	bool "DFI i.MX6 FS700 M60 Q7 Board"
 	select ARCH_IMX6
diff --git a/images/Makefile.imx b/images/Makefile.imx
index c33b153..af66df1 100644
--- a/images/Makefile.imx
+++ b/images/Makefile.imx
@@ -127,45 +127,45 @@ CFG_start_imx6q_mba6x.pblx.imximg = $(board)/tqma6x/flash-header-tqma6q.imxcfg
 FILE_barebox-tq-tqma6q-mba6x.img = start_imx6q_mba6x.pblx.imximg
 image-$(CONFIG_MACH_TQMA6X) += barebox-tq-tqma6q-mba6x.img
 
-pblx-$(CONFIG_MACH_PHYTEC_PFLA02) += start_phytec_pbab01_4gib
-CFG_start_phytec_pbab01_4gib.pblx.imximg = $(board)/phytec-phyflex-imx6/flash-header-phytec-pfla02-4gib.imxcfg
+pblx-$(CONFIG_MACH_PHYTEC_SOM_IMX6) += start_phytec_pbab01_4gib
+CFG_start_phytec_pbab01_4gib.pblx.imximg = $(board)/phytec-som-imx6/flash-header-phytec-pfla02-4gib.imxcfg
 FILE_barebox-phytec-pbab01-4gib.img = start_phytec_pbab01_4gib.pblx.imximg
-image-$(CONFIG_MACH_PHYTEC_PFLA02) += barebox-phytec-pbab01-4gib.img
+image-$(CONFIG_MACH_PHYTEC_SOM_IMX6) += barebox-phytec-pbab01-4gib.img
 
-pblx-$(CONFIG_MACH_PHYTEC_PFLA02) += start_phytec_pbab01_2gib
-CFG_start_phytec_pbab01_2gib.pblx.imximg = $(board)/phytec-phyflex-imx6/flash-header-phytec-pfla02-2gib.imxcfg
+pblx-$(CONFIG_MACH_PHYTEC_SOM_IMX6) += start_phytec_pbab01_2gib
+CFG_start_phytec_pbab01_2gib.pblx.imximg = $(board)/phytec-som-imx6/flash-header-phytec-pfla02-2gib.imxcfg
 FILE_barebox-phytec-pbab01-2gib.img = start_phytec_pbab01_2gib.pblx.imximg
-image-$(CONFIG_MACH_PHYTEC_PFLA02) += barebox-phytec-pbab01-2gib.img
+image-$(CONFIG_MACH_PHYTEC_SOM_IMX6) += barebox-phytec-pbab01-2gib.img
 
-pblx-$(CONFIG_MACH_PHYTEC_PFLA02) += start_phytec_pbab01_1gib
-CFG_start_phytec_pbab01_1gib.pblx.imximg = $(board)/phytec-phyflex-imx6/flash-header-phytec-pfla02-1gib.imxcfg
+pblx-$(CONFIG_MACH_PHYTEC_SOM_IMX6) += start_phytec_pbab01_1gib
+CFG_start_phytec_pbab01_1gib.pblx.imximg = $(board)/phytec-som-imx6/flash-header-phytec-pfla02-1gib.imxcfg
 FILE_barebox-phytec-pbab01-1gib.img = start_phytec_pbab01_1gib.pblx.imximg
-image-$(CONFIG_MACH_PHYTEC_PFLA02) += barebox-phytec-pbab01-1gib.img
+image-$(CONFIG_MACH_PHYTEC_SOM_IMX6) += barebox-phytec-pbab01-1gib.img
 
-pblx-$(CONFIG_MACH_PHYTEC_PFLA02) += start_phytec_pbab01_1gib_1bank
-CFG_start_phytec_pbab01_1gib_1bank.pblx.imximg = $(board)/phytec-phyflex-imx6/flash-header-phytec-pfla02-1gib-1bank.imxcfg
+pblx-$(CONFIG_MACH_PHYTEC_SOM_IMX6) += start_phytec_pbab01_1gib_1bank
+CFG_start_phytec_pbab01_1gib_1bank.pblx.imximg = $(board)/phytec-som-imx6/flash-header-phytec-pfla02-1gib-1bank.imxcfg
 FILE_barebox-phytec-pbab01-1gib-1bank.img = start_phytec_pbab01_1gib_1bank.pblx.imximg
-image-$(CONFIG_MACH_PHYTEC_PFLA02) += barebox-phytec-pbab01-1gib-1bank.img
+image-$(CONFIG_MACH_PHYTEC_SOM_IMX6) += barebox-phytec-pbab01-1gib-1bank.img
 
-pblx-$(CONFIG_MACH_PHYTEC_PFLA02) += start_phytec_pbab01dl_1gib
-CFG_start_phytec_pbab01dl_1gib.pblx.imximg = $(board)/phytec-phyflex-imx6/flash-header-phytec-pfla02dl-1gib.imxcfg
+pblx-$(CONFIG_MACH_PHYTEC_SOM_IMX6) += start_phytec_pbab01dl_1gib
+CFG_start_phytec_pbab01dl_1gib.pblx.imximg = $(board)/phytec-som-imx6/flash-header-phytec-pfla02dl-1gib.imxcfg
 FILE_barebox-phytec-pbab01dl-1gib.img = start_phytec_pbab01dl_1gib.pblx.imximg
-image-$(CONFIG_MACH_PHYTEC_PFLA02) += barebox-phytec-pbab01dl-1gib.img
+image-$(CONFIG_MACH_PHYTEC_SOM_IMX6) += barebox-phytec-pbab01dl-1gib.img
 
-pblx-$(CONFIG_MACH_PHYTEC_PFLA02) += start_phytec_pbab01s_512mb
-CFG_start_phytec_pbab01s_512mb.pblx.imximg = $(board)/phytec-phyflex-imx6/flash-header-phytec-pfla02s-512mb.imxcfg
+pblx-$(CONFIG_MACH_PHYTEC_SOM_IMX6) += start_phytec_pbab01s_512mb
+CFG_start_phytec_pbab01s_512mb.pblx.imximg = $(board)/phytec-som-imx6/flash-header-phytec-pfla02s-512mb.imxcfg
 FILE_barebox-phytec-pbab01s-512mb.img = start_phytec_pbab01s_512mb.pblx.imximg
-image-$(CONFIG_MACH_PHYTEC_PFLA02) += barebox-phytec-pbab01s-512mb.img
+image-$(CONFIG_MACH_PHYTEC_SOM_IMX6) += barebox-phytec-pbab01s-512mb.img
 
-pblx-$(CONFIG_MACH_PHYTEC_PFLA02) += start_phytec_phyboard_alcor_1gib
-CFG_start_phytec_phyboard_alcor_1gib.pblx.imximg = $(board)/phytec-phyflex-imx6/flash-header-phytec-pfla02-1gib.imxcfg
+pblx-$(CONFIG_MACH_PHYTEC_SOM_IMX6) += start_phytec_phyboard_alcor_1gib
+CFG_start_phytec_phyboard_alcor_1gib.pblx.imximg = $(board)/phytec-som-imx6/flash-header-phytec-pfla02-1gib.imxcfg
 FILE_barebox-phytec-phyboard-alcor-1gib.img = start_phytec_phyboard_alcor_1gib.pblx.imximg
-image-$(CONFIG_MACH_PHYTEC_PFLA02) += barebox-phytec-phyboard-alcor-1gib.img
+image-$(CONFIG_MACH_PHYTEC_SOM_IMX6) += barebox-phytec-phyboard-alcor-1gib.img
 
-pblx-$(CONFIG_MACH_PHYTEC_PFLA02) += start_phytec_phyboard_subra_512mb
-CFG_start_phytec_phyboard_subra_512mb.pblx.imximg = $(board)/phytec-phyflex-imx6/flash-header-phytec-pfla02s-512mb.imxcfg
+pblx-$(CONFIG_MACH_PHYTEC_SOM_IMX6) += start_phytec_phyboard_subra_512mb
+CFG_start_phytec_phyboard_subra_512mb.pblx.imximg = $(board)/phytec-som-imx6/flash-header-phytec-pfla02s-512mb.imxcfg
 FILE_barebox-phytec-phyboard-subra-512mb.img = start_phytec_phyboard_subra_512mb.pblx.imximg
-image-$(CONFIG_MACH_PHYTEC_PFLA02) += barebox-phytec-phyboard-subra-512mb.img
+image-$(CONFIG_MACH_PHYTEC_SOM_IMX6) += barebox-phytec-phyboard-subra-512mb.img
 
 pblx-$(CONFIG_MACH_DFI_FS700_M60) += start_imx6dl_dfi_fs700_m60_6s
 CFG_start_imx6dl_dfi_fs700_m60_6s.pblx.imximg = $(board)/dfi-fs700-m60/flash-header-fs700-m60-6s.imxcfg
@@ -262,20 +262,20 @@ CFG_start_imx6s_riotboard.pblx.imximg = $(board)/embest-riotboard/flash-header-e
 FILE_barebox-embest-imx6s-riotboard.img = start_imx6s_riotboard.pblx.imximg
 image-$(CONFIG_MACH_EMBEST_RIOTBOARD) += barebox-embest-imx6s-riotboard.img
 
-pblx-$(CONFIG_MACH_PCAAXL3) += start_phytec_pbaa03_1gib
-CFG_start_phytec_pbaa03_1gib.pblx.imximg = $(board)/phytec-phycard-imx6/flash-header-phytec-pcaaxl3-1gib.imxcfg
+pblx-$(CONFIG_MACH_PHYTEC_SOM_IMX6) += start_phytec_pbaa03_1gib
+CFG_start_phytec_pbaa03_1gib.pblx.imximg = $(board)/phytec-som-imx6/flash-header-phytec-pcaaxl3-1gib.imxcfg
 FILE_barebox-phytec-pbaa03-1gib.img = start_phytec_pbaa03_1gib.pblx.imximg
-image-$(CONFIG_MACH_PCAAXL3) += barebox-phytec-pbaa03-1gib.img
+image-$(CONFIG_MACH_PHYTEC_SOM_IMX6) += barebox-phytec-pbaa03-1gib.img
 
-pblx-$(CONFIG_MACH_PCAAXL3) += start_phytec_pbaa03_1gib_1bank
-CFG_start_phytec_pbaa03_1gib_1bank.pblx.imximg = $(board)/phytec-phycard-imx6/flash-header-phytec-pcaaxl3-1gib-1bank.imxcfg
+pblx-$(CONFIG_MACH_PHYTEC_SOM_IMX6) += start_phytec_pbaa03_1gib_1bank
+CFG_start_phytec_pbaa03_1gib_1bank.pblx.imximg = $(board)/phytec-som-imx6/flash-header-phytec-pcaaxl3-1gib-1bank.imxcfg
 FILE_barebox-phytec-pbaa03-1gib-1bank.img = start_phytec_pbaa03_1gib_1bank.pblx.imximg
-image-$(CONFIG_MACH_PCAAXL3) += barebox-phytec-pbaa03-1gib-1bank.img
+image-$(CONFIG_MACH_PHYTEC_SOM_IMX6) += barebox-phytec-pbaa03-1gib-1bank.img
 
-pblx-$(CONFIG_MACH_PCAAXL3) += start_phytec_pbaa03_2gib
-CFG_start_phytec_pbaa03_2gib.pblx.imximg = $(board)/phytec-phycard-imx6/flash-header-phytec-pcaaxl3-2gib.imxcfg
+pblx-$(CONFIG_MACH_PHYTEC_SOM_IMX6) += start_phytec_pbaa03_2gib
+CFG_start_phytec_pbaa03_2gib.pblx.imximg = $(board)/phytec-som-imx6/flash-header-phytec-pcaaxl3-2gib.imxcfg
 FILE_barebox-phytec-pbaa03-2gib.img = start_phytec_pbaa03_2gib.pblx.imximg
-image-$(CONFIG_MACH_PCAAXL3) += barebox-phytec-pbaa03-2gib.img
+image-$(CONFIG_MACH_PHYTEC_SOM_IMX6) += barebox-phytec-pbaa03-2gib.img
 
 pblx-$(CONFIG_MACH_GW_VENTANA) += start_imx6q_gw54xx_1gx64
 CFG_start_imx6q_gw54xx_1gx64.pblx.imximg = $(board)/gateworks-ventana/flash-header-ventana-quad-1gx64.imxcfg
-- 
1.9.1


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 16+ messages in thread
* [PATCH 03/10] ARM: phytec-som-imx6: set loadaddr to start of DDR memory.
  2015-11-06 10:21 [PATCH 00/10] Rework towards phytec-som-imx6 and new variants Stefan Christ
  2015-11-06 10:21 ` [PATCH 01/10] ARM: imx6: phycard: use numeric suffix in device tree Stefan Christ
  2015-11-06 10:21 ` [PATCH 02/10] boards: Add phytec-som-imx6 Stefan Christ
@ 2015-11-06 10:21 ` Stefan Christ
  2015-11-06 10:21 ` [PATCH 04/10] ARM: phytec-som-imx6: update environment Stefan Christ
                   ` (7 subsequent siblings)
  10 siblings, 0 replies; 16+ messages in thread
From: Stefan Christ @ 2015-11-06 10:21 UTC (permalink / raw)
  To: barebox

The loadaddr in the flash-headers for the phyFLEX/phyCARD-i.MX6 was set
to 0x20000000 (512MiB). The start of the DDR memory in CPU's memory map
is 0x10000000 (256MiB). So the ROM loader loads the barebox image at the
memory position 256MiB and higher in the DDR memory.

This is a problem when the module doesn't have more than 256MiB of
memory. Therefore the loadaddr is set to the start of the DDR memory.

The patch was tested on a phyFLEX-i.MX6 Quad with 1GiB RAM on one bank
and on a phyCARD-i.MX6 Quad 1GiB RAM on two banks.

Signed-off-by: Stefan Christ <s.christ@phytec.de>
---
 arch/arm/boards/phytec-som-imx6/flash-header-phytec-pcaaxl3.h  | 2 +-
 arch/arm/boards/phytec-som-imx6/flash-header-phytec-pfla02.h   | 2 +-
 arch/arm/boards/phytec-som-imx6/flash-header-phytec-pfla02dl.h | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/arm/boards/phytec-som-imx6/flash-header-phytec-pcaaxl3.h b/arch/arm/boards/phytec-som-imx6/flash-header-phytec-pcaaxl3.h
index a03b8dc..ebcc1dd 100644
--- a/arch/arm/boards/phytec-som-imx6/flash-header-phytec-pcaaxl3.h
+++ b/arch/arm/boards/phytec-som-imx6/flash-header-phytec-pcaaxl3.h
@@ -1,5 +1,5 @@
 soc imx6
-loadaddr 0x20000000
+loadaddr 0x10000000
 dcdofs 0x400
 
 wm 32 0x020e05a8 0x00000028
diff --git a/arch/arm/boards/phytec-som-imx6/flash-header-phytec-pfla02.h b/arch/arm/boards/phytec-som-imx6/flash-header-phytec-pfla02.h
index 93291e9..507b9c6 100644
--- a/arch/arm/boards/phytec-som-imx6/flash-header-phytec-pfla02.h
+++ b/arch/arm/boards/phytec-som-imx6/flash-header-phytec-pfla02.h
@@ -1,5 +1,5 @@
 soc imx6
-loadaddr 0x20000000
+loadaddr 0x10000000
 dcdofs 0x400
 
 wm 32 0x020e0798 0x000C0000
diff --git a/arch/arm/boards/phytec-som-imx6/flash-header-phytec-pfla02dl.h b/arch/arm/boards/phytec-som-imx6/flash-header-phytec-pfla02dl.h
index 337488b..6cdf429 100644
--- a/arch/arm/boards/phytec-som-imx6/flash-header-phytec-pfla02dl.h
+++ b/arch/arm/boards/phytec-som-imx6/flash-header-phytec-pfla02dl.h
@@ -1,5 +1,5 @@
 soc imx6
-loadaddr 0x20000000
+loadaddr 0x10000000
 dcdofs 0x400
 
 wm 32 0x020e0774 0x000C0000
-- 
1.9.1


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 16+ messages in thread
* [PATCH 04/10] ARM: phytec-som-imx6: update environment
  2015-11-06 10:21 [PATCH 00/10] Rework towards phytec-som-imx6 and new variants Stefan Christ
                   ` (2 preceding siblings ...)
  2015-11-06 10:21 ` [PATCH 03/10] ARM: phytec-som-imx6: set loadaddr to start of DDR memory Stefan Christ
@ 2015-11-06 10:21 ` Stefan Christ
  2015-11-06 10:21 ` [PATCH 05/10] ARM: pfla02: append suffix 1bank Stefan Christ
                   ` (6 subsequent siblings)
  10 siblings, 0 replies; 16+ messages in thread
From: Stefan Christ @ 2015-11-06 10:21 UTC (permalink / raw)
  To: barebox

From: Christian Hemp <c.hemp@phytec.de>

Rename sd-ext3 to mmc, remove filesystem type from bootargs and remove
bootargs-ip. Add init script 'bootsource' to set boot source priority
and bootscript 'spi' for SPI NOR.

Signed-off-by: Christian Hemp <c.hemp@phytec.de>
Signed-off-by: Stefan Christ <s.christ@phytec.de>
---
 .../phytec-som-imx6/defaultenv-physom-imx6/boot/mmc       |  5 +++++
 .../phytec-som-imx6/defaultenv-physom-imx6/boot/nand      |  1 -
 .../phytec-som-imx6/defaultenv-physom-imx6/boot/sd-ext3   |  6 ------
 .../phytec-som-imx6/defaultenv-physom-imx6/boot/spi       |  5 +++++
 .../defaultenv-physom-imx6/init/bootsource                | 15 +++++++++++++++
 .../defaultenv-physom-imx6/nv/boot.default                |  1 -
 6 files changed, 25 insertions(+), 8 deletions(-)
 create mode 100644 arch/arm/boards/phytec-som-imx6/defaultenv-physom-imx6/boot/mmc
 delete mode 100644 arch/arm/boards/phytec-som-imx6/defaultenv-physom-imx6/boot/sd-ext3
 create mode 100644 arch/arm/boards/phytec-som-imx6/defaultenv-physom-imx6/boot/spi
 create mode 100644 arch/arm/boards/phytec-som-imx6/defaultenv-physom-imx6/init/bootsource
 delete mode 100644 arch/arm/boards/phytec-som-imx6/defaultenv-physom-imx6/nv/boot.default

diff --git a/arch/arm/boards/phytec-som-imx6/defaultenv-physom-imx6/boot/mmc b/arch/arm/boards/phytec-som-imx6/defaultenv-physom-imx6/boot/mmc
new file mode 100644
index 0000000..332fc26
--- /dev/null
+++ b/arch/arm/boards/phytec-som-imx6/defaultenv-physom-imx6/boot/mmc
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+global.bootm.image="/mnt/mmc/linuximage"
+global.bootm.oftree="/mnt/mmc/oftree"
+global.linux.bootargs.dyn.root="root=/dev/mmcblk0p2 rootwait rw"
diff --git a/arch/arm/boards/phytec-som-imx6/defaultenv-physom-imx6/boot/nand b/arch/arm/boards/phytec-som-imx6/defaultenv-physom-imx6/boot/nand
index 79dc03c..a23aa21 100644
--- a/arch/arm/boards/phytec-som-imx6/defaultenv-physom-imx6/boot/nand
+++ b/arch/arm/boards/phytec-som-imx6/defaultenv-physom-imx6/boot/nand
@@ -2,5 +2,4 @@
 
 global.bootm.image="/dev/nand0.kernel.bb"
 global.bootm.oftree="/dev/nand0.oftree.bb"
-bootargs-ip
 global.linux.bootargs.dyn.root="root=ubi0:root ubi.mtd=root rootfstype=ubifs rw"
diff --git a/arch/arm/boards/phytec-som-imx6/defaultenv-physom-imx6/boot/sd-ext3 b/arch/arm/boards/phytec-som-imx6/defaultenv-physom-imx6/boot/sd-ext3
deleted file mode 100644
index fd35fe0..0000000
--- a/arch/arm/boards/phytec-som-imx6/defaultenv-physom-imx6/boot/sd-ext3
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-global.bootm.image="/mnt/mmc/linuximage"
-global.bootm.oftree="/mnt/mmc/oftree"
-bootargs-ip
-global.linux.bootargs.dyn.root="root=/dev/mmcblk0p2 rootfstype=ext3 rootwait rw"
diff --git a/arch/arm/boards/phytec-som-imx6/defaultenv-physom-imx6/boot/spi b/arch/arm/boards/phytec-som-imx6/defaultenv-physom-imx6/boot/spi
new file mode 100644
index 0000000..2000a16
--- /dev/null
+++ b/arch/arm/boards/phytec-som-imx6/defaultenv-physom-imx6/boot/spi
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+global.bootm.image="/dev/m25p0.kernel"
+global.bootm.oftree="/dev/m25p0.oftree"
+global.linux.bootargs.dyn.root="root=ubi0:root ubi.mtd=root rootfstype=ubifs rw"
diff --git a/arch/arm/boards/phytec-som-imx6/defaultenv-physom-imx6/init/bootsource b/arch/arm/boards/phytec-som-imx6/defaultenv-physom-imx6/init/bootsource
new file mode 100644
index 0000000..3f2ff4b
--- /dev/null
+++ b/arch/arm/boards/phytec-som-imx6/defaultenv-physom-imx6/init/bootsource
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+if [ -n "$nv.boot.default" ]; then
+	exit
+fi
+
+if [ $bootsource = mmc ]; then
+	global.boot.default="mmc nand spi net"
+elif [ $bootsource = nand ]; then
+	global.boot.default="nand spi mmc net"
+elif [ $bootsource = spi ]; then
+	global.boot.default="spi nand mmc net"
+elif [ $bootsource = net ]; then
+	global.boot.default="net nand spi mmc"
+fi
diff --git a/arch/arm/boards/phytec-som-imx6/defaultenv-physom-imx6/nv/boot.default b/arch/arm/boards/phytec-som-imx6/defaultenv-physom-imx6/nv/boot.default
deleted file mode 100644
index 026a25c..0000000
--- a/arch/arm/boards/phytec-som-imx6/defaultenv-physom-imx6/nv/boot.default
+++ /dev/null
@@ -1 +0,0 @@
-nand
-- 
1.9.1


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 16+ messages in thread
* [PATCH 05/10] ARM: pfla02: append suffix 1bank
  2015-11-06 10:21 [PATCH 00/10] Rework towards phytec-som-imx6 and new variants Stefan Christ
                   ` (3 preceding siblings ...)
  2015-11-06 10:21 ` [PATCH 04/10] ARM: phytec-som-imx6: update environment Stefan Christ
@ 2015-11-06 10:21 ` Stefan Christ
  2015-11-06 10:21 ` [PATCH 06/10] ARM: imx6q: pfla02: Add support for 512MiB RAM on one bank Stefan Christ
                   ` (5 subsequent siblings)
  10 siblings, 0 replies; 16+ messages in thread
From: Stefan Christ @ 2015-11-06 10:21 UTC (permalink / raw)
  To: barebox

In the current naming schema the phyFLEX-i.MX6 variants which only use
one bank for memory have the suffix "1bank". The variants which use two
banks of memory have no suffix.

The patch fixes the name of the phyFLEX-i.MX6 Solo variant with 512MiB
on one bank. So the name of the image file changes from
    barebox-phytec-pbab01s-512mb.img
    barebox-phytec-phyboard-subra-512mb.img
to
    barebox-phytec-pbab01s-512mb-1bank.img
    barebox-phytec-phyboard-subra-512mb-1bank.img

This patch touches the phyFLEX-i.MX6 Kit variant and the
phyBOARD-SUBRA-i.MX6 which shares the same phyFLEX-i.MX6 module.

Signed-off-by: Stefan Christ <s.christ@phytec.de>
---
 ...fg => flash-header-phytec-pfla02s-512mb-1bank.imxcfg} |  0
 arch/arm/boards/phytec-som-imx6/lowlevel.c               |  4 ++--
 images/Makefile.imx                                      | 16 ++++++++--------
 3 files changed, 10 insertions(+), 10 deletions(-)
 rename arch/arm/boards/phytec-som-imx6/{flash-header-phytec-pfla02s-512mb.imxcfg => flash-header-phytec-pfla02s-512mb-1bank.imxcfg} (100%)

diff --git a/arch/arm/boards/phytec-som-imx6/flash-header-phytec-pfla02s-512mb.imxcfg b/arch/arm/boards/phytec-som-imx6/flash-header-phytec-pfla02s-512mb-1bank.imxcfg
similarity index 100%
rename from arch/arm/boards/phytec-som-imx6/flash-header-phytec-pfla02s-512mb.imxcfg
rename to arch/arm/boards/phytec-som-imx6/flash-header-phytec-pfla02s-512mb-1bank.imxcfg
diff --git a/arch/arm/boards/phytec-som-imx6/lowlevel.c b/arch/arm/boards/phytec-som-imx6/lowlevel.c
index a3d375e..351a4fd 100644
--- a/arch/arm/boards/phytec-som-imx6/lowlevel.c
+++ b/arch/arm/boards/phytec-som-imx6/lowlevel.c
@@ -82,6 +82,6 @@ PHYTEC_ENTRY(start_phytec_pbab01_1gib_1bank, imx6q_phytec_pbab01, SZ_1G, true);
 PHYTEC_ENTRY(start_phytec_pbab01_2gib, imx6q_phytec_pbab01, SZ_2G, true);
 PHYTEC_ENTRY(start_phytec_pbab01_4gib, imx6q_phytec_pbab01, SZ_4G, true);
 PHYTEC_ENTRY(start_phytec_pbab01dl_1gib, imx6dl_phytec_pbab01, SZ_1G, false);
-PHYTEC_ENTRY(start_phytec_pbab01s_512mb, imx6s_phytec_pbab01, SZ_512M, false);
+PHYTEC_ENTRY(start_phytec_pbab01s_512mb_1bank, imx6s_phytec_pbab01, SZ_512M, false);
 PHYTEC_ENTRY(start_phytec_phyboard_alcor_1gib, imx6q_phytec_phyboard_alcor, SZ_1G, false);
-PHYTEC_ENTRY(start_phytec_phyboard_subra_512mb, imx6dl_phytec_phyboard_subra, SZ_512M, false);
+PHYTEC_ENTRY(start_phytec_phyboard_subra_512mb_1bank, imx6dl_phytec_phyboard_subra, SZ_512M, false);
diff --git a/images/Makefile.imx b/images/Makefile.imx
index af66df1..62bd83c 100644
--- a/images/Makefile.imx
+++ b/images/Makefile.imx
@@ -152,20 +152,20 @@ CFG_start_phytec_pbab01dl_1gib.pblx.imximg = $(board)/phytec-som-imx6/flash-head
 FILE_barebox-phytec-pbab01dl-1gib.img = start_phytec_pbab01dl_1gib.pblx.imximg
 image-$(CONFIG_MACH_PHYTEC_SOM_IMX6) += barebox-phytec-pbab01dl-1gib.img
 
-pblx-$(CONFIG_MACH_PHYTEC_SOM_IMX6) += start_phytec_pbab01s_512mb
-CFG_start_phytec_pbab01s_512mb.pblx.imximg = $(board)/phytec-som-imx6/flash-header-phytec-pfla02s-512mb.imxcfg
-FILE_barebox-phytec-pbab01s-512mb.img = start_phytec_pbab01s_512mb.pblx.imximg
-image-$(CONFIG_MACH_PHYTEC_SOM_IMX6) += barebox-phytec-pbab01s-512mb.img
+pblx-$(CONFIG_MACH_PHYTEC_SOM_IMX6) += start_phytec_pbab01s_512mb_1bank
+CFG_start_phytec_pbab01s_512mb_1bank.pblx.imximg = $(board)/phytec-som-imx6/flash-header-phytec-pfla02s-512mb-1bank.imxcfg
+FILE_barebox-phytec-pbab01s-512mb-1bank.img = start_phytec_pbab01s_512mb_1bank.pblx.imximg
+image-$(CONFIG_MACH_PHYTEC_SOM_IMX6) += barebox-phytec-pbab01s-512mb-1bank.img
 
 pblx-$(CONFIG_MACH_PHYTEC_SOM_IMX6) += start_phytec_phyboard_alcor_1gib
 CFG_start_phytec_phyboard_alcor_1gib.pblx.imximg = $(board)/phytec-som-imx6/flash-header-phytec-pfla02-1gib.imxcfg
 FILE_barebox-phytec-phyboard-alcor-1gib.img = start_phytec_phyboard_alcor_1gib.pblx.imximg
 image-$(CONFIG_MACH_PHYTEC_SOM_IMX6) += barebox-phytec-phyboard-alcor-1gib.img
 
-pblx-$(CONFIG_MACH_PHYTEC_SOM_IMX6) += start_phytec_phyboard_subra_512mb
-CFG_start_phytec_phyboard_subra_512mb.pblx.imximg = $(board)/phytec-som-imx6/flash-header-phytec-pfla02s-512mb.imxcfg
-FILE_barebox-phytec-phyboard-subra-512mb.img = start_phytec_phyboard_subra_512mb.pblx.imximg
-image-$(CONFIG_MACH_PHYTEC_SOM_IMX6) += barebox-phytec-phyboard-subra-512mb.img
+pblx-$(CONFIG_MACH_PHYTEC_SOM_IMX6) += start_phytec_phyboard_subra_512mb_1bank
+CFG_start_phytec_phyboard_subra_512mb_1bank.pblx.imximg = $(board)/phytec-som-imx6/flash-header-phytec-pfla02s-512mb-1bank.imxcfg
+FILE_barebox-phytec-phyboard-subra-512mb-1bank.img = start_phytec_phyboard_subra_512mb_1bank.pblx.imximg
+image-$(CONFIG_MACH_PHYTEC_SOM_IMX6) += barebox-phytec-phyboard-subra-512mb-1bank.img
 
 pblx-$(CONFIG_MACH_DFI_FS700_M60) += start_imx6dl_dfi_fs700_m60_6s
 CFG_start_imx6dl_dfi_fs700_m60_6s.pblx.imximg = $(board)/dfi-fs700-m60/flash-header-fs700-m60-6s.imxcfg
-- 
1.9.1


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 16+ messages in thread
* [PATCH 06/10] ARM: imx6q: pfla02: Add support for 512MiB RAM on one bank
  2015-11-06 10:21 [PATCH 00/10] Rework towards phytec-som-imx6 and new variants Stefan Christ
                   ` (4 preceding siblings ...)
  2015-11-06 10:21 ` [PATCH 05/10] ARM: pfla02: append suffix 1bank Stefan Christ
@ 2015-11-06 10:21 ` Stefan Christ
  2015-11-06 10:21 ` [PATCH 07/10] ARM: imx6dl: pfla02: Add support for 128MB and 256MB RAM Stefan Christ
                   ` (4 subsequent siblings)
  10 siblings, 0 replies; 16+ messages in thread
From: Stefan Christ @ 2015-11-06 10:21 UTC (permalink / raw)
  To: barebox

Add support for phyFLEX-i.MX6 Quad 512MiB RAM on one bank.

Signed-off-by: Stefan Christ <s.christ@phytec.de>
---
 .../phytec-som-imx6/flash-header-phytec-pfla02-512mb-1bank.imxcfg | 8 ++++++++
 arch/arm/boards/phytec-som-imx6/lowlevel.c                        | 1 +
 images/Makefile.imx                                               | 5 +++++
 3 files changed, 14 insertions(+)
 create mode 100644 arch/arm/boards/phytec-som-imx6/flash-header-phytec-pfla02-512mb-1bank.imxcfg

diff --git a/arch/arm/boards/phytec-som-imx6/flash-header-phytec-pfla02-512mb-1bank.imxcfg b/arch/arm/boards/phytec-som-imx6/flash-header-phytec-pfla02-512mb-1bank.imxcfg
new file mode 100644
index 0000000..d6bbe1f
--- /dev/null
+++ b/arch/arm/boards/phytec-som-imx6/flash-header-phytec-pfla02-512mb-1bank.imxcfg
@@ -0,0 +1,8 @@
+#define SETUP_MDCFG0			\
+	wm 32 0x021b000c 0x555a7975
+
+#define SETUP_MDASP_MDCTL		\
+	wm 32 0x021b0040 0x00000017;	\
+	wm 32 0x021b0000 0x821a0000
+
+#include "flash-header-phytec-pfla02.h"
diff --git a/arch/arm/boards/phytec-som-imx6/lowlevel.c b/arch/arm/boards/phytec-som-imx6/lowlevel.c
index 351a4fd..beb9be6 100644
--- a/arch/arm/boards/phytec-som-imx6/lowlevel.c
+++ b/arch/arm/boards/phytec-som-imx6/lowlevel.c
@@ -77,6 +77,7 @@ 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_pbab01_512mb_1bank, imx6q_phytec_pbab01, SZ_512M, true);
 PHYTEC_ENTRY(start_phytec_pbab01_1gib, imx6q_phytec_pbab01, SZ_1G, true);
 PHYTEC_ENTRY(start_phytec_pbab01_1gib_1bank, imx6q_phytec_pbab01, SZ_1G, true);
 PHYTEC_ENTRY(start_phytec_pbab01_2gib, imx6q_phytec_pbab01, SZ_2G, true);
diff --git a/images/Makefile.imx b/images/Makefile.imx
index 62bd83c..3dc3e82 100644
--- a/images/Makefile.imx
+++ b/images/Makefile.imx
@@ -147,6 +147,11 @@ CFG_start_phytec_pbab01_1gib_1bank.pblx.imximg = $(board)/phytec-som-imx6/flash-
 FILE_barebox-phytec-pbab01-1gib-1bank.img = start_phytec_pbab01_1gib_1bank.pblx.imximg
 image-$(CONFIG_MACH_PHYTEC_SOM_IMX6) += barebox-phytec-pbab01-1gib-1bank.img
 
+pblx-$(CONFIG_MACH_PHYTEC_SOM_IMX6) += start_phytec_pbab01_512mb_1bank
+CFG_start_phytec_pbab01_512mb_1bank.pblx.imximg = $(board)/phytec-som-imx6/flash-header-phytec-pfla02-512mb-1bank.imxcfg
+FILE_barebox-phytec-pbab01-512mb-1bank.img = start_phytec_pbab01_512mb_1bank.pblx.imximg
+image-$(CONFIG_MACH_PHYTEC_SOM_IMX6) += barebox-phytec-pbab01-512mb-1bank.img
+
 pblx-$(CONFIG_MACH_PHYTEC_SOM_IMX6) += start_phytec_pbab01dl_1gib
 CFG_start_phytec_pbab01dl_1gib.pblx.imximg = $(board)/phytec-som-imx6/flash-header-phytec-pfla02dl-1gib.imxcfg
 FILE_barebox-phytec-pbab01dl-1gib.img = start_phytec_pbab01dl_1gib.pblx.imximg
-- 
1.9.1


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 16+ messages in thread
* [PATCH 07/10] ARM: imx6dl: pfla02: Add support for 128MB and 256MB RAM
  2015-11-06 10:21 [PATCH 00/10] Rework towards phytec-som-imx6 and new variants Stefan Christ
                   ` (5 preceding siblings ...)
  2015-11-06 10:21 ` [PATCH 06/10] ARM: imx6q: pfla02: Add support for 512MiB RAM on one bank Stefan Christ
@ 2015-11-06 10:21 ` Stefan Christ
  2015-11-06 10:21 ` [PATCH 08/10] ARM: imx6q: pfla02: add phyFLEX-i.MX6 DualLite 1GiB on one bank Stefan Christ
                   ` (3 subsequent siblings)
  10 siblings, 0 replies; 16+ messages in thread
From: Stefan Christ @ 2015-11-06 10:21 UTC (permalink / raw)
  To: barebox

Add support for phyFLEX-i.MX6 Solo with 128MB and 256MB RAM on one
memory bank.

Signed-off-by: Stefan Christ <s.christ@phytec.de>
---
 .../flash-header-phytec-pfla02s-128mb-1bank.imxcfg             |  8 ++++++++
 .../flash-header-phytec-pfla02s-256mb-1bank.imxcfg             |  8 ++++++++
 arch/arm/boards/phytec-som-imx6/lowlevel.c                     |  4 ++++
 images/Makefile.imx                                            | 10 ++++++++++
 4 files changed, 30 insertions(+)
 create mode 100644 arch/arm/boards/phytec-som-imx6/flash-header-phytec-pfla02s-128mb-1bank.imxcfg
 create mode 100644 arch/arm/boards/phytec-som-imx6/flash-header-phytec-pfla02s-256mb-1bank.imxcfg

diff --git a/arch/arm/boards/phytec-som-imx6/flash-header-phytec-pfla02s-128mb-1bank.imxcfg b/arch/arm/boards/phytec-som-imx6/flash-header-phytec-pfla02s-128mb-1bank.imxcfg
new file mode 100644
index 0000000..26fe2b2
--- /dev/null
+++ b/arch/arm/boards/phytec-som-imx6/flash-header-phytec-pfla02s-128mb-1bank.imxcfg
@@ -0,0 +1,8 @@
+#define SETUP_MDCFG0                    \
+        wm 32 0x021b000c 0x3c409b85
+
+#define SETUP_MDASP_MDCTL		\
+        wm 32 0x021b0040 0x0000000B;    \
+        wm 32 0x021b0000 0x82180000
+
+#include "flash-header-phytec-pfla02dl.h"
diff --git a/arch/arm/boards/phytec-som-imx6/flash-header-phytec-pfla02s-256mb-1bank.imxcfg b/arch/arm/boards/phytec-som-imx6/flash-header-phytec-pfla02s-256mb-1bank.imxcfg
new file mode 100644
index 0000000..babb0df
--- /dev/null
+++ b/arch/arm/boards/phytec-som-imx6/flash-header-phytec-pfla02s-256mb-1bank.imxcfg
@@ -0,0 +1,8 @@
+#define SETUP_MDCFG0                    \
+        wm 32 0x021b000c 0x3c409b85
+
+#define SETUP_MDASP_MDCTL		\
+        wm 32 0x021b0040 0x0000000F;    \
+        wm 32 0x021b0000 0x82190000
+
+#include "flash-header-phytec-pfla02dl.h"
diff --git a/arch/arm/boards/phytec-som-imx6/lowlevel.c b/arch/arm/boards/phytec-som-imx6/lowlevel.c
index beb9be6..c6c3dd6 100644
--- a/arch/arm/boards/phytec-som-imx6/lowlevel.c
+++ b/arch/arm/boards/phytec-som-imx6/lowlevel.c
@@ -40,6 +40,8 @@ static inline void setup_uart(void)
 
 #define SZ_4G 0xEFFFFFF8
 
+BAREBOX_IMD_TAG_STRING(physom_mx6_memsize_SZ_128M, IMD_TYPE_PARAMETER, "memsize=128", 0);
+BAREBOX_IMD_TAG_STRING(physom_mx6_memsize_SZ_256M, IMD_TYPE_PARAMETER, "memsize=256", 0);
 BAREBOX_IMD_TAG_STRING(physom_mx6_memsize_SZ_512M, IMD_TYPE_PARAMETER, "memsize=512", 0);
 BAREBOX_IMD_TAG_STRING(physom_mx6_memsize_SZ_1G, IMD_TYPE_PARAMETER, "memsize=1024", 0);
 BAREBOX_IMD_TAG_STRING(physom_mx6_memsize_SZ_2G, IMD_TYPE_PARAMETER, "memsize=2048", 0);
@@ -83,6 +85,8 @@ PHYTEC_ENTRY(start_phytec_pbab01_1gib_1bank, imx6q_phytec_pbab01, SZ_1G, true);
 PHYTEC_ENTRY(start_phytec_pbab01_2gib, imx6q_phytec_pbab01, SZ_2G, true);
 PHYTEC_ENTRY(start_phytec_pbab01_4gib, imx6q_phytec_pbab01, SZ_4G, true);
 PHYTEC_ENTRY(start_phytec_pbab01dl_1gib, imx6dl_phytec_pbab01, SZ_1G, false);
+PHYTEC_ENTRY(start_phytec_pbab01s_128mb_1bank, imx6s_phytec_pbab01, SZ_128M, false);
+PHYTEC_ENTRY(start_phytec_pbab01s_256mb_1bank, imx6s_phytec_pbab01, SZ_256M, false);
 PHYTEC_ENTRY(start_phytec_pbab01s_512mb_1bank, imx6s_phytec_pbab01, SZ_512M, false);
 PHYTEC_ENTRY(start_phytec_phyboard_alcor_1gib, imx6q_phytec_phyboard_alcor, SZ_1G, false);
 PHYTEC_ENTRY(start_phytec_phyboard_subra_512mb_1bank, imx6dl_phytec_phyboard_subra, SZ_512M, false);
diff --git a/images/Makefile.imx b/images/Makefile.imx
index 3dc3e82..d1dfd37 100644
--- a/images/Makefile.imx
+++ b/images/Makefile.imx
@@ -162,6 +162,16 @@ CFG_start_phytec_pbab01s_512mb_1bank.pblx.imximg = $(board)/phytec-som-imx6/flas
 FILE_barebox-phytec-pbab01s-512mb-1bank.img = start_phytec_pbab01s_512mb_1bank.pblx.imximg
 image-$(CONFIG_MACH_PHYTEC_SOM_IMX6) += barebox-phytec-pbab01s-512mb-1bank.img
 
+pblx-$(CONFIG_MACH_PHYTEC_SOM_IMX6) += start_phytec_pbab01s_256mb_1bank
+CFG_start_phytec_pbab01s_256mb_1bank.pblx.imximg = $(board)/phytec-som-imx6/flash-header-phytec-pfla02s-256mb-1bank.imxcfg
+FILE_barebox-phytec-pbab01s-256mb-1bank.img = start_phytec_pbab01s_256mb_1bank.pblx.imximg
+image-$(CONFIG_MACH_PHYTEC_SOM_IMX6) += barebox-phytec-pbab01s-256mb-1bank.img
+
+pblx-$(CONFIG_MACH_PHYTEC_SOM_IMX6) += start_phytec_pbab01s_128mb_1bank
+CFG_start_phytec_pbab01s_128mb_1bank.pblx.imximg = $(board)/phytec-som-imx6/flash-header-phytec-pfla02s-128mb-1bank.imxcfg
+FILE_barebox-phytec-pbab01s-128mb-1bank.img = start_phytec_pbab01s_128mb_1bank.pblx.imximg
+image-$(CONFIG_MACH_PHYTEC_SOM_IMX6) += barebox-phytec-pbab01s-128mb-1bank.img
+
 pblx-$(CONFIG_MACH_PHYTEC_SOM_IMX6) += start_phytec_phyboard_alcor_1gib
 CFG_start_phytec_phyboard_alcor_1gib.pblx.imximg = $(board)/phytec-som-imx6/flash-header-phytec-pfla02-1gib.imxcfg
 FILE_barebox-phytec-phyboard-alcor-1gib.img = start_phytec_phyboard_alcor_1gib.pblx.imximg
-- 
1.9.1


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 16+ messages in thread
* [PATCH 08/10] ARM: imx6q: pfla02: add phyFLEX-i.MX6 DualLite 1GiB on one bank
  2015-11-06 10:21 [PATCH 00/10] Rework towards phytec-som-imx6 and new variants Stefan Christ
                   ` (6 preceding siblings ...)
  2015-11-06 10:21 ` [PATCH 07/10] ARM: imx6dl: pfla02: Add support for 128MB and 256MB RAM Stefan Christ
@ 2015-11-06 10:21 ` Stefan Christ
  2015-11-06 10:21 ` [PATCH 09/10] ARM: imx6q: Add support for Phytec phyCORE-i.MX6 SOM Stefan Christ
                   ` (2 subsequent siblings)
  10 siblings, 0 replies; 16+ messages in thread
From: Stefan Christ @ 2015-11-06 10:21 UTC (permalink / raw)
  To: barebox

Add support for phyFLEX-i.MX6 DualLite 1GiB on one bank with NOR.

Signed-off-by: Stefan Christ <s.christ@phytec.de>
---
 .../flash-header-phytec-pfla02dl-1gib-1bank.imxcfg                | 8 ++++++++
 arch/arm/boards/phytec-som-imx6/lowlevel.c                        | 1 +
 images/Makefile.imx                                               | 5 +++++
 3 files changed, 14 insertions(+)
 create mode 100644 arch/arm/boards/phytec-som-imx6/flash-header-phytec-pfla02dl-1gib-1bank.imxcfg

diff --git a/arch/arm/boards/phytec-som-imx6/flash-header-phytec-pfla02dl-1gib-1bank.imxcfg b/arch/arm/boards/phytec-som-imx6/flash-header-phytec-pfla02dl-1gib-1bank.imxcfg
new file mode 100644
index 0000000..156eea9
--- /dev/null
+++ b/arch/arm/boards/phytec-som-imx6/flash-header-phytec-pfla02dl-1gib-1bank.imxcfg
@@ -0,0 +1,8 @@
+#define SETUP_MDCFG0                    \
+	wm 32 0x021b000c 0x565c9b85
+
+#define SETUP_MDASP_MDCTL		\
+	wm 32 0x021b0040 0x00000027;	\
+	wm 32 0x021b0000 0x831a0000
+
+#include "flash-header-phytec-pfla02dl.h"
diff --git a/arch/arm/boards/phytec-som-imx6/lowlevel.c b/arch/arm/boards/phytec-som-imx6/lowlevel.c
index c6c3dd6..5e81155 100644
--- a/arch/arm/boards/phytec-som-imx6/lowlevel.c
+++ b/arch/arm/boards/phytec-som-imx6/lowlevel.c
@@ -85,6 +85,7 @@ PHYTEC_ENTRY(start_phytec_pbab01_1gib_1bank, imx6q_phytec_pbab01, SZ_1G, true);
 PHYTEC_ENTRY(start_phytec_pbab01_2gib, imx6q_phytec_pbab01, SZ_2G, true);
 PHYTEC_ENTRY(start_phytec_pbab01_4gib, imx6q_phytec_pbab01, SZ_4G, true);
 PHYTEC_ENTRY(start_phytec_pbab01dl_1gib, imx6dl_phytec_pbab01, SZ_1G, false);
+PHYTEC_ENTRY(start_phytec_pbab01dl_1gib_1bank, imx6dl_phytec_pbab01, SZ_1G, false);
 PHYTEC_ENTRY(start_phytec_pbab01s_128mb_1bank, imx6s_phytec_pbab01, SZ_128M, false);
 PHYTEC_ENTRY(start_phytec_pbab01s_256mb_1bank, imx6s_phytec_pbab01, SZ_256M, false);
 PHYTEC_ENTRY(start_phytec_pbab01s_512mb_1bank, imx6s_phytec_pbab01, SZ_512M, false);
diff --git a/images/Makefile.imx b/images/Makefile.imx
index d1dfd37..0aef6ca 100644
--- a/images/Makefile.imx
+++ b/images/Makefile.imx
@@ -157,6 +157,11 @@ CFG_start_phytec_pbab01dl_1gib.pblx.imximg = $(board)/phytec-som-imx6/flash-head
 FILE_barebox-phytec-pbab01dl-1gib.img = start_phytec_pbab01dl_1gib.pblx.imximg
 image-$(CONFIG_MACH_PHYTEC_SOM_IMX6) += barebox-phytec-pbab01dl-1gib.img
 
+pblx-$(CONFIG_MACH_PHYTEC_SOM_IMX6) += start_phytec_pbab01dl_1gib_1bank
+CFG_start_phytec_pbab01dl_1gib_1bank.pblx.imximg = $(board)/phytec-som-imx6/flash-header-phytec-pfla02dl-1gib-1bank.imxcfg
+FILE_barebox-phytec-pbab01dl-1gib-1bank.img = start_phytec_pbab01dl_1gib_1bank.pblx.imximg
+image-$(CONFIG_MACH_PHYTEC_SOM_IMX6) += barebox-phytec-pbab01dl-1gib-1bank.img
+
 pblx-$(CONFIG_MACH_PHYTEC_SOM_IMX6) += start_phytec_pbab01s_512mb_1bank
 CFG_start_phytec_pbab01s_512mb_1bank.pblx.imximg = $(board)/phytec-som-imx6/flash-header-phytec-pfla02s-512mb-1bank.imxcfg
 FILE_barebox-phytec-pbab01s-512mb-1bank.img = start_phytec_pbab01s_512mb_1bank.pblx.imximg
-- 
1.9.1


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 16+ messages in thread
* [PATCH 09/10] ARM: imx6q: Add support for Phytec phyCORE-i.MX6 SOM
  2015-11-06 10:21 [PATCH 00/10] Rework towards phytec-som-imx6 and new variants Stefan Christ
                   ` (7 preceding siblings ...)
  2015-11-06 10:21 ` [PATCH 08/10] ARM: imx6q: pfla02: add phyFLEX-i.MX6 DualLite 1GiB on one bank Stefan Christ
@ 2015-11-06 10:21 ` Stefan Christ
  2015-11-06 10:21 ` [PATCH 10/10] ARM: imx6dl: " Stefan Christ
  2015-11-09  6:49 ` [PATCH 00/10] Rework towards phytec-som-imx6 and new variants Sascha Hauer
  10 siblings, 0 replies; 16+ messages in thread
From: Stefan Christ @ 2015-11-06 10:21 UTC (permalink / raw)
  To: barebox

From: Christian Hemp <c.hemp@phytec.de>

Add Phytec phyCORE-i.MX6 SOM.
    Support:
     - imx6q-phytec-phycore-som-nand:
        - 1GB RAM on 1 Bank with 64Bit
        - 1GBit Ethernet
        - SPI NOR
        - NAND
        - SD
        - UART

     - imx6q-phytec-phycore-som-emmc
        - 1GB RAM on 1 Bank with 64Bit
        - 1GBit Ethernet
        - SPI NOR
        - eMMC
        - SD
        - UART

Signed-off-by: Christian Hemp <c.hemp@phytec.de>
Signed-off-by: Stefan Christ <s.christ@phytec.de>
---
 arch/arm/boards/phytec-som-imx6/Makefile           |   1 +
 arch/arm/boards/phytec-som-imx6/board.c            |  13 +
 .../defaultenv-physom-imx6-mira/init/automount     |  14 ++
 .../flash-header-phytec-pcm058-1gib.imxcfg         |   8 +
 .../phytec-som-imx6/flash-header-phytec-pcm058.h   | 102 ++++++++
 arch/arm/boards/phytec-som-imx6/lowlevel.c         |   3 +
 arch/arm/dts/Makefile                              |   4 +-
 arch/arm/dts/imx6q-phytec-phycore-som-emmc.dts     |  50 ++++
 arch/arm/dts/imx6q-phytec-phycore-som-nand.dts     |  72 ++++++
 arch/arm/dts/imx6qdl-phytec-phycore-som.dtsi       | 266 +++++++++++++++++++++
 images/Makefile.imx                                |  10 +
 11 files changed, 542 insertions(+), 1 deletion(-)
 create mode 100644 arch/arm/boards/phytec-som-imx6/defaultenv-physom-imx6-mira/init/automount
 create mode 100644 arch/arm/boards/phytec-som-imx6/flash-header-phytec-pcm058-1gib.imxcfg
 create mode 100644 arch/arm/boards/phytec-som-imx6/flash-header-phytec-pcm058.h
 create mode 100644 arch/arm/dts/imx6q-phytec-phycore-som-emmc.dts
 create mode 100644 arch/arm/dts/imx6q-phytec-phycore-som-nand.dts
 create mode 100644 arch/arm/dts/imx6qdl-phytec-phycore-som.dtsi

diff --git a/arch/arm/boards/phytec-som-imx6/Makefile b/arch/arm/boards/phytec-som-imx6/Makefile
index 7e385c2..c61e9cd 100644
--- a/arch/arm/boards/phytec-som-imx6/Makefile
+++ b/arch/arm/boards/phytec-som-imx6/Makefile
@@ -1,3 +1,4 @@
 obj-y += board.o
 lwl-y += lowlevel.o
 bbenv-y += defaultenv-physom-imx6
+bbenv-y += defaultenv-physom-imx6-mira
diff --git a/arch/arm/boards/phytec-som-imx6/board.c b/arch/arm/boards/phytec-som-imx6/board.c
index 2afe685..639a562 100644
--- a/arch/arm/boards/phytec-som-imx6/board.c
+++ b/arch/arm/boards/phytec-som-imx6/board.c
@@ -111,6 +111,13 @@ static int physom_imx6_devices_init(void)
 		default_environment_path = "/chosen/environment-nand";
 		default_envdev = "NAND flash";
 
+	} else if (of_machine_is_compatible("phytec,imx6q-pcm058-nand")
+		|| of_machine_is_compatible("phytec,imx6q-pcm058-emmc")) {
+
+		barebox_set_hostname("phyCORE-i.MX6");
+		default_environment_path = "/chosen/environment-spinor";
+		default_envdev = "SPI NOR flash";
+
 	} else
 		return 0;
 
@@ -148,6 +155,12 @@ static int physom_imx6_devices_init(void)
 
 	defaultenv_append_directory(defaultenv_physom_imx6);
 
+	/* Overwrite file /env/init/automount */
+	if (of_machine_is_compatible("phytec,imx6q-pcm058-nand")
+		|| of_machine_is_compatible("phytec,imx6q-pcm058-emmc")) {
+		defaultenv_append_directory(defaultenv_physom_imx6_mira);
+	}
+
 	return 0;
 }
 device_initcall(physom_imx6_devices_init);
diff --git a/arch/arm/boards/phytec-som-imx6/defaultenv-physom-imx6-mira/init/automount b/arch/arm/boards/phytec-som-imx6/defaultenv-physom-imx6-mira/init/automount
new file mode 100644
index 0000000..3659cf7
--- /dev/null
+++ b/arch/arm/boards/phytec-som-imx6/defaultenv-physom-imx6-mira/init/automount
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+if [ "$1" = menu ]; then
+	init-menu-add-entry "$0" "Automountpoints"
+	exit
+fi
+
+# automount tftp server based on $eth0.serverip
+
+mkdir -p /mnt/tftp
+automount /mnt/tftp 'ifup eth0 && mount -t tftp $eth0.serverip /mnt/tftp'
+
+mkdir -p /mnt/mmc
+automount -d /mnt/mmc 'mmc0.probe=1 && [ -e /dev/mmc0.0 ] && mount /dev/mmc0.0 /mnt/mmc'
diff --git a/arch/arm/boards/phytec-som-imx6/flash-header-phytec-pcm058-1gib.imxcfg b/arch/arm/boards/phytec-som-imx6/flash-header-phytec-pcm058-1gib.imxcfg
new file mode 100644
index 0000000..5df46b9
--- /dev/null
+++ b/arch/arm/boards/phytec-som-imx6/flash-header-phytec-pcm058-1gib.imxcfg
@@ -0,0 +1,8 @@
+#define SETUP_MDCFG0			\
+	wm 32 0x021b000c 0x555A7955
+
+#define SETUP_MDASP_MDCTL		\
+	wm 32 0x021b0040 0x00000027;	\
+	wm 32 0x021b0000 0x831A0000
+
+#include "flash-header-phytec-pcm058.h"
diff --git a/arch/arm/boards/phytec-som-imx6/flash-header-phytec-pcm058.h b/arch/arm/boards/phytec-som-imx6/flash-header-phytec-pcm058.h
new file mode 100644
index 0000000..7cdf45c
--- /dev/null
+++ b/arch/arm/boards/phytec-som-imx6/flash-header-phytec-pcm058.h
@@ -0,0 +1,102 @@
+soc imx6
+loadaddr 0x10000000
+dcdofs 0x400
+
+wm 32 0x020e0798 0x000C0000
+wm 32 0x020e0758 0x00000000
+wm 32 0x020e0588 0x00000030
+wm 32 0x020e0594 0x00000030
+wm 32 0x020e056c 0x00000030
+wm 32 0x020e0578 0x00000030
+wm 32 0x020e074c 0x00000030
+wm 32 0x020e057c 0x00000030
+wm 32 0x020e058c 0x00000000
+wm 32 0x020e059c 0x00000030
+wm 32 0x020e05a0 0x00000030
+wm 32 0x020e0590 0x00003000
+wm 32 0x020e0598 0x00003000
+wm 32 0x020e078c 0x00000030
+wm 32 0x020e0750 0x00020000
+wm 32 0x020e05a8 0x00000028
+wm 32 0x020e05b0 0x00000028
+wm 32 0x020e0524 0x00000028
+wm 32 0x020e051c 0x00000028
+wm 32 0x020e0518 0x00000028
+wm 32 0x020e050c 0x00000028
+wm 32 0x020e05b8 0x00000028
+wm 32 0x020e05c0 0x00000028
+wm 32 0x020e0774 0x00020000
+wm 32 0x020e0784 0x00000028
+wm 32 0x020e0788 0x00000028
+wm 32 0x020e0794 0x00000028
+wm 32 0x020e079c 0x00000028
+wm 32 0x020e07a0 0x00000028
+wm 32 0x020e07a4 0x00000028
+wm 32 0x020e07a8 0x00000028
+wm 32 0x020e0748 0x00000028
+wm 32 0x020e05ac 0x00000028
+wm 32 0x020e05b4 0x00000028
+wm 32 0x020e0528 0x00000028
+wm 32 0x020e0520 0x00000028
+wm 32 0x020e0514 0x00000028
+wm 32 0x020e0510 0x00000028
+wm 32 0x020e05bc 0x00000028
+wm 32 0x020e05c4 0x00000028
+wm 32 0x021b0800 0xa1390003
+wm 32 0x021b4800 0xa1380003
+wm 32 0x021b080c 0x00140014
+wm 32 0x021b0810 0x00230018
+wm 32 0x021b480c 0x000A001E
+wm 32 0x021b4810 0x000A0015
+wm 32 0x021b083c 0x43080314
+wm 32 0x021b0840 0x02680300
+wm 32 0x021b483c 0x430C0318
+wm 32 0x021b4840 0x03000254
+wm 32 0x021b0848 0x3A323234
+wm 32 0x021b4848 0x3E3C3242
+wm 32 0x021b0850 0x2A2E3632
+wm 32 0x021b4850 0x3C323E34
+wm 32 0x021b081c 0x33333333
+wm 32 0x021b0820 0x33333333
+wm 32 0x021b0824 0x33333333
+wm 32 0x021b0828 0x33333333
+wm 32 0x021b481c 0x33333333
+wm 32 0x021b4820 0x33333333
+wm 32 0x021b4824 0x33333333
+wm 32 0x021b4828 0x33333333
+wm 32 0x021b08b8 0x00000800
+wm 32 0x021b48b8 0x00000800
+wm 32 0x021b0004 0x00020036
+wm 32 0x021b0008 0x09444040
+
+SETUP_MDCFG0
+
+wm 32 0x021b0010 0xFF328F64
+wm 32 0x021b0014 0x01FF00DB
+wm 32 0x021b0018 0x00011740
+wm 32 0x021b001c 0x00008000
+wm 32 0x021b002c 0x000026d2
+wm 32 0x021b0030 0x003F1023
+
+SETUP_MDASP_MDCTL
+
+wm 32 0x021b001c 0x04088032
+wm 32 0x021b001c 0x0408803a
+wm 32 0x021b001c 0x00008033
+wm 32 0x021b001c 0x0000803b
+wm 32 0x021b001c 0x00048031
+wm 32 0x021b001c 0x00048039
+wm 32 0x021b001c 0x09408030
+wm 32 0x021b001c 0x09408038
+wm 32 0x021b001c 0x04008040
+wm 32 0x021b001c 0x04008048
+wm 32 0x021b0020 0x00007800
+wm 32 0x021b0818 0x00011117
+wm 32 0x021b4818 0x00011117
+wm 32 0x021b0004 0x00025576
+wm 32 0x021b0404 0x00011006
+wm 32 0x021b001c 0x00000000
+wm 32 0x020e0010 0xf00000ff
+wm 32 0x020e0018 0x007F007F
+wm 32 0x020e001c 0x007F007F
+wm 32 0x020c8000 0x80002021
diff --git a/arch/arm/boards/phytec-som-imx6/lowlevel.c b/arch/arm/boards/phytec-som-imx6/lowlevel.c
index 5e81155..555487b 100644
--- a/arch/arm/boards/phytec-som-imx6/lowlevel.c
+++ b/arch/arm/boards/phytec-som-imx6/lowlevel.c
@@ -91,3 +91,6 @@ PHYTEC_ENTRY(start_phytec_pbab01s_256mb_1bank, imx6s_phytec_pbab01, SZ_256M, fal
 PHYTEC_ENTRY(start_phytec_pbab01s_512mb_1bank, imx6s_phytec_pbab01, SZ_512M, false);
 PHYTEC_ENTRY(start_phytec_phyboard_alcor_1gib, imx6q_phytec_phyboard_alcor, SZ_1G, false);
 PHYTEC_ENTRY(start_phytec_phyboard_subra_512mb_1bank, imx6dl_phytec_phyboard_subra, SZ_512M, false);
+
+PHYTEC_ENTRY(start_phytec_phycore_imx6q_som_nand_1gib, imx6q_phytec_phycore_som_nand, SZ_1G, true);
+PHYTEC_ENTRY(start_phytec_phycore_imx6q_som_emmc_1gib, imx6q_phytec_phycore_som_emmc, SZ_1G, true);
diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
index 1a9e85f..f6acbed 100644
--- a/arch/arm/dts/Makefile
+++ b/arch/arm/dts/Makefile
@@ -43,7 +43,9 @@ pbl-dtb-$(CONFIG_MACH_PHYTEC_SOM_IMX6) += imx6q-phytec-pbaa03.dtb.o \
 				imx6dl-phytec-pbab01.dtb.o \
 				imx6q-phytec-pbab01.dtb.o \
 				imx6q-phytec-phyboard-alcor.dtb.o \
-				imx6dl-phytec-phyboard-subra.dtb.o
+				imx6dl-phytec-phyboard-subra.dtb.o \
+				imx6q-phytec-phycore-som-nand.dtb.o \
+				imx6q-phytec-phycore-som-emmc.dtb.o
 pbl-dtb-$(CONFIG_MACH_PLATHOME_OPENBLOCKS_AX3) += armada-xp-openblocks-ax3-4-bb.dtb.o
 pbl-dtb-$(CONFIG_MACH_PLATHOME_OPENBLOCKS_A6) += kirkwood-openblocks_a6-bb.dtb.o
 pbl-dtb-$(CONFIG_MACH_RADXA_ROCK) += rk3188-radxarock.dtb.o
diff --git a/arch/arm/dts/imx6q-phytec-phycore-som-emmc.dts b/arch/arm/dts/imx6q-phytec-phycore-som-emmc.dts
new file mode 100644
index 0000000..6e19ab5
--- /dev/null
+++ b/arch/arm/dts/imx6q-phytec-phycore-som-emmc.dts
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2015 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
+ */
+
+/dts-v1/;
+
+#include <arm/imx6q.dtsi>
+#include "imx6q.dtsi"
+#include "imx6qdl-phytec-phycore-som.dtsi"
+
+/ {
+	model = "Phytec phyCORE-i.MX6 Quad with eMMC";
+	compatible = "phytec,imx6q-pcm058-emmc", "fsl,imx6q";
+};
+
+&eeprom {
+	status = "okay";
+};
+
+&fec {
+	status = "okay";
+	phy-handle = <&ethphy>;
+	phy-mode = "rgmii";
+	phy-reset-gpios = <&gpio1 14 1>;
+
+	mdio {
+		#address-cells = <1>;
+		#size-cells = <0>;
+
+		ethphy: ethernet-phy@3 {
+			reg = <3>;
+			max-speed = <1000>;
+		};
+	};
+};
+
+&usdhc1 {
+	status = "okay";
+};
+
+&usdhc4 {
+	status = "okay";
+};
diff --git a/arch/arm/dts/imx6q-phytec-phycore-som-nand.dts b/arch/arm/dts/imx6q-phytec-phycore-som-nand.dts
new file mode 100644
index 0000000..06f2f71
--- /dev/null
+++ b/arch/arm/dts/imx6q-phytec-phycore-som-nand.dts
@@ -0,0 +1,72 @@
+/*
+ * Copyright 2015 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
+ */
+
+/dts-v1/;
+
+#include <arm/imx6q.dtsi>
+#include "imx6q.dtsi"
+#include "imx6qdl-phytec-phycore-som.dtsi"
+
+/ {
+	model = "Phytec phyCORE-i.MX6 Quad with NAND";
+	compatible = "phytec,imx6q-pcm058-nand", "fsl,imx6q";
+
+};
+
+&ecspi1 {
+	status = "okay";
+};
+
+&eeprom {
+	status = "okay";
+};
+
+&fec {
+	status = "okay";
+	phy-handle = <&ethphy>;
+	phy-mode = "rgmii";
+	phy-reset-gpios = <&gpio1 14 1>;
+
+	mdio {
+		#address-cells = <1>;
+		#size-cells = <0>;
+
+		ethphy: ethernet-phy@3 {
+			reg = <3>;
+			max-speed = <1000>;
+		};
+	};
+};
+
+&flash {
+	status = "okay";
+};
+
+&gpmi {
+	status = "okay";
+};
+
+&usdhc1 {
+	status = "okay";
+
+	#address-cells = <1>;
+	#size-cells = <1>;
+
+	partition@0 {
+		label = "barebox";
+		reg = <0x0 0x80000>;
+	};
+
+	partition@1 {
+		label = "barebox-environment";
+		reg = <0x80000 0x80000>;
+	};
+};
diff --git a/arch/arm/dts/imx6qdl-phytec-phycore-som.dtsi b/arch/arm/dts/imx6qdl-phytec-phycore-som.dtsi
new file mode 100644
index 0000000..2a975d1
--- /dev/null
+++ b/arch/arm/dts/imx6qdl-phytec-phycore-som.dtsi
@@ -0,0 +1,266 @@
+/*
+ * Copyright 2015 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
+ */
+
+#include "imx6qdl.dtsi"
+
+/ {
+	chosen {
+		linux,stdout-path = &uart2;
+
+		environment-sd1 {
+			compatible = "barebox,environment";
+			device-path = &usdhc1, "partname:barebox-environment";
+			status = "disabled";
+		};
+
+		environment-sd4 {
+			compatible = "barebox,environment";
+			device-path = &usdhc4, "partname:barebox-environment";
+			status = "disabled";
+		};
+
+		environment-nand {
+			compatible = "barebox,environment";
+			device-path = &gpmi, "partname:barebox-environment";
+			status = "disabled";
+		};
+	};
+};
+
+&ecspi1 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_ecspi1>;
+	fsl,spi-num-chipselects = <1>;
+	cs-gpios = <&gpio3 19 0>;
+	status = "disabled";
+
+	flash: m25p80@0 {
+		compatible = "m25p80";
+		spi-max-frequency = <20000000>;
+		reg = <0>;
+
+		#address-cells = <1>;
+		#size-cells = <1>;
+
+		partition@0 {
+			label = "barebox";
+			reg = <0x0 0x100000>;
+		};
+
+		partition@1 {
+			label = "barebox-environment";
+			reg = <0x100000 0x20000>;
+		};
+
+		partition@2 {
+			label = "oftree";
+			reg = <0x120000 0x20000>;
+		};
+
+		partition@3 {
+			label = "kernel";
+			reg = <0x140000 0x0>;
+		};
+	};
+};
+
+&fec {
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_enet>;
+	status = "disabled";
+};
+
+&gpmi {
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_gpmi_nand>;
+	nand-on-flash-bbt;
+	status = "disabled";
+	#address-cells = <1>;
+	#size-cells = <1>;
+
+	partition@0 {
+		label = "barebox";
+		reg = <0x0 0x400000>;
+	};
+
+	partition@1 {
+		label = "barebox-environment";
+		reg = <0x400000 0x100000>;
+	};
+
+	partition@2 {
+		label = "oftree";
+		reg = <0x500000 0x100000>;
+	};
+
+	partition@3 {
+		label = "kernel";
+		reg = <0x600000 0x800000>;
+	};
+
+	partition@4 {
+		label = "root";
+		reg = <0xe00000 0x0>;
+	};
+};
+
+&i2c3 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_i2c3>;
+	clock-frequency = <400000>;
+	status = "okay";
+
+	eeprom: 24c32@50 {
+		status = "disabled";
+		compatible = "st,24c32";
+		reg = <0x50>;
+	};
+};
+
+&iomuxc {
+	pinctrl-names = "default";
+
+	imx6qdl-phytec-phycore-som {
+		pinctrl_ecspi1: ecspi1grp {
+			fsl,pins = <
+				MX6QDL_PAD_EIM_D16__ECSPI1_SCLK		0x100b1
+				MX6QDL_PAD_EIM_D17__ECSPI1_MISO		0x100b1
+				MX6QDL_PAD_EIM_D18__ECSPI1_MOSI		0x100b1
+				MX6QDL_PAD_EIM_D19__GPIO3_IO19		0x80000000
+			>;
+		};
+
+		pinctrl_enet: enetgrp {
+			fsl,pins = <
+				MX6QDL_PAD_ENET_MDIO__ENET_MDIO		0x1b0b0
+				MX6QDL_PAD_ENET_MDC__ENET_MDC		0x1b0b0
+				MX6QDL_PAD_RGMII_TXC__RGMII_TXC		0x1b0b0
+				MX6QDL_PAD_RGMII_TD0__RGMII_TD0		0x1b0b0
+				MX6QDL_PAD_RGMII_TD1__RGMII_TD1		0x1b0b0
+				MX6QDL_PAD_RGMII_TD2__RGMII_TD2		0x1b0b0
+				MX6QDL_PAD_RGMII_TD3__RGMII_TD3		0x1b0b0
+				MX6QDL_PAD_RGMII_TX_CTL__RGMII_TX_CTL	0x1b0b0
+				MX6QDL_PAD_ENET_REF_CLK__ENET_TX_CLK	0x1b0b0
+				MX6QDL_PAD_RGMII_RXC__RGMII_RXC		0x1b0b0
+				MX6QDL_PAD_RGMII_RD0__RGMII_RD0		0x1b0b0
+				MX6QDL_PAD_RGMII_RD1__RGMII_RD1		0x1b0b0
+				MX6QDL_PAD_RGMII_RD2__RGMII_RD2		0x1b0b0
+				MX6QDL_PAD_RGMII_RD3__RGMII_RD3		0x1b0b0
+				MX6QDL_PAD_RGMII_RX_CTL__RGMII_RX_CTL	0x1b0b0
+				MX6QDL_PAD_ENET_TX_EN__ENET_TX_EN	0x1b0b0
+				MX6QDL_PAD_SD2_DAT1__GPIO1_IO14		0x80000000
+			>;
+		};
+
+		pinctrl_gpmi_nand: gpmigrp {
+			fsl,pins = <
+				MX6QDL_PAD_NANDF_CLE__NAND_CLE		0xb0b1
+				MX6QDL_PAD_NANDF_ALE__NAND_ALE		0xb0b1
+				MX6QDL_PAD_NANDF_WP_B__NAND_WP_B	0xb0b1
+				MX6QDL_PAD_NANDF_RB0__NAND_READY_B	0xb000
+				MX6QDL_PAD_NANDF_CS0__NAND_CE0_B	0xb0b1
+				MX6QDL_PAD_NANDF_CS1__NAND_CE1_B	0xb0b1
+				MX6QDL_PAD_NANDF_CS2__NAND_CE2_B	0xb0b1
+				MX6QDL_PAD_NANDF_CS3__NAND_CE3_B	0xb0b1
+				MX6QDL_PAD_SD4_CMD__NAND_RE_B		0xb0b1
+				MX6QDL_PAD_SD4_CLK__NAND_WE_B		0xb0b1
+				MX6QDL_PAD_NANDF_D0__NAND_DATA00	0xb0b1
+				MX6QDL_PAD_NANDF_D1__NAND_DATA01	0xb0b1
+				MX6QDL_PAD_NANDF_D2__NAND_DATA02	0xb0b1
+				MX6QDL_PAD_NANDF_D3__NAND_DATA03	0xb0b1
+				MX6QDL_PAD_NANDF_D4__NAND_DATA04	0xb0b1
+				MX6QDL_PAD_NANDF_D5__NAND_DATA05	0xb0b1
+				MX6QDL_PAD_NANDF_D6__NAND_DATA06	0xb0b1
+				MX6QDL_PAD_NANDF_D7__NAND_DATA07	0xb0b1
+				MX6QDL_PAD_SD4_DAT0__NAND_DQS		0x00b1
+			>;
+		};
+
+		pinctrl_i2c3: i2c3grp {
+			fsl,pins = <
+				MX6QDL_PAD_GPIO_6__I2C3_SDA		0x4001b8b1
+				MX6QDL_PAD_GPIO_5__I2C3_SCL		0x4001b8b1
+			>;
+		};
+
+		pinctrl_uart2: uart2grp {
+			fsl,pins = <
+				MX6QDL_PAD_EIM_D26__UART2_TX_DATA	0x1b0b1
+				MX6QDL_PAD_EIM_D27__UART2_RX_DATA	0x1b0b1
+			>;
+		};
+
+		pinctrl_usdhc1: usdhc1grp {
+			fsl,pins = <
+				MX6QDL_PAD_SD1_CMD__SD1_CMD		0x17059
+				MX6QDL_PAD_SD1_CLK__SD1_CLK		0x10059
+				MX6QDL_PAD_SD1_DAT0__SD1_DATA0		0x17059
+				MX6QDL_PAD_SD1_DAT1__SD1_DATA1		0x17059
+				MX6QDL_PAD_SD1_DAT2__SD1_DATA2		0x17059
+				MX6QDL_PAD_SD1_DAT3__SD1_DATA3		0x17059
+				MX6QDL_PAD_EIM_BCLK__GPIO6_IO31		0x80000000 /* CD */
+			>;
+		};
+
+		pinctrl_usdhc4: usdhc4grp {
+			fsl,pins = <
+				MX6QDL_PAD_SD4_CMD__SD4_CMD		0x17059
+				MX6QDL_PAD_SD4_CLK__SD4_CLK		0x10059
+				MX6QDL_PAD_SD4_DAT0__SD4_DATA0		0x17059
+				MX6QDL_PAD_SD4_DAT1__SD4_DATA1		0x17059
+				MX6QDL_PAD_SD4_DAT2__SD4_DATA2		0x17059
+				MX6QDL_PAD_SD4_DAT3__SD4_DATA3		0x17059
+				MX6QDL_PAD_SD4_DAT4__SD4_DATA4		0x17059
+				MX6QDL_PAD_SD4_DAT5__SD4_DATA5		0x17059
+				MX6QDL_PAD_SD4_DAT6__SD4_DATA6		0x17059
+				MX6QDL_PAD_SD4_DAT7__SD4_DATA7		0x17059
+			>;
+		};
+	};
+};
+
+&ocotp {
+	barebox,provide-mac-address = <&fec 0x620>;
+};
+
+&uart2 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_uart2>;
+	status = "okay";
+};
+
+&usdhc1 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_usdhc1>;
+	cd-gpios = <&gpio6 31 0>;
+	status = "disabled";
+};
+
+&usdhc4 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_usdhc4>;
+	bus-width = <8>;
+	non-removable;
+	status = "disabled";
+
+	#address-cells = <1>;
+	#size-cells = <1>;
+
+	partition@0 {
+		label = "barebox";
+		reg = <0x0 0x80000>;
+	};
+
+	partition@1 {
+		label = "barebox-environment";
+		reg = <0x80000 0x80000>;
+	};
+};
diff --git a/images/Makefile.imx b/images/Makefile.imx
index 0aef6ca..9561711 100644
--- a/images/Makefile.imx
+++ b/images/Makefile.imx
@@ -297,6 +297,16 @@ CFG_start_phytec_pbaa03_2gib.pblx.imximg = $(board)/phytec-som-imx6/flash-header
 FILE_barebox-phytec-pbaa03-2gib.img = start_phytec_pbaa03_2gib.pblx.imximg
 image-$(CONFIG_MACH_PHYTEC_SOM_IMX6) += barebox-phytec-pbaa03-2gib.img
 
+pblx-$(CONFIG_MACH_PHYTEC_SOM_IMX6) += start_phytec_phycore_imx6q_som_nand_1gib
+CFG_start_phytec_phycore_imx6q_som_nand_1gib.pblx.imximg = $(board)/phytec-som-imx6/flash-header-phytec-pcm058-1gib.imxcfg
+FILE_barebox-phytec-phycore-imx6q-som-nand-1gib.img = start_phytec_phycore_imx6q_som_nand_1gib.pblx.imximg
+image-$(CONFIG_MACH_PHYTEC_SOM_IMX6) += barebox-phytec-phycore-imx6q-som-nand-1gib.img
+
+pblx-$(CONFIG_MACH_PHYTEC_SOM_IMX6) += start_phytec_phycore_imx6q_som_emmc_1gib
+CFG_start_phytec_phycore_imx6q_som_emmc_1gib.pblx.imximg = $(board)/phytec-som-imx6/flash-header-phytec-pcm058-1gib.imxcfg
+FILE_barebox-phytec-phycore-imx6q-som-emmc-1gib.img = start_phytec_phycore_imx6q_som_emmc_1gib.pblx.imximg
+image-$(CONFIG_MACH_PHYTEC_SOM_IMX6) += barebox-phytec-phycore-imx6q-som-emmc-1gib.img
+
 pblx-$(CONFIG_MACH_GW_VENTANA) += start_imx6q_gw54xx_1gx64
 CFG_start_imx6q_gw54xx_1gx64.pblx.imximg = $(board)/gateworks-ventana/flash-header-ventana-quad-1gx64.imxcfg
 FILE_barebox-gateworks-imx6q-ventana-1gx64.img = start_imx6q_gw54xx_1gx64.pblx.imximg
-- 
1.9.1


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 16+ messages in thread
* [PATCH 10/10] ARM: imx6dl: Add support for Phytec phyCORE-i.MX6 SOM
  2015-11-06 10:21 [PATCH 00/10] Rework towards phytec-som-imx6 and new variants Stefan Christ
                   ` (8 preceding siblings ...)
  2015-11-06 10:21 ` [PATCH 09/10] ARM: imx6q: Add support for Phytec phyCORE-i.MX6 SOM Stefan Christ
@ 2015-11-06 10:21 ` Stefan Christ
  2015-11-09  6:45   ` Sascha Hauer
  2015-11-09  6:49 ` [PATCH 00/10] Rework towards phytec-som-imx6 and new variants Sascha Hauer
  10 siblings, 1 reply; 16+ messages in thread
From: Stefan Christ @ 2015-11-06 10:21 UTC (permalink / raw)
  To: barebox

From: Christian Hemp <c.hemp@phytec.de>

Add Phytec phyCORE-i.MX6 SOM.
     - imx6dl-phytec-phycore-som-nand
        - 256GB RAM on 1 Bank with 32Bit
        - 10/100MBit Ethernet
        - NAND
        - SD
        - UART

Signed-off-by: Stefan Christ <s.christ@phytec.de>
Signed-off-by: Christian Hemp <c.hemp@phytec.de>
---
 arch/arm/boards/phytec-som-imx6/board.c            |  6 +-
 .../flash-header-phytec-pcm058dl-256mb.imxcfg      |  8 ++
 .../phytec-som-imx6/flash-header-phytec-pcm058dl.h | 98 ++++++++++++++++++++++
 arch/arm/boards/phytec-som-imx6/lowlevel.c         |  1 +
 arch/arm/dts/Makefile                              |  3 +-
 arch/arm/dts/imx6dl-phytec-phycore-som-nand.dts    | 61 ++++++++++++++
 images/Makefile.imx                                |  5 ++
 7 files changed, 179 insertions(+), 3 deletions(-)
 create mode 100644 arch/arm/boards/phytec-som-imx6/flash-header-phytec-pcm058dl-256mb.imxcfg
 create mode 100644 arch/arm/boards/phytec-som-imx6/flash-header-phytec-pcm058dl.h
 create mode 100644 arch/arm/dts/imx6dl-phytec-phycore-som-nand.dts

diff --git a/arch/arm/boards/phytec-som-imx6/board.c b/arch/arm/boards/phytec-som-imx6/board.c
index 639a562..9aefa55 100644
--- a/arch/arm/boards/phytec-som-imx6/board.c
+++ b/arch/arm/boards/phytec-som-imx6/board.c
@@ -112,7 +112,8 @@ static int physom_imx6_devices_init(void)
 		default_envdev = "NAND flash";
 
 	} else if (of_machine_is_compatible("phytec,imx6q-pcm058-nand")
-		|| of_machine_is_compatible("phytec,imx6q-pcm058-emmc")) {
+		|| of_machine_is_compatible("phytec,imx6q-pcm058-emmc")
+		|| of_machine_is_compatible("phytec,imx6dl-pcm058-nand")) {
 
 		barebox_set_hostname("phyCORE-i.MX6");
 		default_environment_path = "/chosen/environment-spinor";
@@ -157,7 +158,8 @@ static int physom_imx6_devices_init(void)
 
 	/* Overwrite file /env/init/automount */
 	if (of_machine_is_compatible("phytec,imx6q-pcm058-nand")
-		|| of_machine_is_compatible("phytec,imx6q-pcm058-emmc")) {
+		|| of_machine_is_compatible("phytec,imx6q-pcm058-emmc")
+		|| of_machine_is_compatible("phytec,imx6dl-pcm058-nand")) {
 		defaultenv_append_directory(defaultenv_physom_imx6_mira);
 	}
 
diff --git a/arch/arm/boards/phytec-som-imx6/flash-header-phytec-pcm058dl-256mb.imxcfg b/arch/arm/boards/phytec-som-imx6/flash-header-phytec-pcm058dl-256mb.imxcfg
new file mode 100644
index 0000000..bf50190
--- /dev/null
+++ b/arch/arm/boards/phytec-som-imx6/flash-header-phytec-pcm058dl-256mb.imxcfg
@@ -0,0 +1,8 @@
+#define SETUP_MDCFG0			\
+	wm 32 0x021b000c 0x3c409b85
+
+#define SETUP_MDASP_MDCTL		\
+	wm 32 0x021b0040 0x0000000F;	\
+	wm 32 0x021b0000 0x82190000
+
+#include "flash-header-phytec-pcm058dl.h"
diff --git a/arch/arm/boards/phytec-som-imx6/flash-header-phytec-pcm058dl.h b/arch/arm/boards/phytec-som-imx6/flash-header-phytec-pcm058dl.h
new file mode 100644
index 0000000..c7df790
--- /dev/null
+++ b/arch/arm/boards/phytec-som-imx6/flash-header-phytec-pcm058dl.h
@@ -0,0 +1,98 @@
+soc imx6
+loadaddr 0x10000000
+dcdofs 0x400
+
+wm 32 0x020e0774 0x000C0000
+wm 32 0x020e0754 0x00000000
+wm 32 0x020e04ac 0x00000030
+wm 32 0x020e04b0 0x00000030
+wm 32 0x020e0464 0x00000030
+wm 32 0x020e0490 0x00000030
+wm 32 0x020e074c 0x00000030
+wm 32 0x020e0494 0x00000030
+wm 32 0x020e04a0 0x00000000
+wm 32 0x020e04b4 0x00000030
+wm 32 0x020e04b8 0x00000030
+wm 32 0x020e04a4 0x00003000
+wm 32 0x020e04a8 0x00003000
+wm 32 0x020e076c 0x00000030
+wm 32 0x020e0750 0x00020000
+wm 32 0x020e04bc 0x00000028
+wm 32 0x020e04c0 0x00000028
+wm 32 0x020e04c4 0x00000028
+wm 32 0x020e04c8 0x00000028
+wm 32 0x020e04cc 0x00000028
+wm 32 0x020e04d0 0x00000028
+wm 32 0x020e04d4 0x00000028
+wm 32 0x020e04d8 0x00000028
+wm 32 0x020e0760 0x00020000
+wm 32 0x020e0764 0x00000028
+wm 32 0x020e0770 0x00000028
+wm 32 0x020e0778 0x00000028
+wm 32 0x020e077c 0x00000028
+wm 32 0x020e0780 0x00000028
+wm 32 0x020e0784 0x00000028
+wm 32 0x020e078c 0x00000028
+wm 32 0x020e0748 0x00000028
+wm 32 0x020e0470 0x00000028
+wm 32 0x020e0474 0x00000028
+wm 32 0x020e0478 0x00000028
+wm 32 0x020e047c 0x00000028
+wm 32 0x020e0480 0x00000028
+wm 32 0x020e0484 0x00000028
+wm 32 0x020e0488 0x00000028
+wm 32 0x020e048c 0x00000028
+wm 32 0x021b0800 0xa1390003
+wm 32 0x021b4800 0xa1380003
+wm 32 0x021b080c 0x0032003A
+wm 32 0x021b0810 0x00350037
+wm 32 0x021b480c 0x00260038
+wm 32 0x021b4810 0x002C0038
+wm 32 0x021b083c 0x42630244
+wm 32 0x021b0840 0x02300238
+wm 32 0x021b483c 0x02540258
+wm 32 0x021b4840 0x0236021e
+wm 32 0x021b0848 0x46484446
+wm 32 0x021b4848 0x302d2c35
+wm 32 0x021b0850 0x36342630
+wm 32 0x021b4850 0x3423372d
+wm 32 0x021b081c 0x33333333
+wm 32 0x021b0820 0x33333333
+wm 32 0x021b0824 0x33333333
+wm 32 0x021b0828 0x33333333
+wm 32 0x021b481c 0x33333333
+wm 32 0x021b4820 0x33333333
+wm 32 0x021b4824 0x33333333
+wm 32 0x021b4828 0x33333333
+wm 32 0x021b08b8 0x00000800
+wm 32 0x021b48b8 0x00000800
+wm 32 0x021b0004 0x00025576
+wm 32 0x021b0008 0x09444040
+
+SETUP_MDCFG0
+
+wm 32 0x021b0010 0xff538f64
+wm 32 0x021b0014 0x01ff0124
+wm 32 0x021b0018 0x00091740
+wm 32 0x021b001c 0x00008000
+wm 32 0x021b002c 0x000026d2
+wm 32 0x021b0030 0x003F1023
+
+SETUP_MDASP_MDCTL
+
+wm 32 0x021b001c 0x04088032
+wm 32 0x021b001c 0x0408803a
+wm 32 0x021b001c 0x00008033
+wm 32 0x021b001c 0x0000803b
+wm 32 0x021b001c 0x00428031
+wm 32 0x021b001c 0x00428039
+wm 32 0x021b001c 0x09408030
+wm 32 0x021b001c 0x09408038
+wm 32 0x021b001c 0x04008040
+wm 32 0x021b001c 0x04008048
+wm 32 0x021b0020 0x00007800
+wm 32 0x021b0818 0x00011117
+wm 32 0x021b4818 0x00011117
+wm 32 0x021b0004 0x00025576
+wm 32 0x021b0404 0x00011006
+wm 32 0x021b001c 0x00000000
diff --git a/arch/arm/boards/phytec-som-imx6/lowlevel.c b/arch/arm/boards/phytec-som-imx6/lowlevel.c
index 555487b..eb796e7 100644
--- a/arch/arm/boards/phytec-som-imx6/lowlevel.c
+++ b/arch/arm/boards/phytec-som-imx6/lowlevel.c
@@ -92,5 +92,6 @@ PHYTEC_ENTRY(start_phytec_pbab01s_512mb_1bank, imx6s_phytec_pbab01, SZ_512M, fal
 PHYTEC_ENTRY(start_phytec_phyboard_alcor_1gib, imx6q_phytec_phyboard_alcor, SZ_1G, false);
 PHYTEC_ENTRY(start_phytec_phyboard_subra_512mb_1bank, imx6dl_phytec_phyboard_subra, SZ_512M, false);
 
+PHYTEC_ENTRY(start_phytec_phycore_imx6dl_som_nand_256mb, imx6dl_phytec_phycore_som_nand, SZ_256M, true);
 PHYTEC_ENTRY(start_phytec_phycore_imx6q_som_nand_1gib, imx6q_phytec_phycore_som_nand, SZ_1G, true);
 PHYTEC_ENTRY(start_phytec_phycore_imx6q_som_emmc_1gib, imx6q_phytec_phycore_som_emmc, SZ_1G, true);
diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
index f6acbed..5f27281 100644
--- a/arch/arm/dts/Makefile
+++ b/arch/arm/dts/Makefile
@@ -45,7 +45,8 @@ pbl-dtb-$(CONFIG_MACH_PHYTEC_SOM_IMX6) += imx6q-phytec-pbaa03.dtb.o \
 				imx6q-phytec-phyboard-alcor.dtb.o \
 				imx6dl-phytec-phyboard-subra.dtb.o \
 				imx6q-phytec-phycore-som-nand.dtb.o \
-				imx6q-phytec-phycore-som-emmc.dtb.o
+				imx6q-phytec-phycore-som-emmc.dtb.o \
+				imx6dl-phytec-phycore-som-nand.dtb.o
 pbl-dtb-$(CONFIG_MACH_PLATHOME_OPENBLOCKS_AX3) += armada-xp-openblocks-ax3-4-bb.dtb.o
 pbl-dtb-$(CONFIG_MACH_PLATHOME_OPENBLOCKS_A6) += kirkwood-openblocks_a6-bb.dtb.o
 pbl-dtb-$(CONFIG_MACH_RADXA_ROCK) += rk3188-radxarock.dtb.o
diff --git a/arch/arm/dts/imx6dl-phytec-phycore-som-nand.dts b/arch/arm/dts/imx6dl-phytec-phycore-som-nand.dts
new file mode 100644
index 0000000..ea10bdc
--- /dev/null
+++ b/arch/arm/dts/imx6dl-phytec-phycore-som-nand.dts
@@ -0,0 +1,61 @@
+/*
+ * Copyright 2015 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
+ */
+
+/dts-v1/;
+#include "imx6dl.dtsi"
+#include "imx6qdl-phytec-phycore-som.dtsi"
+
+/ {
+	model = "Phytec phyCORE-i.MX6 Duallite/SOLO with NAND";
+	compatible = "phytec,imx6dl-pcm058-nand", "fsl,imx6dl";
+};
+
+&eeprom {
+	status = "okay";
+};
+
+&fec {
+	status = "okay";
+	phy-handle = <&ethphy>;
+	phy-mode = "rgmii";
+	phy-reset-gpios = <&gpio1 14 1>;
+
+	mdio {
+		#address-cells = <1>;
+		#size-cells = <0>;
+
+		ethphy: ethernet-phy@3 {
+			reg = <3>;
+			max-speed = <100>;
+		};
+	};
+};
+
+&gpmi {
+	status = "okay";
+};
+
+&usdhc1 {
+	status = "okay";
+
+	#address-cells = <1>;
+	#size-cells = <1>;
+
+	partition@0 {
+		label = "barebox";
+		reg = <0x0 0x80000>;
+	};
+
+	partition@1 {
+		label = "barebox-environment";
+		reg = <0x80000 0x80000>;
+	};
+};
diff --git a/images/Makefile.imx b/images/Makefile.imx
index 9561711..4d74674 100644
--- a/images/Makefile.imx
+++ b/images/Makefile.imx
@@ -307,6 +307,11 @@ CFG_start_phytec_phycore_imx6q_som_emmc_1gib.pblx.imximg = $(board)/phytec-som-i
 FILE_barebox-phytec-phycore-imx6q-som-emmc-1gib.img = start_phytec_phycore_imx6q_som_emmc_1gib.pblx.imximg
 image-$(CONFIG_MACH_PHYTEC_SOM_IMX6) += barebox-phytec-phycore-imx6q-som-emmc-1gib.img
 
+pblx-$(CONFIG_MACH_PHYTEC_SOM_IMX6) += start_phytec_phycore_imx6dl_som_nand_256mb
+CFG_start_phytec_phycore_imx6dl_som_nand_256mb.pblx.imximg = $(board)/phytec-som-imx6/flash-header-phytec-pcm058dl-256mb.imxcfg
+FILE_barebox-phytec-phycore-imx6dl-som-nand-256mb.img = start_phytec_phycore_imx6dl_som_nand_256mb.pblx.imximg
+image-$(CONFIG_MACH_PHYTEC_SOM_IMX6) += barebox-phytec-phycore-imx6dl-som-nand-256mb.img
+
 pblx-$(CONFIG_MACH_GW_VENTANA) += start_imx6q_gw54xx_1gx64
 CFG_start_imx6q_gw54xx_1gx64.pblx.imximg = $(board)/gateworks-ventana/flash-header-ventana-quad-1gx64.imxcfg
 FILE_barebox-gateworks-imx6q-ventana-1gx64.img = start_imx6q_gw54xx_1gx64.pblx.imximg
-- 
1.9.1


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 16+ messages in thread
* Re: [PATCH 10/10] ARM: imx6dl: Add support for Phytec phyCORE-i.MX6 SOM
  2015-11-06 10:21 ` [PATCH 10/10] ARM: imx6dl: " Stefan Christ
@ 2015-11-09  6:45   ` Sascha Hauer
  2015-11-09  8:50     ` Stefan Christ
  0 siblings, 1 reply; 16+ messages in thread
From: Sascha Hauer @ 2015-11-09  6:45 UTC (permalink / raw)
  To: Stefan Christ; +Cc: barebox

On Fri, Nov 06, 2015 at 11:21:58AM +0100, Stefan Christ wrote:
> From: Christian Hemp <c.hemp@phytec.de>
> 
> Add Phytec phyCORE-i.MX6 SOM.
>      - imx6dl-phytec-phycore-som-nand
>         - 256GB RAM on 1 Bank with 32Bit
>         - 10/100MBit Ethernet
>         - NAND
>         - SD
>         - UART
> 
> Signed-off-by: Stefan Christ <s.christ@phytec.de>
> Signed-off-by: Christian Hemp <c.hemp@phytec.de>
> ---

Applied all except this one.

This patch misses something. Compilation fails with:

Error: /ptx/work/dude/WORK_A/sha/backup/barebox/barebox/arch/arm/dts/imx6qdl-phytec-phycore-som.dtsi:38.1-8 Label or path ecspi1 not found
Error: /ptx/work/dude/WORK_A/sha/backup/barebox/barebox/arch/arm/dts/imx6qdl-phytec-phycore-som.dtsi:75.1-5 Label or path fec not found
Error: /ptx/work/dude/WORK_A/sha/backup/barebox/barebox/arch/arm/dts/imx6qdl-phytec-phycore-som.dtsi:81.1-6 Label or path gpmi not found
Error: /ptx/work/dude/WORK_A/sha/backup/barebox/barebox/arch/arm/dts/imx6qdl-phytec-phycore-som.dtsi:115.1-6 Label or path i2c3 not found
Error: /ptx/work/dude/WORK_A/sha/backup/barebox/barebox/arch/arm/dts/imx6qdl-phytec-phycore-som.dtsi:134.5-6 syntax error

Sascha

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 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] 16+ messages in thread
* Re: [PATCH 00/10] Rework towards phytec-som-imx6 and new variants
  2015-11-06 10:21 [PATCH 00/10] Rework towards phytec-som-imx6 and new variants Stefan Christ
                   ` (9 preceding siblings ...)
  2015-11-06 10:21 ` [PATCH 10/10] ARM: imx6dl: " Stefan Christ
@ 2015-11-09  6:49 ` Sascha Hauer
  2015-11-09 12:09   ` Stefan Christ
  10 siblings, 1 reply; 16+ messages in thread
From: Sascha Hauer @ 2015-11-09  6:49 UTC (permalink / raw)
  To: Stefan Christ; +Cc: barebox

Hi Stefan,

On Fri, Nov 06, 2015 at 11:21:48AM +0100, Stefan Christ wrote:
> Hi,
> 
> the patchstack first refactors the phyCARD-i.MX6 and phyFLEX-i.MX6 to a common
> phytec-som-imx6. Then some phyFLEX-i.MX6 variants and the new phyCORE-i.MX6 are
> added plus some environment updates and one image rename patch.
>

The Phytec i.MX6 boards all have an EEPROM, right? Does it have the
memory setup encoded somewhere? It gets increasingly hard picking the
right image for the Phytec boards.

Sascha

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 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] 16+ messages in thread
* Re: [PATCH 10/10] ARM: imx6dl: Add support for Phytec phyCORE-i.MX6 SOM
  2015-11-09  6:45   ` Sascha Hauer
@ 2015-11-09  8:50     ` Stefan Christ
  0 siblings, 0 replies; 16+ messages in thread
From: Stefan Christ @ 2015-11-09  8:50 UTC (permalink / raw)
  To: Sascha Hauer; +Cc: barebox

Hi,

> 
> Applied all except this one.
> 
> This patch misses something. Compilation fails with:
> 
> Error: /ptx/work/dude/WORK_A/sha/backup/barebox/barebox/arch/arm/dts/imx6qdl-phytec-phycore-som.dtsi:38.1-8 Label or path ecspi1 not found
> Error: /ptx/work/dude/WORK_A/sha/backup/barebox/barebox/arch/arm/dts/imx6qdl-phytec-phycore-som.dtsi:75.1-5 Label or path fec not found
> Error: /ptx/work/dude/WORK_A/sha/backup/barebox/barebox/arch/arm/dts/imx6qdl-phytec-phycore-som.dtsi:81.1-6 Label or path gpmi not found
> Error: /ptx/work/dude/WORK_A/sha/backup/barebox/barebox/arch/arm/dts/imx6qdl-phytec-phycore-som.dtsi:115.1-6 Label or path i2c3 not found
> Error: /ptx/work/dude/WORK_A/sha/backup/barebox/barebox/arch/arm/dts/imx6qdl-phytec-phycore-som.dtsi:134.5-6 syntax error
> 
> Sascha

Ups. I'll send a v2.

Mit freundlichen Grüßen / Kind regards,
	Stefan Christ

On Mon, Nov 09, 2015 at 07:45:26AM +0100, Sascha Hauer wrote:
> On Fri, Nov 06, 2015 at 11:21:58AM +0100, Stefan Christ wrote:
> > From: Christian Hemp <c.hemp@phytec.de>
> > 
> > Add Phytec phyCORE-i.MX6 SOM.
> >      - imx6dl-phytec-phycore-som-nand
> >         - 256GB RAM on 1 Bank with 32Bit
> >         - 10/100MBit Ethernet
> >         - NAND
> >         - SD
> >         - UART
> > 
> > Signed-off-by: Stefan Christ <s.christ@phytec.de>
> > Signed-off-by: Christian Hemp <c.hemp@phytec.de>
> > ---
> 
> Applied all except this one.
> 
> This patch misses something. Compilation fails with:
> 
> Error: /ptx/work/dude/WORK_A/sha/backup/barebox/barebox/arch/arm/dts/imx6qdl-phytec-phycore-som.dtsi:38.1-8 Label or path ecspi1 not found
> Error: /ptx/work/dude/WORK_A/sha/backup/barebox/barebox/arch/arm/dts/imx6qdl-phytec-phycore-som.dtsi:75.1-5 Label or path fec not found
> Error: /ptx/work/dude/WORK_A/sha/backup/barebox/barebox/arch/arm/dts/imx6qdl-phytec-phycore-som.dtsi:81.1-6 Label or path gpmi not found
> Error: /ptx/work/dude/WORK_A/sha/backup/barebox/barebox/arch/arm/dts/imx6qdl-phytec-phycore-som.dtsi:115.1-6 Label or path i2c3 not found
> Error: /ptx/work/dude/WORK_A/sha/backup/barebox/barebox/arch/arm/dts/imx6qdl-phytec-phycore-som.dtsi:134.5-6 syntax error
> 
> Sascha
> 
> -- 
> Pengutronix e.K.                           |                             |
> Industrial Linux Solutions                 | http://www.pengutronix.de/  |
> Peiner Str. 6-8, 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] 16+ messages in thread
* Re: [PATCH 00/10] Rework towards phytec-som-imx6 and new variants
  2015-11-09  6:49 ` [PATCH 00/10] Rework towards phytec-som-imx6 and new variants Sascha Hauer
@ 2015-11-09 12:09   ` Stefan Christ
  2015-11-10  8:36     ` Sascha Hauer
  0 siblings, 1 reply; 16+ messages in thread
From: Stefan Christ @ 2015-11-09 12:09 UTC (permalink / raw)
  To: Sascha Hauer; +Cc: barebox

Hi Sascha,

> > the patchstack first refactors the phyCARD-i.MX6 and phyFLEX-i.MX6 to a common
> > phytec-som-imx6. Then some phyFLEX-i.MX6 variants and the new phyCORE-i.MX6 are
> > added plus some environment updates and one image rename patch.
> >
>
> The Phytec i.MX6 boards all have an EEPROM, right?

No, it's possible to get a board without an EEPROM and we have some of them
lying around here.

> Does it have the memory setup encoded somewhere?

So no, the memory is not encoded anywhere on the module.

> It gets increasingly hard picking the right image for the Phytec boards.

Yeah. We are discussing some solutions for that like GPIOs, EEPROM or EFuses,
but nothing has emerged from that and they are only viable for new products.

One simple thing would be to encode the memory configuration into the barebox
image filename. So a user can look at the module, count the memory chips and
banks, and pick the correct image for that.

Mit freundlichen Grüßen / Kind regards,
	Stefan Christ

On Mon, Nov 09, 2015 at 07:49:24AM +0100, Sascha Hauer wrote:
> Hi Stefan,
> 
> On Fri, Nov 06, 2015 at 11:21:48AM +0100, Stefan Christ wrote:
> > Hi,
> > 
> > the patchstack first refactors the phyCARD-i.MX6 and phyFLEX-i.MX6 to a common
> > phytec-som-imx6. Then some phyFLEX-i.MX6 variants and the new phyCORE-i.MX6 are
> > added plus some environment updates and one image rename patch.
> >
> 
> The Phytec i.MX6 boards all have an EEPROM, right? Does it have the
> memory setup encoded somewhere? It gets increasingly hard picking the
> right image for the Phytec boards.
> 
> Sascha
> 
> -- 
> Pengutronix e.K.                           |                             |
> Industrial Linux Solutions                 | http://www.pengutronix.de/  |
> Peiner Str. 6-8, 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] 16+ messages in thread
* Re: [PATCH 00/10] Rework towards phytec-som-imx6 and new variants
  2015-11-09 12:09   ` Stefan Christ
@ 2015-11-10  8:36     ` Sascha Hauer
  0 siblings, 0 replies; 16+ messages in thread
From: Sascha Hauer @ 2015-11-10  8:36 UTC (permalink / raw)
  To: Stefan Christ; +Cc: barebox

On Mon, Nov 09, 2015 at 01:09:20PM +0100, Stefan Christ wrote:
> Hi Sascha,
> 
> > > the patchstack first refactors the phyCARD-i.MX6 and phyFLEX-i.MX6 to a common
> > > phytec-som-imx6. Then some phyFLEX-i.MX6 variants and the new phyCORE-i.MX6 are
> > > added plus some environment updates and one image rename patch.
> > >
> >
> > The Phytec i.MX6 boards all have an EEPROM, right?
> 
> No, it's possible to get a board without an EEPROM and we have some of them
> lying around here.
> 
> > Does it have the memory setup encoded somewhere?
> 
> So no, the memory is not encoded anywhere on the module.
> 
> > It gets increasingly hard picking the right image for the Phytec boards.
> 
> Yeah. We are discussing some solutions for that like GPIOs, EEPROM or EFuses,
> but nothing has emerged from that and they are only viable for new products.

Yeah, I think it's worth solving this issue somehow, it would make using
the Phytec boards a lot easier, even if it's only for new products.

Sascha


-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 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] 16+ messages in thread
end of thread, other threads:[~2015-11-10  8:37 UTC | newest]

Thread overview: 16+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-11-06 10:21 [PATCH 00/10] Rework towards phytec-som-imx6 and new variants Stefan Christ
2015-11-06 10:21 ` [PATCH 01/10] ARM: imx6: phycard: use numeric suffix in device tree Stefan Christ
2015-11-06 10:21 ` [PATCH 02/10] boards: Add phytec-som-imx6 Stefan Christ
2015-11-06 10:21 ` [PATCH 03/10] ARM: phytec-som-imx6: set loadaddr to start of DDR memory Stefan Christ
2015-11-06 10:21 ` [PATCH 04/10] ARM: phytec-som-imx6: update environment Stefan Christ
2015-11-06 10:21 ` [PATCH 05/10] ARM: pfla02: append suffix 1bank Stefan Christ
2015-11-06 10:21 ` [PATCH 06/10] ARM: imx6q: pfla02: Add support for 512MiB RAM on one bank Stefan Christ
2015-11-06 10:21 ` [PATCH 07/10] ARM: imx6dl: pfla02: Add support for 128MB and 256MB RAM Stefan Christ
2015-11-06 10:21 ` [PATCH 08/10] ARM: imx6q: pfla02: add phyFLEX-i.MX6 DualLite 1GiB on one bank Stefan Christ
2015-11-06 10:21 ` [PATCH 09/10] ARM: imx6q: Add support for Phytec phyCORE-i.MX6 SOM Stefan Christ
2015-11-06 10:21 ` [PATCH 10/10] ARM: imx6dl: " Stefan Christ
2015-11-09  6:45   ` Sascha Hauer
2015-11-09  8:50     ` Stefan Christ
2015-11-09  6:49 ` [PATCH 00/10] Rework towards phytec-som-imx6 and new variants Sascha Hauer
2015-11-09 12:09   ` Stefan Christ
2015-11-10  8:36     ` Sascha Hauer

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox