mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Sascha Hauer <s.hauer@pengutronix.de>
To: Barebox List <barebox@lists.infradead.org>
Subject: [PATCH 4/4] ARM: start: drop unnecessary variable
Date: Thu, 16 Jun 2016 15:18:22 +0200	[thread overview]
Message-ID: <1466083102-6241-4-git-send-email-s.hauer@pengutronix.de> (raw)
In-Reply-To: <1466083102-6241-1-git-send-email-s.hauer@pengutronix.de>

No need anymore to store arm_head_bottom globally as it's only used
in barebox_non_pbl_start(). Also rename the variable to malloc_end
which is more meaningful.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 arch/arm/cpu/start.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/arch/arm/cpu/start.c b/arch/arm/cpu/start.c
index 38f69d5..f25e592 100644
--- a/arch/arm/cpu/start.c
+++ b/arch/arm/cpu/start.c
@@ -34,7 +34,6 @@
 #include "mmu-early.h"
 
 unsigned long arm_stack_top;
-static unsigned long arm_head_bottom;
 static unsigned long arm_barebox_size;
 static void *barebox_boarddata;
 static unsigned long barebox_boarddata_size;
@@ -162,7 +161,7 @@ __noreturn void barebox_non_pbl_start(unsigned long membase,
 
 	arm_stack_top = endmem;
 	arm_barebox_size = barebox_size;
-	arm_head_bottom = arm_mem_barebox_image(membase, endmem,
+	malloc_end = arm_mem_barebox_image(membase, endmem,
 						arm_barebox_size);
 
 	if (IS_ENABLED(CONFIG_MMU_EARLY)) {
@@ -201,12 +200,10 @@ __noreturn void barebox_non_pbl_start(unsigned long membase,
 			barebox_boarddata = memcpy((void *)mem, boarddata,
 						   totalsize);
 			barebox_boarddata_size = totalsize;
-			arm_head_bottom = mem;
+			malloc_end = mem;
 		}
 	}
 
-	malloc_end = arm_head_bottom;
-
 	/*
 	 * Maximum malloc space is the Kconfig value if given
 	 * or 1GB.
-- 
2.8.1


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

      parent reply	other threads:[~2016-06-16 13:19 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-06-16 13:18 [PATCH 1/4] ARM: start: Fix arm_mem_barebox_image for !CONFIG_RELOCATABLE Sascha Hauer
2016-06-16 13:18 ` [PATCH 2/4] ARM: start: do not change barebox_boarddata Sascha Hauer
2016-06-16 13:18 ` [PATCH 3/4] ARM: start: simplify board_data sdram allocation Sascha Hauer
2016-06-16 13:18 ` Sascha Hauer [this message]

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=1466083102-6241-4-git-send-email-s.hauer@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