[PATCH 1/2] ARM: i.MX: edmqmx6: Copy fdt to SDRAM

[Sascha Hauer]

barebox only recognizes boarddata as dtb if it is inside SDRAM, so
copy the dtb there if necessary.

Signed-off-by: Sascha Hauer s.ha...@pengutronix.de
---
 arch/arm/boards/dmo-mx6-realq7/lowlevel.c | 20 
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/arch/arm/boards/dmo-mx6-realq7/lowlevel.c 
b/arch/arm/boards/dmo-mx6-realq7/lowlevel.c
index f47575e..7f6168c 100644
--- a/arch/arm/boards/dmo-mx6-realq7/lowlevel.c
+++ b/arch/arm/boards/dmo-mx6-realq7/lowlevel.c
@@ -15,6 +15,7 @@
 #include common.h
 #include sizes.h
 #include io.h
+#include debug_ll.h
 #include asm/sections.h
 #include asm/mmu.h
 #include asm/barebox-arm-head.h
@@ -136,26 +137,37 @@ static void sdram_init(void)
writel(0x047f, 0x021e80a4);
writel(0xc34f, 0x021e80a8);
writel(0x0001, 0x021e8080);
+   putc_ll('');
 }
 
 extern char __dtb_imx6q_dmo_realq7_start[];
+extern char __dtb_imx6q_dmo_realq7_end[];
 
 ENTRY_FUNCTION(start_imx6_realq7, r0, r1, r2)
 {
-   uint32_t fdt;
+   unsigned long fdt, sdram = 0x1000;
 
arm_cpu_lowlevel_init();
 
arm_setup_stack(0x0094 - 8);
 
+   fdt = (unsigned long)__dtb_imx6q_dmo_realq7_start - 
get_runtime_offset();
+
if (get_pc()  0x1000) {
sdram_init();
 
mmdc_do_write_level_calibration();
mmdc_do_dqs_calibration();
-   }
 
-   fdt = (uint32_t)__dtb_imx6q_dmo_realq7_start - get_runtime_offset();
+   /*
+* Copy the devicetree blob to sdram so that the barebox code 
finds it
+* inside valid SDRAM instead of SRAM.
+*/
+   memcpy((void *)sdram, (void *)fdt,
+   __dtb_imx6q_dmo_realq7_end -
+   __dtb_imx6q_dmo_realq7_start);
+   fdt = sdram;
+   }
 
-   barebox_arm_entry(0x1000, SZ_2G, fdt);
+   barebox_arm_entry(sdram, SZ_2G, fdt);
 }
-- 
1.8.5.3


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

Re: [PATCH 1/2] ARM: i.MX: edmqmx6: Copy fdt to SDRAM

[Jan Lübbe]

On Thu, 2014-01-30 at 10:40 +0100, Sascha Hauer wrote:
 @@ -136,26 +137,37 @@ static void sdram_init(void)
 writel(0x047f, 0x021e80a4);
 writel(0xc34f, 0x021e80a8);
 writel(0x0001, 0x021e8080);
 +   putc_ll('');
  } 

Some leftover debugging. ;)
-- 
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- |


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

Re: [PATCH 1/2] ARM: i.MX: edmqmx6: Copy fdt to SDRAM

[Sascha Hauer]

On Thu, Jan 30, 2014 at 10:46:23AM +0100, Jan Lübbe wrote:
 On Thu, 2014-01-30 at 10:40 +0100, Sascha Hauer wrote:
  @@ -136,26 +137,37 @@ static void sdram_init(void)
  writel(0x047f, 0x021e80a4);
  writel(0xc34f, 0x021e80a8);
  writel(0x0001, 0x021e8080);
  +   putc_ll('');
   } 
 
 Some leftover debugging. ;)

Psst, this was intentional ;)

Of course this should have been a separate patch, but giving a sign of
life early when debugging is enabled is a good thing generally.

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- |

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