[U-Boot] [PATCH] common/board_f: move board_init_f_mem() from #else CONFIG_X86

* [U-Boot] [PATCH] common/board_f: move board_init_f_mem() from #else CONFIG_X86
@ 2015-03-24  8:12 Alexey Brodkin
  2015-03-27  7:07 ` Alexey Brodkin
  2015-03-28 18:10 ` [U-Boot] " Tom Rini
  0 siblings, 2 replies; 4+ messages in thread
From: Alexey Brodkin @ 2015-03-24  8:12 UTC (permalink / raw)
  To: u-boot

Purpose of this change is to make it possible to re-use code currently
used on X86 solely for other architectures. For example:
 * init_sequence_f_r
 * board_init_f_r

Even though board_init_f_mem() has nothing to do with any particular
architecture it won't work (at least in current implementation) for X86.

This is because on X86 "gd" is an alias to function get_fs_gd_ptr(),
thus we cannot assign anything to it.

So this change separates selection of board_init_f_mem() from X86 while
keeping it disabled for X86 still.

Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com>
Cc: Simon Glass <sjg@chromium.org>
Cc: Tom Rini <trini@konsulko.com>
---
 common/board_f.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/common/board_f.c b/common/board_f.c
index 55ede07..e537cd1 100644
--- a/common/board_f.c
+++ b/common/board_f.c
@@ -1080,7 +1080,9 @@ void board_init_f_r(void)
 	/* NOTREACHED - board_init_r() does not return */
 	hang();
 }
-#else
+#endif /* CONFIG_X86 */
+
+#ifndef CONFIG_X86
 ulong board_init_f_mem(ulong top)
 {
 	/* Leave space for the stack we are running with now */
@@ -1098,4 +1100,4 @@ ulong board_init_f_mem(ulong top)
 
 	return top;
 }
-#endif /* CONFIG_X86 */
+#endif /* !CONFIG_X86 */
-- 
2.1.0

^ permalink raw reply related	[flat|nested] 4+ messages in thread