summaryrefslogtreecommitdiff
path: root/arch/x86/include
diff options
context:
space:
mode:
authorGraeme Russ <graeme.russ@gmail.com>2011-12-23 21:14:22 +1100
committerGraeme Russ <graeme.russ@gmail.com>2012-01-04 22:53:14 +1100
commita1d57b7aba85abc787675952b40c550bf3a595f8 (patch)
tree22c6d8302e518c516ca4655cbcf03f36d5c9a453 /arch/x86/include
parentd47ab0ecde1c9a66acbaf421ddd92c888d2ef344 (diff)
downloadu-boot-imx-a1d57b7aba85abc787675952b40c550bf3a595f8.zip
u-boot-imx-a1d57b7aba85abc787675952b40c550bf3a595f8.tar.gz
u-boot-imx-a1d57b7aba85abc787675952b40c550bf3a595f8.tar.bz2
x86: Convert board_init_f_r to a processing loop
Create an init function array for board_init_f_r - This finalises the migration to a purely array based initialisation mechanism Also tweak a few comments while we are at it so everything is 'correct' -- Changes for v2: - Renamed to a more apt name - Fix bug in set_reloc_flag_r - Re-instate gd->flags = boot_flags; in board_init_f - Added commit message
Diffstat (limited to 'arch/x86/include')
-rw-r--r--arch/x86/include/asm/init_helpers.h5
-rw-r--r--arch/x86/include/asm/relocate.h33
2 files changed, 38 insertions, 0 deletions
diff --git a/arch/x86/include/asm/init_helpers.h b/arch/x86/include/asm/init_helpers.h
index 14ef11a..192f18e 100644
--- a/arch/x86/include/asm/init_helpers.h
+++ b/arch/x86/include/asm/init_helpers.h
@@ -27,7 +27,12 @@
int display_banner(void);
int display_dram_config(void);
int init_baudrate_f(void);
+int calculate_relocation_address(void);
+int copy_gd_to_ram_f_r(void);
+int init_cache_f_r(void);
+
+int set_reloc_flag_r(void);
int mem_malloc_init_r(void);
int init_bd_struct_r(void);
int flash_init_r(void);
diff --git a/arch/x86/include/asm/relocate.h b/arch/x86/include/asm/relocate.h
new file mode 100644
index 0000000..33129ef
--- /dev/null
+++ b/arch/x86/include/asm/relocate.h
@@ -0,0 +1,33 @@
+/*
+ * (C) Copyright 2011
+ * Graeme Russ, <graeme.russ@gmail.com>
+ *
+ * See file CREDITS for list of people who contributed to this
+ * project.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ */
+
+#ifndef _RELOCATE_H_
+#define _RELOCATE_H_
+
+#include <common.h>
+
+int copy_uboot_to_ram(void);
+int clear_bss(void);
+int do_elf_reloc_fixups(void);
+
+#endif /* !_RELOCATE_H_ */