mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Lucas Stach <l.stach@pengutronix.de>
To: barebox@lists.infradead.org
Subject: [PATCH 2/4] ARM: beaglebone: remove extra FDT memcpy
Date: Thu,  1 May 2014 23:32:50 +0200	[thread overview]
Message-ID: <1398979972-14446-3-git-send-email-l.stach@pengutronix.de> (raw)
In-Reply-To: <1398979972-14446-1-git-send-email-l.stach@pengutronix.de>

Not needed anymore, as barebox now accepts FDTs outside
of it's visible DRAM, as long as it's a valid pointer.

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
---
 arch/arm/boards/beaglebone/lowlevel.c | 19 +++----------------
 1 file changed, 3 insertions(+), 16 deletions(-)

diff --git a/arch/arm/boards/beaglebone/lowlevel.c b/arch/arm/boards/beaglebone/lowlevel.c
index 0869cb9f1555..66fd3715c5e5 100644
--- a/arch/arm/boards/beaglebone/lowlevel.c
+++ b/arch/arm/boards/beaglebone/lowlevel.c
@@ -104,9 +104,7 @@ static const struct am33xx_emif_regs ddr3_regs = {
 };
 
 extern char __dtb_am335x_boneblack_start[];
-extern char __dtb_am335x_boneblack_end[];
 extern char __dtb_am335x_bone_start[];
-extern char __dtb_am335x_bone_end[];
 
 /**
  * @brief The basic entry point for board initialization.
@@ -119,19 +117,15 @@ extern char __dtb_am335x_bone_end[];
  */
 static noinline int beaglebone_sram_init(void)
 {
-	uint32_t sdram_start, sdram_size;
-	void *fdt, *fdt_end;
-
-	sdram_start = 0x80000000;
+	uint32_t sdram_size;
+	void *fdt;
 
 	if (is_beaglebone_black()) {
 		sdram_size = SZ_512M;
 		fdt = __dtb_am335x_boneblack_start;
-		fdt_end = __dtb_am335x_boneblack_end;
 	} else {
 		sdram_size = SZ_256M;
 		fdt = __dtb_am335x_bone_start;
-		fdt_end = __dtb_am335x_bone_end;
 	}
 
 	/* WDT1 is already running when the bootloader gets control
@@ -158,14 +152,7 @@ static noinline int beaglebone_sram_init(void)
 	omap_uart_lowlevel_init((void *)AM33XX_UART0_BASE);
 	putc_ll('>');
 
-	/*
-	 * Copy the devicetree blob to sdram so that the barebox code finds it
-	 * inside valid SDRAM instead of SRAM.
-	 */
-	memcpy((void *)sdram_start, fdt, fdt_end - fdt);
-	fdt = sdram_start;
-
-	barebox_arm_entry(sdram_start, sdram_size, fdt);
+	barebox_arm_entry(0x80000000, sdram_size, fdt);
 }
 
 ENTRY_FUNCTION(start_am33xx_beaglebone_sram, bootinfo, r1, r2)
-- 
1.9.1


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

  parent reply	other threads:[~2014-05-01 21:33 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-05-01 21:32 [PATCH 0/4] barebox_arm_entry signature change Lucas Stach
2014-05-01 21:32 ` [PATCH 1/4] ARM: change signature of barebox_arm_entry Lucas Stach
2014-05-01 21:32 ` Lucas Stach [this message]
2014-05-01 21:32 ` [PATCH 3/4] ARM: eDM-QMX6: remove extra FDT memcpy Lucas Stach
2014-05-01 21:32 ` [PATCH 4/4] ARM: phycore-am33xx: " Lucas Stach

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=1398979972-14446-3-git-send-email-l.stach@pengutronix.de \
    --to=l.stach@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