From 7525c2dac76bd739b8a1673e020031dc4a4934c4 Mon Sep 17 00:00:00 2001
From: Simon Glass <sjg@chromium.org>
Date: Mon, 15 Apr 2013 11:25:20 +0000
Subject: [PATCH] x86: Allow setup code to manage its own global data
Currently x86 has its own means of managing the global data and board data
(bd_t), and this code resides in start.S. With generic board, we need to
ensure that we leave this alone - i.e. don't clear it as we do on other
archs.
This fixes a problem where the memory init data is cleared which causes
the video driver to operate very slowly.
Signed-off-by: Simon Glass <sjg@chromium.org>
---
common/board_f.c | 2 +-
common/board_r.c | 3 ---
2 files changed, 1 insertion(+), 4 deletions(-)
diff --git a/common/board_f.c b/common/board_f.c
index 32d5215097..00ca81126c 100644
--- a/common/board_f.c
+++ b/common/board_f.c
@@ -755,7 +755,7 @@ static int mark_bootstage(void)
static init_fnc_t init_sequence_f[] = {
#if !defined(CONFIG_CPM2) && !defined(CONFIG_MPC512X) && \
!defined(CONFIG_MPC83xx) && !defined(CONFIG_MPC85xx) && \
- !defined(CONFIG_MPC86xx)
+ !defined(CONFIG_MPC86xx) && !defined(CONFIG_X86)
zero_global_data,
#endif
setup_fdt,
diff --git a/common/board_r.c b/common/board_r.c
index 9605f80a0c..2b17fa6cfe 100644
--- a/common/board_r.c
+++ b/common/board_r.c
@@ -721,9 +721,6 @@ init_fnc_t init_sequence_r[] = {
*/
#ifdef CONFIG_CLOCKS
set_cpu_clk_info, /* Setup clock information */
-#endif
-#ifdef CONFIG_X86
- init_bd_struct_r,
#endif
initr_reloc_global_data,
initr_serial,
--
2.39.5