* [PATCH 1/6] ARM: imx: add QP as supported i.MX6 variant
@ 2016-07-22 12:31 Lucas Stach
2016-07-22 12:31 ` [PATCH 2/6] ARM: nitrogen6x: use upstream DTs Lucas Stach
` (5 more replies)
0 siblings, 6 replies; 7+ messages in thread
From: Lucas Stach @ 2016-07-22 12:31 UTC (permalink / raw)
To: barebox
Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
---
arch/arm/mach-imx/imx.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/arch/arm/mach-imx/imx.c b/arch/arm/mach-imx/imx.c
index 374ee35df154..2e33325c9f09 100644
--- a/arch/arm/mach-imx/imx.c
+++ b/arch/arm/mach-imx/imx.c
@@ -59,6 +59,8 @@ static int imx_soc_from_dt(void)
return IMX_CPU_IMX6;
if (of_machine_is_compatible("fsl,imx6sx"))
return IMX_CPU_IMX6;
+ if (of_machine_is_compatible("fsl,imx6qp"))
+ return IMX_CPU_IMX6;
return 0;
}
--
2.8.1
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH 2/6] ARM: nitrogen6x: use upstream DTs
2016-07-22 12:31 [PATCH 1/6] ARM: imx: add QP as supported i.MX6 variant Lucas Stach
@ 2016-07-22 12:31 ` Lucas Stach
2016-07-22 12:31 ` [PATCH 3/6] ARM: nitrogen6x: use imx6q_barebox_entry Lucas Stach
` (4 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Lucas Stach @ 2016-07-22 12:31 UTC (permalink / raw)
To: barebox
This gets rid of the (mostly) stub top level DTs in barebox
and switches the compatible to the proper "boundary" one.
Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
---
arch/arm/boards/boundarydevices-nitrogen6x/board.c | 8 ++++----
arch/arm/dts/imx6dl-nitrogen6x.dts | 8 +-------
arch/arm/dts/imx6q-nitrogen6x.dts | 12 +-----------
arch/arm/dts/imx6qdl-nitrogen6x.dtsi | 2 --
4 files changed, 6 insertions(+), 24 deletions(-)
diff --git a/arch/arm/boards/boundarydevices-nitrogen6x/board.c b/arch/arm/boards/boundarydevices-nitrogen6x/board.c
index 347fd9128bcd..28dba3af9a15 100644
--- a/arch/arm/boards/boundarydevices-nitrogen6x/board.c
+++ b/arch/arm/boards/boundarydevices-nitrogen6x/board.c
@@ -22,8 +22,8 @@
static int nitrogen6x_devices_init(void)
{
- if (!of_machine_is_compatible("fsl,imx6dl-nitrogen6x") &&
- !of_machine_is_compatible("fsl,imx6q-nitrogen6x"))
+ if (!of_machine_is_compatible("boundary,imx6dl-nitrogen6x") &&
+ !of_machine_is_compatible("boundary,imx6q-nitrogen6x"))
return 0;
imx6_bbu_internal_spi_i2c_register_handler("spiflash", "/dev/m25p0.barebox",
@@ -54,8 +54,8 @@ static int ksz9021rn_phy_fixup(struct phy_device *dev)
static int nitrogen6x_coredevices_init(void)
{
- if (!of_machine_is_compatible("fsl,imx6dl-nitrogen6x") &&
- !of_machine_is_compatible("fsl,imx6q-nitrogen6x"))
+ if (!of_machine_is_compatible("boundary,imx6dl-nitrogen6x") &&
+ !of_machine_is_compatible("boundary,imx6q-nitrogen6x"))
return 0;
phy_register_fixup_for_uid(PHY_ID_KSZ9021, MICREL_PHY_ID_MASK,
diff --git a/arch/arm/dts/imx6dl-nitrogen6x.dts b/arch/arm/dts/imx6dl-nitrogen6x.dts
index 50267b103866..bc199c31671d 100644
--- a/arch/arm/dts/imx6dl-nitrogen6x.dts
+++ b/arch/arm/dts/imx6dl-nitrogen6x.dts
@@ -11,12 +11,6 @@
* http://www.gnu.org/copyleft/gpl.html
*/
-/dts-v1/;
-#include <arm/imx6dl.dtsi>
+#include <arm/imx6dl-nitrogen6x.dts>
#include "imx6dl.dtsi"
#include "imx6qdl-nitrogen6x.dtsi"
-
-/ {
- model = "Freescale i.MX6 DualLite Nitrogen6x Board";
- compatible = "fsl,imx6dl-nitrogen6x", "fsl,imx6dl";
-};
diff --git a/arch/arm/dts/imx6q-nitrogen6x.dts b/arch/arm/dts/imx6q-nitrogen6x.dts
index d8906e606381..e4a6a6c29e97 100644
--- a/arch/arm/dts/imx6q-nitrogen6x.dts
+++ b/arch/arm/dts/imx6q-nitrogen6x.dts
@@ -11,16 +11,6 @@
* http://www.gnu.org/copyleft/gpl.html
*/
-/dts-v1/;
-#include <arm/imx6q.dtsi>
+#include <arm/imx6q-nitrogen6x.dts>
#include "imx6q.dtsi"
#include "imx6qdl-nitrogen6x.dtsi"
-
-/ {
- model = "Freescale i.MX6 Quad Nitrogen6x Board";
- compatible = "fsl,imx6q-nitrogen6x", "fsl,imx6q";
-};
-
-&sata {
- status = "okay";
-};
diff --git a/arch/arm/dts/imx6qdl-nitrogen6x.dtsi b/arch/arm/dts/imx6qdl-nitrogen6x.dtsi
index 9ff7395f45e7..76e55e057cce 100644
--- a/arch/arm/dts/imx6qdl-nitrogen6x.dtsi
+++ b/arch/arm/dts/imx6qdl-nitrogen6x.dtsi
@@ -16,8 +16,6 @@
/ {
chosen {
- linux,stdout-path = &uart2;
-
environment@0 {
compatible = "barebox,environment";
device-path = &flash, "partname:barebox-environment";
--
2.8.1
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH 3/6] ARM: nitrogen6x: use imx6q_barebox_entry
2016-07-22 12:31 [PATCH 1/6] ARM: imx: add QP as supported i.MX6 variant Lucas Stach
2016-07-22 12:31 ` [PATCH 2/6] ARM: nitrogen6x: use upstream DTs Lucas Stach
@ 2016-07-22 12:31 ` Lucas Stach
2016-07-22 12:31 ` [PATCH 4/6] ARM: nitrogen6x: disable address mirroring Lucas Stach
` (3 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Lucas Stach @ 2016-07-22 12:31 UTC (permalink / raw)
To: barebox
Saves some boilerplate code by calculating the DRAM size
automatically.
Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
---
arch/arm/boards/boundarydevices-nitrogen6x/lowlevel.c | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/arch/arm/boards/boundarydevices-nitrogen6x/lowlevel.c b/arch/arm/boards/boundarydevices-nitrogen6x/lowlevel.c
index 7d859330f950..7eea3ce39034 100644
--- a/arch/arm/boards/boundarydevices-nitrogen6x/lowlevel.c
+++ b/arch/arm/boards/boundarydevices-nitrogen6x/lowlevel.c
@@ -1,7 +1,6 @@
#include <common.h>
-#include <linux/sizes.h>
#include <mach/generic.h>
-#include <asm/barebox-arm-head.h>
+#include <mach/esdctl.h>
#include <asm/barebox-arm.h>
extern char __dtb_imx6q_nitrogen6x_start[];
@@ -14,7 +13,7 @@ ENTRY_FUNCTION(start_imx6q_nitrogen6x_1g, r0, r1, r2)
fdt = __dtb_imx6q_nitrogen6x_start - get_runtime_offset();
- barebox_arm_entry(0x10000000, SZ_1G, fdt);
+ imx6q_barebox_entry(fdt);
}
ENTRY_FUNCTION(start_imx6q_nitrogen6x_2g, r0, r1, r2)
@@ -25,7 +24,7 @@ ENTRY_FUNCTION(start_imx6q_nitrogen6x_2g, r0, r1, r2)
fdt = __dtb_imx6q_nitrogen6x_start - get_runtime_offset();
- barebox_arm_entry(0x10000000, SZ_2G, fdt);
+ imx6q_barebox_entry(fdt);
}
extern char __dtb_imx6dl_nitrogen6x_start[];
@@ -38,7 +37,7 @@ ENTRY_FUNCTION(start_imx6dl_nitrogen6x_1g, r0, r1, r2)
fdt = __dtb_imx6dl_nitrogen6x_start - get_runtime_offset();
- barebox_arm_entry(0x10000000, SZ_1G, fdt);
+ imx6q_barebox_entry(fdt);
}
ENTRY_FUNCTION(start_imx6dl_nitrogen6x_2g, r0, r1, r2)
@@ -49,5 +48,5 @@ ENTRY_FUNCTION(start_imx6dl_nitrogen6x_2g, r0, r1, r2)
fdt = __dtb_imx6dl_nitrogen6x_start - get_runtime_offset();
- barebox_arm_entry(0x10000000, SZ_2G, fdt);
+ imx6q_barebox_entry(fdt);
}
--
2.8.1
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH 4/6] ARM: nitrogen6x: disable address mirroring
2016-07-22 12:31 [PATCH 1/6] ARM: imx: add QP as supported i.MX6 variant Lucas Stach
2016-07-22 12:31 ` [PATCH 2/6] ARM: nitrogen6x: use upstream DTs Lucas Stach
2016-07-22 12:31 ` [PATCH 3/6] ARM: nitrogen6x: use imx6q_barebox_entry Lucas Stach
@ 2016-07-22 12:31 ` Lucas Stach
2016-07-22 12:31 ` [PATCH 5/6] ARM: add support for Nitrogen6MAX QP variant Lucas Stach
` (2 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Lucas Stach @ 2016-07-22 12:31 UTC (permalink / raw)
To: barebox
The Nitrogen boards don't need it and it's actively wrong
on the 4GB variants of those boards.
Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
---
arch/arm/boards/boundarydevices-nitrogen6x/ram-base.imxcfg | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/boards/boundarydevices-nitrogen6x/ram-base.imxcfg b/arch/arm/boards/boundarydevices-nitrogen6x/ram-base.imxcfg
index 60c8fa2b5123..5d675883fd49 100644
--- a/arch/arm/boards/boundarydevices-nitrogen6x/ram-base.imxcfg
+++ b/arch/arm/boards/boundarydevices-nitrogen6x/ram-base.imxcfg
@@ -60,8 +60,8 @@ wm 32 MX6_MMDC_P1_MPRDDQBY1DL 0x33333333
wm 32 MX6_MMDC_P1_MPRDDQBY2DL 0x33333333
wm 32 MX6_MMDC_P1_MPRDDQBY3DL 0x33333333
-/* MDMISC mirroring interleaved (row/bank/col) */
-wm 32 MX6_MMDC_P0_MDMISC 0x00081740
+/* MDMISC mirroring-off interleaved (row/bank/col) */
+wm 32 MX6_MMDC_P0_MDMISC 0x00001740
/* MDSCR con_req */
wm 32 MX6_MMDC_P0_MDSCR 0x00008000
--
2.8.1
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH 5/6] ARM: add support for Nitrogen6MAX QP variant
2016-07-22 12:31 [PATCH 1/6] ARM: imx: add QP as supported i.MX6 variant Lucas Stach
` (2 preceding siblings ...)
2016-07-22 12:31 ` [PATCH 4/6] ARM: nitrogen6x: disable address mirroring Lucas Stach
@ 2016-07-22 12:31 ` Lucas Stach
2016-07-22 12:31 ` [PATCH 6/6] ARM: nitrogen: rename to nitrogen6 Lucas Stach
2016-07-25 8:18 ` [PATCH 1/6] ARM: imx: add QP as supported i.MX6 variant Sascha Hauer
5 siblings, 0 replies; 7+ messages in thread
From: Lucas Stach @ 2016-07-22 12:31 UTC (permalink / raw)
To: barebox
Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
---
.../1066mhz_4x512mx16-qp.imxcfg | 67 +++++++++++++++++++++
arch/arm/boards/boundarydevices-nitrogen6x/board.c | 11 +++-
| 10 ++++
.../boards/boundarydevices-nitrogen6x/lowlevel.c | 13 ++++
arch/arm/dts/Makefile | 2 +-
arch/arm/dts/imx6qdl-nitrogen6_max.dtsi | 69 ++++++++++++++++++++++
arch/arm/dts/imx6qp-nitrogen6_max.dts | 44 ++++++++++++++
images/Makefile.imx | 5 ++
8 files changed, 217 insertions(+), 4 deletions(-)
create mode 100644 arch/arm/boards/boundarydevices-nitrogen6x/1066mhz_4x512mx16-qp.imxcfg
create mode 100644 arch/arm/boards/boundarydevices-nitrogen6x/flash-header-nitrogen6qp-max.imxcfg
create mode 100644 arch/arm/dts/imx6qdl-nitrogen6_max.dtsi
create mode 100644 arch/arm/dts/imx6qp-nitrogen6_max.dts
diff --git a/arch/arm/boards/boundarydevices-nitrogen6x/1066mhz_4x512mx16-qp.imxcfg b/arch/arm/boards/boundarydevices-nitrogen6x/1066mhz_4x512mx16-qp.imxcfg
new file mode 100644
index 000000000000..6409b745d727
--- /dev/null
+++ b/arch/arm/boards/boundarydevices-nitrogen6x/1066mhz_4x512mx16-qp.imxcfg
@@ -0,0 +1,67 @@
+/*
+ * Copyright (C) 2016 Boundary Devices
+ *
+ * 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.
+ */
+
+/* NOC setup */
+wm 32 0x00bb0008 0x00000004
+wm 32 0x00bb000c 0x2891E41A
+wm 32 0x00bb0038 0x00000564
+wm 32 0x00bb0014 0x00000040
+wm 32 0x00bb0028 0x00000020
+wm 32 0x00bb002c 0x00000020
+
+/* Disable all MMDC arbitration and reordering controls */
+wm 32 0x021b0400 0x14420000
+
+wm 32 MX6_MMDC_P0_MDPDC 0x00020036
+wm 32 MX6_MMDC_P0_MDSCR 0x00008000
+wm 32 MX6_MMDC_P0_MDCFG0 0x898E79A4
+wm 32 MX6_MMDC_P0_MDCFG1 0xDB538F64
+wm 32 MX6_MMDC_P0_MDCFG2 0x01FF00DD
+wm 32 MX6_MMDC_P0_MDRWD 0x0f9f26d2
+wm 32 MX6_MMDC_P0_MDOR 0x008E1023
+wm 32 MX6_MMDC_P0_MDOTC 0x09444040
+wm 32 MX6_MMDC_P0_MDPDC 0x00025576
+wm 32 MX6_MMDC_P0_MDASP 0x00000047
+wm 32 MX6_MMDC_P0_MDCTL 0xC41A0000
+wm 32 MX6_MMDC_P0_MDSCR 0x04088032
+wm 32 MX6_MMDC_P0_MDSCR 0x0408803a
+wm 32 MX6_MMDC_P0_MDSCR 0x00008033
+wm 32 MX6_MMDC_P0_MDSCR 0x0000803b
+wm 32 MX6_MMDC_P0_MDSCR 0x00428031
+wm 32 MX6_MMDC_P0_MDSCR 0x00428039
+wm 32 MX6_MMDC_P0_MDSCR 0x19308030
+wm 32 MX6_MMDC_P0_MDSCR 0x19308038
+wm 32 MX6_MMDC_P0_MDSCR 0x04008040
+wm 32 MX6_MMDC_P0_MDSCR 0x04008048
+wm 32 MX6_MMDC_P0_MPZQHWCTRL 0xA1390003
+wm 32 MX6_MMDC_P1_MPZQHWCTRL 0xA1390003
+wm 32 MX6_MMDC_P0_MDREF 0x00007800
+wm 32 MX6_MMDC_P0_MPODTCTRL 0x00022227
+wm 32 MX6_MMDC_P1_MPODTCTRL 0x00022227
+wm 32 MX6_MMDC_P0_MPDGCTRL0 0x4327033b
+wm 32 MX6_MMDC_P0_MPDGCTRL1 0x0324031a
+wm 32 MX6_MMDC_P1_MPDGCTRL0 0x43240337
+wm 32 MX6_MMDC_P1_MPDGCTRL1 0x03210269
+wm 32 MX6_MMDC_P0_MPRDDLCTL 0x483c3e4a
+wm 32 MX6_MMDC_P1_MPRDDLCTL 0x423a3848
+wm 32 MX6_MMDC_P0_MPWRDLCTL 0x33363a2c
+wm 32 MX6_MMDC_P1_MPWRDLCTL 0x3e314137
+wm 32 MX6_MMDC_P0_MPWLDECTRL0 0x00200026
+wm 32 MX6_MMDC_P0_MPWLDECTRL1 0x00260021
+wm 32 MX6_MMDC_P1_MPWLDECTRL0 0x00180028
+wm 32 MX6_MMDC_P1_MPWLDECTRL1 0x000f001e
+wm 32 MX6_MMDC_P0_MPMUR0 0x00000800
+wm 32 MX6_MMDC_P1_MPMUR0 0x00000800
+wm 32 MX6_MMDC_P0_MDSCR 0x00000000
+wm 32 MX6_MMDC_P0_MAPSR 0x00011006
diff --git a/arch/arm/boards/boundarydevices-nitrogen6x/board.c b/arch/arm/boards/boundarydevices-nitrogen6x/board.c
index 28dba3af9a15..d9514d9d4807 100644
--- a/arch/arm/boards/boundarydevices-nitrogen6x/board.c
+++ b/arch/arm/boards/boundarydevices-nitrogen6x/board.c
@@ -23,13 +23,17 @@
static int nitrogen6x_devices_init(void)
{
if (!of_machine_is_compatible("boundary,imx6dl-nitrogen6x") &&
- !of_machine_is_compatible("boundary,imx6q-nitrogen6x"))
+ !of_machine_is_compatible("boundary,imx6q-nitrogen6x") &&
+ !of_machine_is_compatible("boundary,imx6qp-nitrogen6_max"))
return 0;
imx6_bbu_internal_spi_i2c_register_handler("spiflash", "/dev/m25p0.barebox",
BBU_HANDLER_FLAG_DEFAULT);
- barebox_set_hostname("nitrogen6x");
+ if (of_machine_is_compatible("boundary,imx6qp-nitrogen6_max"))
+ barebox_set_hostname("nitrogen6max");
+ else
+ barebox_set_hostname("nitrogen6x");
return 0;
}
@@ -55,7 +59,8 @@ static int ksz9021rn_phy_fixup(struct phy_device *dev)
static int nitrogen6x_coredevices_init(void)
{
if (!of_machine_is_compatible("boundary,imx6dl-nitrogen6x") &&
- !of_machine_is_compatible("boundary,imx6q-nitrogen6x"))
+ !of_machine_is_compatible("boundary,imx6q-nitrogen6x") &&
+ !of_machine_is_compatible("boundary,imx6qp-nitrogen6_max"))
return 0;
phy_register_fixup_for_uid(PHY_ID_KSZ9021, MICREL_PHY_ID_MASK,
--git a/arch/arm/boards/boundarydevices-nitrogen6x/flash-header-nitrogen6qp-max.imxcfg b/arch/arm/boards/boundarydevices-nitrogen6x/flash-header-nitrogen6qp-max.imxcfg
new file mode 100644
index 000000000000..66f0e1a86086
--- /dev/null
+++ b/arch/arm/boards/boundarydevices-nitrogen6x/flash-header-nitrogen6qp-max.imxcfg
@@ -0,0 +1,10 @@
+soc imx6
+loadaddr 0x20000000
+dcdofs 0x400
+
+#include <mach/imx6-ddr-regs.h>
+#include <mach/imx6q-ddr-regs.h>
+#include <mach/imx6-ccm-regs.h>
+
+#include "ram-base.imxcfg"
+#include "1066mhz_4x512mx16-qp.imxcfg"
diff --git a/arch/arm/boards/boundarydevices-nitrogen6x/lowlevel.c b/arch/arm/boards/boundarydevices-nitrogen6x/lowlevel.c
index 7eea3ce39034..bee70a5af412 100644
--- a/arch/arm/boards/boundarydevices-nitrogen6x/lowlevel.c
+++ b/arch/arm/boards/boundarydevices-nitrogen6x/lowlevel.c
@@ -50,3 +50,16 @@ ENTRY_FUNCTION(start_imx6dl_nitrogen6x_2g, r0, r1, r2)
imx6q_barebox_entry(fdt);
}
+
+extern char __dtb_imx6qp_nitrogen6_max_start[];
+
+ENTRY_FUNCTION(start_imx6qp_nitrogen6_max, r0, r1, r2)
+{
+ void *fdt;
+
+ imx6_cpu_lowlevel_init();
+
+ fdt = __dtb_imx6qp_nitrogen6_max_start - get_runtime_offset();
+
+ imx6q_barebox_entry(fdt);
+}
diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
index 813e09814546..7a59402106c4 100644
--- a/arch/arm/dts/Makefile
+++ b/arch/arm/dts/Makefile
@@ -29,7 +29,7 @@ pbl-dtb-$(CONFIG_MACH_GW_VENTANA) += imx6q-gw54xx.dtb.o
pbl-dtb-$(CONFIG_MACH_LENOVO_IX4_300D) += armada-xp-lenovo-ix4-300d-bb.dtb.o
pbl-dtb-$(CONFIG_MACH_MARVELL_ARMADA_XP_GP) += armada-xp-gp-bb.dtb.o
pbl-dtb-$(CONFIG_MACH_NETGEAR_RN104) += armada-370-rn104-bb.dtb.o
-pbl-dtb-$(CONFIG_MACH_NITROGEN6X) += imx6q-nitrogen6x.dtb.o imx6dl-nitrogen6x.dtb.o
+pbl-dtb-$(CONFIG_MACH_NITROGEN6X) += imx6q-nitrogen6x.dtb.o imx6dl-nitrogen6x.dtb.o imx6qp-nitrogen6_max.dtb.o
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
diff --git a/arch/arm/dts/imx6qdl-nitrogen6_max.dtsi b/arch/arm/dts/imx6qdl-nitrogen6_max.dtsi
new file mode 100644
index 000000000000..26c685c52955
--- /dev/null
+++ b/arch/arm/dts/imx6qdl-nitrogen6_max.dtsi
@@ -0,0 +1,69 @@
+/*
+ * Copyright 2016 Pengutronix, Lucas Stach
+ *
+ * This file is dual-licensed: you can use it either under the terms
+ * of the GPL or the X11 license, at your option. Note that this dual
+ * licensing only applies to this file, and not this project as a
+ * whole.
+ *
+ * a) This file is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * Or, alternatively,
+ *
+ * b) Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following
+ * conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/ {
+ chosen {
+ environment@0 {
+ compatible = "barebox,environment";
+ device-path = &flash, "partname:barebox-environment";
+ };
+ };
+};
+
+&flash {
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ partition@0 {
+ label = "barebox";
+ reg = <0x0 0xe0000>;
+ };
+
+ partition@e0000 {
+ label = "barebox-environment";
+ reg = <0xe0000 0x20000>;
+ };
+};
+
+&ocotp {
+ barebox,provide-mac-address = <&fec 0x620>;
+};
\ No newline at end of file
diff --git a/arch/arm/dts/imx6qp-nitrogen6_max.dts b/arch/arm/dts/imx6qp-nitrogen6_max.dts
new file mode 100644
index 000000000000..93f0741062e7
--- /dev/null
+++ b/arch/arm/dts/imx6qp-nitrogen6_max.dts
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2016 Boundary Devices, Inc.
+ *
+ * This file is dual-licensed: you can use it either under the terms
+ * of the GPL or the X11 license, at your option. Note that this dual
+ * licensing only applies to this file, and not this project as a
+ * whole.
+ *
+ * a) This file is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * Or, alternatively,
+ *
+ * b) Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following
+ * conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#include <arm/imx6qp-nitrogen6_max.dts>
+#include "imx6qdl-nitrogen6_max.dtsi"
diff --git a/images/Makefile.imx b/images/Makefile.imx
index effa5edc0f6e..166bb8ee4dfe 100644
--- a/images/Makefile.imx
+++ b/images/Makefile.imx
@@ -288,6 +288,11 @@ CFG_start_imx6dl_nitrogen6x_2g.pblx.imximg = $(board)/boundarydevices-nitrogen6x
FILE_barebox-boundarydevices-imx6dl-nitrogen6x-2g.img = start_imx6dl_nitrogen6x_2g.pblx.imximg
image-$(CONFIG_MACH_NITROGEN6X) += barebox-boundarydevices-imx6dl-nitrogen6x-2g.img
+pblx-$(CONFIG_MACH_NITROGEN6X) += start_imx6qp_nitrogen6_max
+CFG_start_imx6qp_nitrogen6_max.pblx.imximg = $(board)/boundarydevices-nitrogen6x/flash-header-nitrogen6qp-max.imxcfg
+FILE_barebox-boundarydevices-imx6qp-nitrogen6_max.img = start_imx6qp_nitrogen6_max.pblx.imximg
+image-$(CONFIG_MACH_NITROGEN6X) += barebox-boundarydevices-imx6qp-nitrogen6_max.img
+
pblx-$(CONFIG_MACH_TX6X) += start_imx6dl_tx6x_512m
CFG_start_imx6dl_tx6x_512m.pblx.imximg = $(board)/karo-tx6x/flash-header-tx6dl-512m.imxcfg
FILE_barebox-karo-imx6dl-tx6x-512m.img = start_imx6dl_tx6x_512m.pblx.imximg
--
2.8.1
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH 6/6] ARM: nitrogen: rename to nitrogen6
2016-07-22 12:31 [PATCH 1/6] ARM: imx: add QP as supported i.MX6 variant Lucas Stach
` (3 preceding siblings ...)
2016-07-22 12:31 ` [PATCH 5/6] ARM: add support for Nitrogen6MAX QP variant Lucas Stach
@ 2016-07-22 12:31 ` Lucas Stach
2016-07-25 8:18 ` [PATCH 1/6] ARM: imx: add QP as supported i.MX6 variant Sascha Hauer
5 siblings, 0 replies; 7+ messages in thread
From: Lucas Stach @ 2016-07-22 12:31 UTC (permalink / raw)
To: barebox
Now that the MAX variant of the board is also supported by the
same code, rename the board directory to the more generic nitrogen6.
Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
---
arch/arm/boards/Makefile | 2 +-
.../1066mhz_4x128mx16.imxcfg | 0
.../1066mhz_4x256mx16.imxcfg | 0
.../1066mhz_4x512mx16-qp.imxcfg | 0
.../800mhz_4x128mx16.imxcfg | 0
.../800mhz_4x256mx16.imxcfg | 0
.../Makefile | 0
.../board.c | 0
| 0
| 0
| 0
| 0
| 0
.../lowlevel.c | 0
.../ram-base.imxcfg | 0
arch/arm/configs/imx_v7_defconfig | 2 +-
arch/arm/dts/Makefile | 2 +-
arch/arm/mach-imx/Kconfig | 4 +--
images/Makefile.imx | 30 +++++++++++-----------
19 files changed, 20 insertions(+), 20 deletions(-)
rename arch/arm/boards/{boundarydevices-nitrogen6x => boundarydevices-nitrogen6}/1066mhz_4x128mx16.imxcfg (100%)
rename arch/arm/boards/{boundarydevices-nitrogen6x => boundarydevices-nitrogen6}/1066mhz_4x256mx16.imxcfg (100%)
rename arch/arm/boards/{boundarydevices-nitrogen6x => boundarydevices-nitrogen6}/1066mhz_4x512mx16-qp.imxcfg (100%)
rename arch/arm/boards/{boundarydevices-nitrogen6x => boundarydevices-nitrogen6}/800mhz_4x128mx16.imxcfg (100%)
rename arch/arm/boards/{boundarydevices-nitrogen6x => boundarydevices-nitrogen6}/800mhz_4x256mx16.imxcfg (100%)
rename arch/arm/boards/{boundarydevices-nitrogen6x => boundarydevices-nitrogen6}/Makefile (100%)
rename arch/arm/boards/{boundarydevices-nitrogen6x => boundarydevices-nitrogen6}/board.c (100%)
rename arch/arm/boards/{boundarydevices-nitrogen6x => boundarydevices-nitrogen6}/flash-header-nitrogen6dl-1g.imxcfg (100%)
rename arch/arm/boards/{boundarydevices-nitrogen6x => boundarydevices-nitrogen6}/flash-header-nitrogen6dl-2g.imxcfg (100%)
rename arch/arm/boards/{boundarydevices-nitrogen6x => boundarydevices-nitrogen6}/flash-header-nitrogen6q-1g.imxcfg (100%)
rename arch/arm/boards/{boundarydevices-nitrogen6x => boundarydevices-nitrogen6}/flash-header-nitrogen6q-2g.imxcfg (100%)
rename arch/arm/boards/{boundarydevices-nitrogen6x => boundarydevices-nitrogen6}/flash-header-nitrogen6qp-max.imxcfg (100%)
rename arch/arm/boards/{boundarydevices-nitrogen6x => boundarydevices-nitrogen6}/lowlevel.c (100%)
rename arch/arm/boards/{boundarydevices-nitrogen6x => boundarydevices-nitrogen6}/ram-base.imxcfg (100%)
diff --git a/arch/arm/boards/Makefile b/arch/arm/boards/Makefile
index e3dcc6a61507..35b636f0cfbb 100644
--- a/arch/arm/boards/Makefile
+++ b/arch/arm/boards/Makefile
@@ -15,7 +15,7 @@ obj-$(CONFIG_MACH_BEAGLE) += beagle/
obj-$(CONFIG_MACH_BEAGLEBONE) += beaglebone/
obj-$(CONFIG_MACH_CANON_A1100) += canon-a1100/
obj-$(CONFIG_MACH_CM_FX6) += cm-fx6/
-obj-$(CONFIG_MACH_NITROGEN6X) += boundarydevices-nitrogen6x/
+obj-$(CONFIG_MACH_NITROGEN6) += boundarydevices-nitrogen6/
obj-$(CONFIG_MACH_CCMX51) += ccxmx51/
obj-$(CONFIG_MACH_CCMX53) += ccxmx53/
obj-$(CONFIG_MACH_CFA10036) += crystalfontz-cfa10036/
diff --git a/arch/arm/boards/boundarydevices-nitrogen6x/1066mhz_4x128mx16.imxcfg b/arch/arm/boards/boundarydevices-nitrogen6/1066mhz_4x128mx16.imxcfg
similarity index 100%
rename from arch/arm/boards/boundarydevices-nitrogen6x/1066mhz_4x128mx16.imxcfg
rename to arch/arm/boards/boundarydevices-nitrogen6/1066mhz_4x128mx16.imxcfg
diff --git a/arch/arm/boards/boundarydevices-nitrogen6x/1066mhz_4x256mx16.imxcfg b/arch/arm/boards/boundarydevices-nitrogen6/1066mhz_4x256mx16.imxcfg
similarity index 100%
rename from arch/arm/boards/boundarydevices-nitrogen6x/1066mhz_4x256mx16.imxcfg
rename to arch/arm/boards/boundarydevices-nitrogen6/1066mhz_4x256mx16.imxcfg
diff --git a/arch/arm/boards/boundarydevices-nitrogen6x/1066mhz_4x512mx16-qp.imxcfg b/arch/arm/boards/boundarydevices-nitrogen6/1066mhz_4x512mx16-qp.imxcfg
similarity index 100%
rename from arch/arm/boards/boundarydevices-nitrogen6x/1066mhz_4x512mx16-qp.imxcfg
rename to arch/arm/boards/boundarydevices-nitrogen6/1066mhz_4x512mx16-qp.imxcfg
diff --git a/arch/arm/boards/boundarydevices-nitrogen6x/800mhz_4x128mx16.imxcfg b/arch/arm/boards/boundarydevices-nitrogen6/800mhz_4x128mx16.imxcfg
similarity index 100%
rename from arch/arm/boards/boundarydevices-nitrogen6x/800mhz_4x128mx16.imxcfg
rename to arch/arm/boards/boundarydevices-nitrogen6/800mhz_4x128mx16.imxcfg
diff --git a/arch/arm/boards/boundarydevices-nitrogen6x/800mhz_4x256mx16.imxcfg b/arch/arm/boards/boundarydevices-nitrogen6/800mhz_4x256mx16.imxcfg
similarity index 100%
rename from arch/arm/boards/boundarydevices-nitrogen6x/800mhz_4x256mx16.imxcfg
rename to arch/arm/boards/boundarydevices-nitrogen6/800mhz_4x256mx16.imxcfg
diff --git a/arch/arm/boards/boundarydevices-nitrogen6x/Makefile b/arch/arm/boards/boundarydevices-nitrogen6/Makefile
similarity index 100%
rename from arch/arm/boards/boundarydevices-nitrogen6x/Makefile
rename to arch/arm/boards/boundarydevices-nitrogen6/Makefile
diff --git a/arch/arm/boards/boundarydevices-nitrogen6x/board.c b/arch/arm/boards/boundarydevices-nitrogen6/board.c
similarity index 100%
rename from arch/arm/boards/boundarydevices-nitrogen6x/board.c
rename to arch/arm/boards/boundarydevices-nitrogen6/board.c
diff --git a/arch/arm/boards/boundarydevices-nitrogen6x/flash-header-nitrogen6dl-1g.imxcfg b/arch/arm/boards/boundarydevices-nitrogen6/flash-header-nitrogen6dl-1g.imxcfg
similarity index 100%
rename from arch/arm/boards/boundarydevices-nitrogen6x/flash-header-nitrogen6dl-1g.imxcfg
rename to arch/arm/boards/boundarydevices-nitrogen6/flash-header-nitrogen6dl-1g.imxcfg
diff --git a/arch/arm/boards/boundarydevices-nitrogen6x/flash-header-nitrogen6dl-2g.imxcfg b/arch/arm/boards/boundarydevices-nitrogen6/flash-header-nitrogen6dl-2g.imxcfg
similarity index 100%
rename from arch/arm/boards/boundarydevices-nitrogen6x/flash-header-nitrogen6dl-2g.imxcfg
rename to arch/arm/boards/boundarydevices-nitrogen6/flash-header-nitrogen6dl-2g.imxcfg
diff --git a/arch/arm/boards/boundarydevices-nitrogen6x/flash-header-nitrogen6q-1g.imxcfg b/arch/arm/boards/boundarydevices-nitrogen6/flash-header-nitrogen6q-1g.imxcfg
similarity index 100%
rename from arch/arm/boards/boundarydevices-nitrogen6x/flash-header-nitrogen6q-1g.imxcfg
rename to arch/arm/boards/boundarydevices-nitrogen6/flash-header-nitrogen6q-1g.imxcfg
diff --git a/arch/arm/boards/boundarydevices-nitrogen6x/flash-header-nitrogen6q-2g.imxcfg b/arch/arm/boards/boundarydevices-nitrogen6/flash-header-nitrogen6q-2g.imxcfg
similarity index 100%
rename from arch/arm/boards/boundarydevices-nitrogen6x/flash-header-nitrogen6q-2g.imxcfg
rename to arch/arm/boards/boundarydevices-nitrogen6/flash-header-nitrogen6q-2g.imxcfg
diff --git a/arch/arm/boards/boundarydevices-nitrogen6x/flash-header-nitrogen6qp-max.imxcfg b/arch/arm/boards/boundarydevices-nitrogen6/flash-header-nitrogen6qp-max.imxcfg
similarity index 100%
rename from arch/arm/boards/boundarydevices-nitrogen6x/flash-header-nitrogen6qp-max.imxcfg
rename to arch/arm/boards/boundarydevices-nitrogen6/flash-header-nitrogen6qp-max.imxcfg
diff --git a/arch/arm/boards/boundarydevices-nitrogen6x/lowlevel.c b/arch/arm/boards/boundarydevices-nitrogen6/lowlevel.c
similarity index 100%
rename from arch/arm/boards/boundarydevices-nitrogen6x/lowlevel.c
rename to arch/arm/boards/boundarydevices-nitrogen6/lowlevel.c
diff --git a/arch/arm/boards/boundarydevices-nitrogen6x/ram-base.imxcfg b/arch/arm/boards/boundarydevices-nitrogen6/ram-base.imxcfg
similarity index 100%
rename from arch/arm/boards/boundarydevices-nitrogen6x/ram-base.imxcfg
rename to arch/arm/boards/boundarydevices-nitrogen6/ram-base.imxcfg
diff --git a/arch/arm/configs/imx_v7_defconfig b/arch/arm/configs/imx_v7_defconfig
index 8594965b5418..e3a8f478d2f4 100644
--- a/arch/arm/configs/imx_v7_defconfig
+++ b/arch/arm/configs/imx_v7_defconfig
@@ -18,7 +18,7 @@ CONFIG_MACH_TX6X=y
CONFIG_MACH_SABRELITE=y
CONFIG_MACH_SABRESD=y
CONFIG_MACH_FREESCALE_IMX6SX_SABRESDB=y
-CONFIG_MACH_NITROGEN6X=y
+CONFIG_MACH_NITROGEN6=y
CONFIG_MACH_SOLIDRUN_MICROSOM=y
CONFIG_MACH_TECHNEXION_WANDBOARD=y
CONFIG_MACH_EMBEST_RIOTBOARD=y
diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
index 7a59402106c4..09bf68ea2be7 100644
--- a/arch/arm/dts/Makefile
+++ b/arch/arm/dts/Makefile
@@ -29,7 +29,7 @@ pbl-dtb-$(CONFIG_MACH_GW_VENTANA) += imx6q-gw54xx.dtb.o
pbl-dtb-$(CONFIG_MACH_LENOVO_IX4_300D) += armada-xp-lenovo-ix4-300d-bb.dtb.o
pbl-dtb-$(CONFIG_MACH_MARVELL_ARMADA_XP_GP) += armada-xp-gp-bb.dtb.o
pbl-dtb-$(CONFIG_MACH_NETGEAR_RN104) += armada-370-rn104-bb.dtb.o
-pbl-dtb-$(CONFIG_MACH_NITROGEN6X) += imx6q-nitrogen6x.dtb.o imx6dl-nitrogen6x.dtb.o imx6qp-nitrogen6_max.dtb.o
+pbl-dtb-$(CONFIG_MACH_NITROGEN6) += imx6q-nitrogen6x.dtb.o imx6dl-nitrogen6x.dtb.o imx6qp-nitrogen6_max.dtb.o
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
diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig
index 80f8fd80aecc..82fc945d5b88 100644
--- a/arch/arm/mach-imx/Kconfig
+++ b/arch/arm/mach-imx/Kconfig
@@ -279,8 +279,8 @@ config MACH_FREESCALE_IMX6SX_SABRESDB
select I2C
select I2C_IMX
-config MACH_NITROGEN6X
- bool "BoundaryDevices Nitrogen6x"
+config MACH_NITROGEN6
+ bool "BoundaryDevices Nitrogen6 boards"
select ARCH_IMX6
config MACH_SOLIDRUN_MICROSOM
diff --git a/images/Makefile.imx b/images/Makefile.imx
index 166bb8ee4dfe..b02fdff4b17f 100644
--- a/images/Makefile.imx
+++ b/images/Makefile.imx
@@ -268,30 +268,30 @@ CFG_start_hummingboard_microsom_i4.pblx.imximg = $(board)/solidrun-microsom/flas
FILE_barebox-solidrun-hummingboard-microsom-i4.img = start_hummingboard_microsom_i4.pblx.imximg
image-$(CONFIG_MACH_SOLIDRUN_MICROSOM) += barebox-solidrun-hummingboard-microsom-i4.img
-pblx-$(CONFIG_MACH_NITROGEN6X) += start_imx6q_nitrogen6x_1g
-CFG_start_imx6q_nitrogen6x_1g.pblx.imximg = $(board)/boundarydevices-nitrogen6x/flash-header-nitrogen6q-1g.imxcfg
+pblx-$(CONFIG_MACH_NITROGEN6) += start_imx6q_nitrogen6x_1g
+CFG_start_imx6q_nitrogen6x_1g.pblx.imximg = $(board)/boundarydevices-nitrogen6/flash-header-nitrogen6q-1g.imxcfg
FILE_barebox-boundarydevices-imx6q-nitrogen6x-1g.img = start_imx6q_nitrogen6x_1g.pblx.imximg
-image-$(CONFIG_MACH_NITROGEN6X) += barebox-boundarydevices-imx6q-nitrogen6x-1g.img
+image-$(CONFIG_MACH_NITROGEN6) += barebox-boundarydevices-imx6q-nitrogen6x-1g.img
-pblx-$(CONFIG_MACH_NITROGEN6X) += start_imx6q_nitrogen6x_2g
-CFG_start_imx6q_nitrogen6x_2g.pblx.imximg = $(board)/boundarydevices-nitrogen6x/flash-header-nitrogen6q-2g.imxcfg
+pblx-$(CONFIG_MACH_NITROGEN6) += start_imx6q_nitrogen6x_2g
+CFG_start_imx6q_nitrogen6x_2g.pblx.imximg = $(board)/boundarydevices-nitrogen6/flash-header-nitrogen6q-2g.imxcfg
FILE_barebox-boundarydevices-imx6q-nitrogen6x-2g.img = start_imx6q_nitrogen6x_2g.pblx.imximg
-image-$(CONFIG_MACH_NITROGEN6X) += barebox-boundarydevices-imx6q-nitrogen6x-2g.img
+image-$(CONFIG_MACH_NITROGEN6) += barebox-boundarydevices-imx6q-nitrogen6x-2g.img
-pblx-$(CONFIG_MACH_NITROGEN6X) += start_imx6dl_nitrogen6x_1g
-CFG_start_imx6dl_nitrogen6x_1g.pblx.imximg = $(board)/boundarydevices-nitrogen6x/flash-header-nitrogen6dl-1g.imxcfg
+pblx-$(CONFIG_MACH_NITROGEN6) += start_imx6dl_nitrogen6x_1g
+CFG_start_imx6dl_nitrogen6x_1g.pblx.imximg = $(board)/boundarydevices-nitrogen6/flash-header-nitrogen6dl-1g.imxcfg
FILE_barebox-boundarydevices-imx6dl-nitrogen6x-1g.img = start_imx6dl_nitrogen6x_1g.pblx.imximg
-image-$(CONFIG_MACH_NITROGEN6X) += barebox-boundarydevices-imx6dl-nitrogen6x-1g.img
+image-$(CONFIG_MACH_NITROGEN6) += barebox-boundarydevices-imx6dl-nitrogen6x-1g.img
-pblx-$(CONFIG_MACH_NITROGEN6X) += start_imx6dl_nitrogen6x_2g
-CFG_start_imx6dl_nitrogen6x_2g.pblx.imximg = $(board)/boundarydevices-nitrogen6x/flash-header-nitrogen6dl-2g.imxcfg
+pblx-$(CONFIG_MACH_NITROGEN6) += start_imx6dl_nitrogen6x_2g
+CFG_start_imx6dl_nitrogen6x_2g.pblx.imximg = $(board)/boundarydevices-nitrogen6/flash-header-nitrogen6dl-2g.imxcfg
FILE_barebox-boundarydevices-imx6dl-nitrogen6x-2g.img = start_imx6dl_nitrogen6x_2g.pblx.imximg
-image-$(CONFIG_MACH_NITROGEN6X) += barebox-boundarydevices-imx6dl-nitrogen6x-2g.img
+image-$(CONFIG_MACH_NITROGEN6) += barebox-boundarydevices-imx6dl-nitrogen6x-2g.img
-pblx-$(CONFIG_MACH_NITROGEN6X) += start_imx6qp_nitrogen6_max
-CFG_start_imx6qp_nitrogen6_max.pblx.imximg = $(board)/boundarydevices-nitrogen6x/flash-header-nitrogen6qp-max.imxcfg
+pblx-$(CONFIG_MACH_NITROGEN6) += start_imx6qp_nitrogen6_max
+CFG_start_imx6qp_nitrogen6_max.pblx.imximg = $(board)/boundarydevices-nitrogen6/flash-header-nitrogen6qp-max.imxcfg
FILE_barebox-boundarydevices-imx6qp-nitrogen6_max.img = start_imx6qp_nitrogen6_max.pblx.imximg
-image-$(CONFIG_MACH_NITROGEN6X) += barebox-boundarydevices-imx6qp-nitrogen6_max.img
+image-$(CONFIG_MACH_NITROGEN6) += barebox-boundarydevices-imx6qp-nitrogen6_max.img
pblx-$(CONFIG_MACH_TX6X) += start_imx6dl_tx6x_512m
CFG_start_imx6dl_tx6x_512m.pblx.imximg = $(board)/karo-tx6x/flash-header-tx6dl-512m.imxcfg
--
2.8.1
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 1/6] ARM: imx: add QP as supported i.MX6 variant
2016-07-22 12:31 [PATCH 1/6] ARM: imx: add QP as supported i.MX6 variant Lucas Stach
` (4 preceding siblings ...)
2016-07-22 12:31 ` [PATCH 6/6] ARM: nitrogen: rename to nitrogen6 Lucas Stach
@ 2016-07-25 8:18 ` Sascha Hauer
5 siblings, 0 replies; 7+ messages in thread
From: Sascha Hauer @ 2016-07-25 8:18 UTC (permalink / raw)
To: Lucas Stach; +Cc: barebox
On Fri, Jul 22, 2016 at 02:31:25PM +0200, Lucas Stach wrote:
> Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
> ---
> arch/arm/mach-imx/imx.c | 2 ++
> 1 file changed, 2 insertions(+)
Applied, thanks
Sascha
>
> diff --git a/arch/arm/mach-imx/imx.c b/arch/arm/mach-imx/imx.c
> index 374ee35df154..2e33325c9f09 100644
> --- a/arch/arm/mach-imx/imx.c
> +++ b/arch/arm/mach-imx/imx.c
> @@ -59,6 +59,8 @@ static int imx_soc_from_dt(void)
> return IMX_CPU_IMX6;
> if (of_machine_is_compatible("fsl,imx6sx"))
> return IMX_CPU_IMX6;
> + if (of_machine_is_compatible("fsl,imx6qp"))
> + return IMX_CPU_IMX6;
>
> return 0;
> }
> --
> 2.8.1
>
>
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox
>
--
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] 7+ messages in thread
end of thread, other threads:[~2016-07-25 8:19 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-07-22 12:31 [PATCH 1/6] ARM: imx: add QP as supported i.MX6 variant Lucas Stach
2016-07-22 12:31 ` [PATCH 2/6] ARM: nitrogen6x: use upstream DTs Lucas Stach
2016-07-22 12:31 ` [PATCH 3/6] ARM: nitrogen6x: use imx6q_barebox_entry Lucas Stach
2016-07-22 12:31 ` [PATCH 4/6] ARM: nitrogen6x: disable address mirroring Lucas Stach
2016-07-22 12:31 ` [PATCH 5/6] ARM: add support for Nitrogen6MAX QP variant Lucas Stach
2016-07-22 12:31 ` [PATCH 6/6] ARM: nitrogen: rename to nitrogen6 Lucas Stach
2016-07-25 8:18 ` [PATCH 1/6] ARM: imx: add QP as supported i.MX6 variant Sascha Hauer
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox