summaryrefslogtreecommitdiffstats
path: root/common/init
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2015-10-19 06:49:56 -0600
committerTom Rini <trini@konsulko.com>2015-10-24 13:50:34 -0400
commitaf6bbd4daefc314cc422381580f11fabc9cb222f (patch)
treea26d2176c9b16f9654107af728b89d0404bcc513 /common/init
parent47b71644500f7dff768254570ff62c6e985e4bc3 (diff)
downloadblackbird-obmc-uboot-af6bbd4daefc314cc422381580f11fabc9cb222f.tar.gz
blackbird-obmc-uboot-af6bbd4daefc314cc422381580f11fabc9cb222f.zip
Move board_init_f_mem() into a common location
This function will be used by both SPL and U-Boot proper. So move it into a common place. Also change the #ifdef so that the early malloc() area is not set up in SPL if CONFIG_SYS_SPL_MALLOC_START is defined. In that case it would never actually be used, and just chews up stack space. Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'common/init')
-rw-r--r--common/init/Makefile7
-rw-r--r--common/init/board_init.c41
2 files changed, 48 insertions, 0 deletions
diff --git a/common/init/Makefile b/common/init/Makefile
new file mode 100644
index 0000000000..4902635f53
--- /dev/null
+++ b/common/init/Makefile
@@ -0,0 +1,7 @@
+#
+# Copyright (c) 2015 Google, Inc
+#
+# SPDX-License-Identifier: GPL-2.0+
+#
+
+obj-y += board_init.o
diff --git a/common/init/board_init.c b/common/init/board_init.c
new file mode 100644
index 0000000000..e7ebca70c4
--- /dev/null
+++ b/common/init/board_init.c
@@ -0,0 +1,41 @@
+/*
+ * Code shared between SPL and U-Boot proper
+ *
+ * Copyright (c) 2015 Google, Inc
+ * Written by Simon Glass <sjg@chromium.org>
+ *
+ * SPDX-License-Identifier: GPL-2.0+
+ */
+
+#include <common.h>
+
+DECLARE_GLOBAL_DATA_PTR;
+
+/* Unfortunately x86 can't compile this code as gd cannot be assigned */
+#ifndef CONFIG_X86
+__weak void arch_setup_gd(struct global_data *gd_ptr)
+{
+ gd = gd_ptr;
+}
+#endif /* !CONFIG_X86 */
+
+ulong board_init_f_mem(ulong top)
+{
+ struct global_data *gd_ptr;
+
+ /* Leave space for the stack we are running with now */
+ top -= 0x40;
+
+ top -= sizeof(struct global_data);
+ top = ALIGN(top, 16);
+ gd_ptr = (struct global_data *)top;
+ memset(gd_ptr, '\0', sizeof(*gd));
+ arch_setup_gd(gd_ptr);
+
+#if defined(CONFIG_SYS_MALLOC_F)
+ top -= CONFIG_SYS_MALLOC_F_LEN;
+ gd->malloc_base = top;
+#endif
+
+ return top;
+}
OpenPOWER on IntegriCloud