From: Sascha Hauer <s.hauer@pengutronix.de>
To: barebox@lists.infradead.org
Subject: [PATCH 02/10] nios: initialize malloc pool before start_barebox()
Date: Sat, 9 Mar 2013 11:53:03 +0100 [thread overview]
Message-ID: <1362826391-16215-3-git-send-email-s.hauer@pengutronix.de> (raw)
In-Reply-To: <1362826391-16215-1-git-send-email-s.hauer@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
arch/nios2/cpu/start.S | 4 ++--
arch/nios2/lib/board.c | 8 ++------
2 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/arch/nios2/cpu/start.S b/arch/nios2/cpu/start.S
index 42520d7..41f65ff 100644
--- a/arch/nios2/cpu/start.S
+++ b/arch/nios2/cpu/start.S
@@ -150,8 +150,8 @@ _reloc:
/*
* Call board_init -- never returns
*/
- movhi r4, %hi(start_barebox@h)
- ori r4, r4, %lo(start_barebox@h)
+ movhi r4, %hi(nios_start_barebox@h)
+ ori r4, r4, %lo(nios_start_barebox@h)
callr r4
/* NEVER RETURNS -- but branch to the _start just
diff --git a/arch/nios2/lib/board.c b/arch/nios2/lib/board.c
index 624a4f8..7c4dc76 100644
--- a/arch/nios2/lib/board.c
+++ b/arch/nios2/lib/board.c
@@ -18,23 +18,19 @@
#include <common.h>
#include <malloc.h>
-#include <init.h>
#include <memory.h>
#include <asm-generic/memory_layout.h>
#include <cache.h>
-int altera_mem_malloc_init(void)
+void __noreturn nios_start_barebox(void)
{
mem_malloc_init((void *)(NIOS_SOPC_TEXT_BASE - MALLOC_SIZE),
(void *)(NIOS_SOPC_TEXT_BASE - 1));
- return 0;
+ start_barebox();
}
-core_initcall(altera_mem_malloc_init);
-
void arch_shutdown(void)
{
}
-
--
1.8.2.rc2
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
next prev parent reply other threads:[~2013-03-09 10:53 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-03-09 10:53 [PATCH] image and bss size decrease Sascha Hauer
2013-03-09 10:53 ` [PATCH 01/10] mips: initialize malloc pool before start_barebox() Sascha Hauer
2013-03-09 10:53 ` Sascha Hauer [this message]
2013-03-09 10:53 ` [PATCH 03/10] openrisc: " Sascha Hauer
2013-03-09 10:53 ` [PATCH 04/10] blackfin: " Sascha Hauer
2013-03-09 10:53 ` [PATCH 05/10] x86: " Sascha Hauer
2013-03-09 10:53 ` [PATCH 06/10] bus: Make struct device a pointer Sascha Hauer
2013-03-09 10:53 ` [PATCH 07/10] command: remove list_head from struct command Sascha Hauer
2013-03-09 10:53 ` [PATCH 08/10] command: remove statically initialized aliases Sascha Hauer
2013-03-09 10:53 ` [PATCH 09/10] fs: allocate FILE table dynamically Sascha Hauer
2013-03-09 10:53 ` [PATCH 10/10] gpio: allocate gpio_desc " Sascha Hauer
2013-03-09 18:38 ` [PATCH] image and bss size decrease Jean-Christophe PLAGNIOL-VILLARD
2013-03-10 10:02 ` Sascha Hauer
2013-03-11 9:08 ` Juergen Beisert
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=1362826391-16215-3-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