* [PATCH 1/2] ARM: dts: rename imx6q-dmo-realq7.dts to imx6q-dmo-edmqmx6.dts
@ 2014-01-15 7:26 Sascha Hauer
2014-01-15 7:26 ` [PATCH 2/2] ARM: dts: change dmo, imx6q-realq7 compatible to dmo, imx6q-edmqmx6 Sascha Hauer
2014-01-15 9:36 ` [PATCH 1/2] ARM: dts: rename imx6q-dmo-realq7.dts to imx6q-dmo-edmqmx6.dts Sascha Hauer
0 siblings, 2 replies; 6+ messages in thread
From: Sascha Hauer @ 2014-01-15 7:26 UTC (permalink / raw)
To: barebox
As this name is used in the Kernel.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
arch/arm/dts/Makefile | 4 ++--
arch/arm/dts/{imx6q-dmo-realq7.dts => imx6q-dmo-edmqmx6.dts} | 0
2 files changed, 2 insertions(+), 2 deletions(-)
rename arch/arm/dts/{imx6q-dmo-realq7.dts => imx6q-dmo-edmqmx6.dts} (100%)
diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
index add4dc0..67804ab 100644
--- a/arch/arm/dts/Makefile
+++ b/arch/arm/dts/Makefile
@@ -9,7 +9,7 @@ dtb-$(CONFIG_ARCH_IMX53) += imx53-qsb.dtb \
dtb-$(CONFIG_ARCH_IMX6) += imx6q-gk802.dtb \
imx6dl-dfi-fs700-m60-6s.dtb \
imx6q-dfi-fs700-m60-6q.dtb \
- imx6q-dmo-realq7.dtb \
+ imx6q-dmo-edmqmx6.dtb \
imx6q-sabrelite.dtb \
imx6dl-sabrelite.dtb \
imx6q-sabresd.dtb \
@@ -37,7 +37,7 @@ pbl-$(CONFIG_MACH_FREESCALE_MX53_VMX53) += imx53-voipac-bsb.dtb.o
pbl-$(CONFIG_MACH_DFI_FS700_M60) += imx6q-dfi-fs700-m60-6q.dtb.o imx6dl-dfi-fs700-m60-6s.dtb.o
pbl-$(CONFIG_MACH_PCM051) += am335x-phytec-phycore.dtb.o
pbl-$(CONFIG_MACH_PHYTEC_PFLA02) += imx6q-phytec-pbab01.dtb.o
-pbl-$(CONFIG_MACH_REALQ7) += imx6q-dmo-realq7.dtb.o
+pbl-$(CONFIG_MACH_REALQ7) += imx6q-dmo-edmqmx6.dtb.o
pbl-$(CONFIG_MACH_SOLIDRUN_CUBOX) += dove-cubox.dtb.o
pbl-$(CONFIG_MACH_GK802) += imx6q-gk802.dtb.o
pbl-$(CONFIG_MACH_TORADEX_COLIBRI_T20_IRIS) += tegra20-colibri-iris.dtb.o
diff --git a/arch/arm/dts/imx6q-dmo-realq7.dts b/arch/arm/dts/imx6q-dmo-edmqmx6.dts
similarity index 100%
rename from arch/arm/dts/imx6q-dmo-realq7.dts
rename to arch/arm/dts/imx6q-dmo-edmqmx6.dts
--
1.8.5.2
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 2/2] ARM: dts: change dmo, imx6q-realq7 compatible to dmo, imx6q-edmqmx6
2014-01-15 7:26 [PATCH 1/2] ARM: dts: rename imx6q-dmo-realq7.dts to imx6q-dmo-edmqmx6.dts Sascha Hauer
@ 2014-01-15 7:26 ` Sascha Hauer
2014-01-15 9:36 ` [PATCH 1/2] ARM: dts: rename imx6q-dmo-realq7.dts to imx6q-dmo-edmqmx6.dts Sascha Hauer
1 sibling, 0 replies; 6+ messages in thread
From: Sascha Hauer @ 2014-01-15 7:26 UTC (permalink / raw)
To: barebox
To use the same compatible as the kernel.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
arch/arm/boards/dmo-mx6-realq7/board.c | 6 +++---
arch/arm/dts/imx6q-dmo-edmqmx6.dts | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/arch/arm/boards/dmo-mx6-realq7/board.c b/arch/arm/boards/dmo-mx6-realq7/board.c
index 1753bdd..8a49bee 100644
--- a/arch/arm/boards/dmo-mx6-realq7/board.c
+++ b/arch/arm/boards/dmo-mx6-realq7/board.c
@@ -74,7 +74,7 @@ static int ksz9031rn_phy_fixup(struct phy_device *dev)
static int realq7_enet_init(void)
{
- if (!of_machine_is_compatible("dmo,imx6q-realq7"))
+ if (!of_machine_is_compatible("dmo,imx6q-edmqmx6"))
return 0;
mxc_iomux_v3_setup_multiple_pads(realq7_pads_gpio, ARRAY_SIZE(realq7_pads_gpio));
@@ -100,7 +100,7 @@ fs_initcall(realq7_enet_init);
static int realq7_env_init(void)
{
- if (!of_machine_is_compatible("dmo,imx6q-realq7"))
+ if (!of_machine_is_compatible("dmo,imx6q-edmqmx6"))
return 0;
imx6_bbu_internal_spi_i2c_register_handler("spiflash", "/dev/m25p0.barebox",
@@ -113,7 +113,7 @@ late_initcall(realq7_env_init);
static int realq7_console_init(void)
{
- if (!of_machine_is_compatible("dmo,imx6q-realq7"))
+ if (!of_machine_is_compatible("dmo,imx6q-edmqmx6"))
return 0;
barebox_set_hostname("eDM-QMX6");
diff --git a/arch/arm/dts/imx6q-dmo-edmqmx6.dts b/arch/arm/dts/imx6q-dmo-edmqmx6.dts
index 4701d79..9fe1284 100644
--- a/arch/arm/dts/imx6q-dmo-edmqmx6.dts
+++ b/arch/arm/dts/imx6q-dmo-edmqmx6.dts
@@ -14,8 +14,8 @@
#include "imx6q.dtsi"
/ {
- model = "Data Modul RealQ7 Board";
- compatible = "dmo,imx6q-realq7", "fsl,imx6q";
+ model = "Data Modul eDM-QMX6 Board";
+ compatible = "dmo,imx6q-edmqmx6", "fsl,imx6q";
chosen {
linux,stdout-path = "/soc/aips-bus@02100000/serial@021e8000";
--
1.8.5.2
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 1/2] ARM: dts: rename imx6q-dmo-realq7.dts to imx6q-dmo-edmqmx6.dts
2014-01-15 7:26 [PATCH 1/2] ARM: dts: rename imx6q-dmo-realq7.dts to imx6q-dmo-edmqmx6.dts Sascha Hauer
2014-01-15 7:26 ` [PATCH 2/2] ARM: dts: change dmo, imx6q-realq7 compatible to dmo, imx6q-edmqmx6 Sascha Hauer
@ 2014-01-15 9:36 ` Sascha Hauer
2014-01-15 9:41 ` Alexander Aring
1 sibling, 1 reply; 6+ messages in thread
From: Sascha Hauer @ 2014-01-15 9:36 UTC (permalink / raw)
To: barebox
On Wed, Jan 15, 2014 at 08:26:33AM +0100, Sascha Hauer wrote:
> As this name is used in the Kernel.
>
> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
> ---
> arch/arm/dts/Makefile | 4 ++--
> arch/arm/dts/{imx6q-dmo-realq7.dts => imx6q-dmo-edmqmx6.dts} | 0
> 2 files changed, 2 insertions(+), 2 deletions(-)
> rename arch/arm/dts/{imx6q-dmo-realq7.dts => imx6q-dmo-edmqmx6.dts} (100%)
>
> diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
> index add4dc0..67804ab 100644
> --- a/arch/arm/dts/Makefile
> +++ b/arch/arm/dts/Makefile
> @@ -9,7 +9,7 @@ dtb-$(CONFIG_ARCH_IMX53) += imx53-qsb.dtb \
> dtb-$(CONFIG_ARCH_IMX6) += imx6q-gk802.dtb \
> imx6dl-dfi-fs700-m60-6s.dtb \
> imx6q-dfi-fs700-m60-6q.dtb \
> - imx6q-dmo-realq7.dtb \
> + imx6q-dmo-edmqmx6.dtb \
> imx6q-sabrelite.dtb \
> imx6dl-sabrelite.dtb \
> imx6q-sabresd.dtb \
> @@ -37,7 +37,7 @@ pbl-$(CONFIG_MACH_FREESCALE_MX53_VMX53) += imx53-voipac-bsb.dtb.o
> pbl-$(CONFIG_MACH_DFI_FS700_M60) += imx6q-dfi-fs700-m60-6q.dtb.o imx6dl-dfi-fs700-m60-6s.dtb.o
> pbl-$(CONFIG_MACH_PCM051) += am335x-phytec-phycore.dtb.o
> pbl-$(CONFIG_MACH_PHYTEC_PFLA02) += imx6q-phytec-pbab01.dtb.o
> -pbl-$(CONFIG_MACH_REALQ7) += imx6q-dmo-realq7.dtb.o
> +pbl-$(CONFIG_MACH_REALQ7) += imx6q-dmo-edmqmx6.dtb.o
> pbl-$(CONFIG_MACH_SOLIDRUN_CUBOX) += dove-cubox.dtb.o
> pbl-$(CONFIG_MACH_GK802) += imx6q-gk802.dtb.o
> pbl-$(CONFIG_MACH_TORADEX_COLIBRI_T20_IRIS) += tegra20-colibri-iris.dtb.o
> diff --git a/arch/arm/dts/imx6q-dmo-realq7.dts b/arch/arm/dts/imx6q-dmo-edmqmx6.dts
> similarity index 100%
> rename from arch/arm/dts/imx6q-dmo-realq7.dts
> rename to arch/arm/dts/imx6q-dmo-edmqmx6.dts
As just reported by Lucas: This lacks:
diff --git a/arch/arm/boards/dmo-mx6-realq7/lowlevel.c b/arch/arm/boards/dmo-mx6-realq7/lowlevel.c
index f47575e..8d7df69 100644
--- a/arch/arm/boards/dmo-mx6-realq7/lowlevel.c
+++ b/arch/arm/boards/dmo-mx6-realq7/lowlevel.c
@@ -138,7 +138,7 @@ static void sdram_init(void)
writel(0x00000001, 0x021e8080);
}
-extern char __dtb_imx6q_dmo_realq7_start[];
+extern char __dtb_imx6q_dmo_edmqmx6_start[];
ENTRY_FUNCTION(start_imx6_realq7, r0, r1, r2)
{
@@ -155,7 +155,7 @@ ENTRY_FUNCTION(start_imx6_realq7, r0, r1, r2)
mmdc_do_dqs_calibration();
}
- fdt = (uint32_t)__dtb_imx6q_dmo_realq7_start - get_runtime_offset();
+ fdt = (uint32_t)__dtb_imx6q_dmo_edmqmx6_start - get_runtime_offset();
barebox_arm_entry(0x10000000, SZ_2G, fdt);
}
--
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] 6+ messages in thread
* Re: [PATCH 1/2] ARM: dts: rename imx6q-dmo-realq7.dts to imx6q-dmo-edmqmx6.dts
2014-01-15 9:36 ` [PATCH 1/2] ARM: dts: rename imx6q-dmo-realq7.dts to imx6q-dmo-edmqmx6.dts Sascha Hauer
@ 2014-01-15 9:41 ` Alexander Aring
2014-01-16 13:28 ` Sascha Hauer
0 siblings, 1 reply; 6+ messages in thread
From: Alexander Aring @ 2014-01-15 9:41 UTC (permalink / raw)
To: Sascha Hauer; +Cc: barebox
Hi Sascha,
On Wed, Jan 15, 2014 at 10:36:07AM +0100, Sascha Hauer wrote:
> On Wed, Jan 15, 2014 at 08:26:33AM +0100, Sascha Hauer wrote:
> > As this name is used in the Kernel.
> >
> > Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
> > ---
> > arch/arm/dts/Makefile | 4 ++--
> > arch/arm/dts/{imx6q-dmo-realq7.dts => imx6q-dmo-edmqmx6.dts} | 0
> > 2 files changed, 2 insertions(+), 2 deletions(-)
> > rename arch/arm/dts/{imx6q-dmo-realq7.dts => imx6q-dmo-edmqmx6.dts} (100%)
...
> {
> @@ -155,7 +155,7 @@ ENTRY_FUNCTION(start_imx6_realq7, r0, r1, r2)
then the name of ENTRY_FUNCTION too?
- Alex
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 1/2] ARM: dts: rename imx6q-dmo-realq7.dts to imx6q-dmo-edmqmx6.dts
2014-01-15 9:41 ` Alexander Aring
@ 2014-01-16 13:28 ` Sascha Hauer
2014-01-16 14:57 ` Alexander Aring
0 siblings, 1 reply; 6+ messages in thread
From: Sascha Hauer @ 2014-01-16 13:28 UTC (permalink / raw)
To: Alexander Aring; +Cc: barebox
On Wed, Jan 15, 2014 at 10:41:56AM +0100, Alexander Aring wrote:
> Hi Sascha,
>
> On Wed, Jan 15, 2014 at 10:36:07AM +0100, Sascha Hauer wrote:
> > On Wed, Jan 15, 2014 at 08:26:33AM +0100, Sascha Hauer wrote:
> > > As this name is used in the Kernel.
> > >
> > > Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
> > > ---
> > > arch/arm/dts/Makefile | 4 ++--
> > > arch/arm/dts/{imx6q-dmo-realq7.dts => imx6q-dmo-edmqmx6.dts} | 0
> > > 2 files changed, 2 insertions(+), 2 deletions(-)
> > > rename arch/arm/dts/{imx6q-dmo-realq7.dts => imx6q-dmo-edmqmx6.dts} (100%)
> ...
> > {
> > @@ -155,7 +155,7 @@ ENTRY_FUNCTION(start_imx6_realq7, r0, r1, r2)
>
> then the name of ENTRY_FUNCTION too?
I'll send a patch later renaming the whole board. For now I just want to
be compatible with the kernel filename which makes the files easier to
compare.
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] 6+ messages in thread
* Re: [PATCH 1/2] ARM: dts: rename imx6q-dmo-realq7.dts to imx6q-dmo-edmqmx6.dts
2014-01-16 13:28 ` Sascha Hauer
@ 2014-01-16 14:57 ` Alexander Aring
0 siblings, 0 replies; 6+ messages in thread
From: Alexander Aring @ 2014-01-16 14:57 UTC (permalink / raw)
To: Sascha Hauer; +Cc: barebox
On Thu, Jan 16, 2014 at 02:28:09PM +0100, Sascha Hauer wrote:
> On Wed, Jan 15, 2014 at 10:41:56AM +0100, Alexander Aring wrote:
> > Hi Sascha,
> >
> > On Wed, Jan 15, 2014 at 10:36:07AM +0100, Sascha Hauer wrote:
> > > On Wed, Jan 15, 2014 at 08:26:33AM +0100, Sascha Hauer wrote:
> > > > As this name is used in the Kernel.
> > > >
> > > > Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
> > > > ---
> > > > arch/arm/dts/Makefile | 4 ++--
> > > > arch/arm/dts/{imx6q-dmo-realq7.dts => imx6q-dmo-edmqmx6.dts} | 0
> > > > 2 files changed, 2 insertions(+), 2 deletions(-)
> > > > rename arch/arm/dts/{imx6q-dmo-realq7.dts => imx6q-dmo-edmqmx6.dts} (100%)
> > ...
> > > {
> > > @@ -155,7 +155,7 @@ ENTRY_FUNCTION(start_imx6_realq7, r0, r1, r2)
> >
> > then the name of ENTRY_FUNCTION too?
>
> I'll send a patch later renaming the whole board. For now I just want to
> be compatible with the kernel filename which makes the files easier to
> compare.
>
Now I see the 'extern' keyword in this patch. Makes sense to change this right
now. So it's still compileable. :-)
Thanks Sascha for your reply.
- Alex
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2014-01-16 14:58 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-01-15 7:26 [PATCH 1/2] ARM: dts: rename imx6q-dmo-realq7.dts to imx6q-dmo-edmqmx6.dts Sascha Hauer
2014-01-15 7:26 ` [PATCH 2/2] ARM: dts: change dmo, imx6q-realq7 compatible to dmo, imx6q-edmqmx6 Sascha Hauer
2014-01-15 9:36 ` [PATCH 1/2] ARM: dts: rename imx6q-dmo-realq7.dts to imx6q-dmo-edmqmx6.dts Sascha Hauer
2014-01-15 9:41 ` Alexander Aring
2014-01-16 13:28 ` Sascha Hauer
2014-01-16 14:57 ` Alexander Aring
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox