summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarek Vasut <marex@denx.de>2015-08-29 10:16:20 +0200
committerMarek Vasut <marex@denx.de>2015-09-04 11:54:20 +0200
commita665b051b5a191c2b5c1c8ed238ccf7d29b7109b (patch)
tree6f87ae6dff719c72e46e4f54e2d2d02ab0ea330b
parent0c745d005ac309aeb528f68c2f8516026591ed6d (diff)
downloadblackbird-obmc-uboot-a665b051b5a191c2b5c1c8ed238ccf7d29b7109b.tar.gz
blackbird-obmc-uboot-a665b051b5a191c2b5c1c8ed238ccf7d29b7109b.zip
arm: socfpga: Do not call board_init_r() from board_init_f()
Instead of calling board_init_r() directly from board_init_f(), just return from board_init_f(). This will make the code continue executing in crt0.S _main(), from which the board_init_r() is called. This patch aligns the SoCFPGA SPL with the correct SPL design as well as reduces the stack utilisation slightly. Signed-off-by: Marek Vasut <marex@denx.de> Cc: Dinh Nguyen <dinguyen@opensource.altera.com>
-rw-r--r--arch/arm/mach-socfpga/spl.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/mach-socfpga/spl.c b/arch/arm/mach-socfpga/spl.c
index 13ec24bc16..775a82780f 100644
--- a/arch/arm/mach-socfpga/spl.c
+++ b/arch/arm/mach-socfpga/spl.c
@@ -180,6 +180,4 @@ void board_init_f(ulong dummy)
/* Configure simple malloc base pointer into RAM. */
gd->malloc_base = CONFIG_SYS_TEXT_BASE + (1024 * 1024);
-
- board_init_r(NULL, 0);
}
OpenPOWER on IntegriCloud