From: Andreas Bießmann <andreas.devel@googlemail.com>
Date: Fri, 6 Feb 2015 22:06:47 +0000 (+0100)
Subject: common/board_r: allocate bootparams
X-Git-Tag: v2015.04-rc3~58^2~3
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=c722f0b026249385bbbcec4f5be9bd3abd69342c;p=u-boot

common/board_r: allocate bootparams

Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
---

diff --git a/common/board_r.c b/common/board_r.c
index 907b33cca7..f0b4f9d935 100644
--- a/common/board_r.c
+++ b/common/board_r.c
@@ -459,6 +459,18 @@ static int initr_env(void)
 	return 0;
 }
 
+#ifdef CONFIG_SYS_BOOTPARAMS_LEN
+static int initr_malloc_bootparams(void)
+{
+	gd->bd->bi_boot_params = (ulong)malloc(CONFIG_SYS_BOOTPARAMS_LEN);
+	if (!gd->bd->bi_boot_params) {
+		puts("WARNING: Cannot allocate space for boot parameters\n");
+		return -ENOMEM;
+	}
+	return 0;
+}
+#endif
+
 #ifdef CONFIG_SC3
 /* TODO: with new initcalls, move this into the driver */
 extern void sc3_read_eeprom(void);
@@ -775,6 +787,9 @@ init_fnc_t init_sequence_r[] = {
 	initr_dataflash,
 #endif
 	initr_env,
+#ifdef CONFIG_SYS_BOOTPARAMS_LEN
+	initr_malloc_bootparams,
+#endif
 	INIT_FUNC_WATCHDOG_RESET
 	initr_secondary_cpu,
 #ifdef CONFIG_SC3