mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Sascha Hauer <s.hauer@pengutronix.de>
To: barebox@lists.infradead.org
Subject: Re: [PATCH 1/2] ARM: dts: rename imx6q-dmo-realq7.dts to imx6q-dmo-edmqmx6.dts
Date: Wed, 15 Jan 2014 10:36:07 +0100	[thread overview]
Message-ID: <20140115093607.GP16215@pengutronix.de> (raw)
In-Reply-To: <1389770794-20487-1-git-send-email-s.hauer@pengutronix.de>

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

  parent reply	other threads:[~2014-01-15  9:36 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
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 ` Sascha Hauer [this message]
2014-01-15  9:41   ` [PATCH 1/2] ARM: dts: rename imx6q-dmo-realq7.dts to imx6q-dmo-edmqmx6.dts Alexander Aring
2014-01-16 13:28     ` Sascha Hauer
2014-01-16 14:57       ` Alexander Aring

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20140115093607.GP16215@pengutronix.de \
    --to=s.hauer@pengutronix.de \
    --cc=barebox@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox