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
diff --git a/arch/x86/lib/init_helpers.c b/arch/x86/lib/init_helpers.c
index 547b180..9f4dee0 100644
--- a/arch/x86/lib/init_helpers.c
+++ b/arch/x86/lib/init_helpers.c
@@ -29,6 +29,7 @@
#include <ide.h>
#include <serial.h>
#include <status_led.h>
+#include <asm/processor.h>
#include <asm/u-boot-x86.h>
#include <asm/init_helpers.h>
@@ -70,6 +71,80 @@
return 0;
}
+int calculate_relocation_address(void)
+{
+ ulong text_start = (ulong)&__text_start;
+ ulong bss_end = (ulong)&__bss_end;
+ ulong dest_addr;
+
+ /*
+ * NOTE: All destination address are rounded down to 16-byte
+ * boundary to satisfy various worst-case alignment
+ * requirements
+ */
+
+ /* Global Data is at top of available memory */
+ dest_addr = gd->ram_size;
+ dest_addr -= GENERATED_GBL_DATA_SIZE;
+ dest_addr &= ~15;
+ gd->new_gd_addr = dest_addr;
+
+ /* GDT is below Global Data */
+ dest_addr -= X86_GDT_SIZE;
+ dest_addr &= ~15;
+ gd->gdt_addr = dest_addr;
+
+ /* Stack is below GDT */
+ gd->start_addr_sp = dest_addr;
+
+ /* U-Boot is below the stack */
+ dest_addr -= CONFIG_SYS_STACK_SIZE;
+ dest_addr -= (bss_end - text_start);
+ dest_addr &= ~15;
+ gd->relocaddr = dest_addr;
+ gd->reloc_off = (dest_addr - text_start);
+
+ return 0;
+}
+
+int copy_gd_to_ram_f_r(void)
+{
+ gd_t *ram_gd;
+
+ /*
+ * Global data is still in temporary memory (the CPU cache).
+ * calculate_relocation_address() has set gd->new_gd_addr to
+ * where the global data lives in RAM but getting it there
+ * safely is a bit tricky due to the 'F-Segment Hack' that
+ * we need to use for x86
+ */
+ ram_gd = (gd_t *)gd->new_gd_addr;
+ memcpy((void *)ram_gd, gd, sizeof(gd_t));
+
+ /*
+ * Reload the Global Descriptor Table so FS points to the
+ * in-RAM copy of Global Data (calculate_relocation_address()
+ * has already calculated the in-RAM location of the GDT)
+ */
+ ram_gd->gd_addr = (ulong)ram_gd;
+ init_gd(ram_gd, (u64 *)gd->gdt_addr);
+
+ return 0;
+}
+
+int init_cache_f_r(void)
+{
+ /* Initialise the CPU cache(s) */
+ return init_cache();
+}
+
+int set_reloc_flag_r(void)
+{
+ gd->flags = GD_FLG_RELOC;
+
+ return 0;
+}
+
int mem_malloc_init_r(void)
{
mem_malloc_init(((gd->relocaddr - CONFIG_SYS_MALLOC_LEN)+3)&~3,