summaryrefslogtreecommitdiffstats
path: root/common
diff options
context:
space:
mode:
authorAndreas Bießmann <andreas.devel@googlemail.com>2015-02-06 23:06:47 +0100
committerAndreas Bießmann <andreas.devel@googlemail.com>2015-02-17 22:52:43 +0100
commitc722f0b026249385bbbcec4f5be9bd3abd69342c (patch)
tree25bccaa245fc42ee48e815ffbb98744ecbd428b5 /common
parent68145d4c7b3aa83d74c2dc904a39fab17cee1691 (diff)
downloadtalos-obmc-uboot-c722f0b026249385bbbcec4f5be9bd3abd69342c.tar.gz
talos-obmc-uboot-c722f0b026249385bbbcec4f5be9bd3abd69342c.zip
common/board_r: allocate bootparams
Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com> Reviewed-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'common')
-rw-r--r--common/board_r.c15
1 files changed, 15 insertions, 0 deletions
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
OpenPOWER on IntegriCloud