x86: Reorder x86's post relocation memory layout

[karo-tx-uboot.git] / arch / x86 / lib / init_helpers.c

diff --git a/arch/x86/lib/init_helpers.c b/arch/x86/lib/init_helpers.c
index 9f4dee034f9155b15ade89ebc74b46e34928b8c4..9fd87dfd2e0ecac9807417affce5879298faed6c 100644 (file)
--- a/arch/x86/lib/init_helpers.c
+++ b/arch/x86/lib/init_helpers.c
@@ -28,6 +28,7 @@
 #include <net.h>
 #include <ide.h>
 #include <serial.h>
+#include <spi.h>
 #include <status_led.h>
 #include <asm/processor.h>
 #include <asm/u-boot-x86.h>
@@ -83,51 +84,17 @@ int calculate_relocation_address(void)
         *       requirements
         */
 
-       /* Global Data is at top of available memory */
+       /* Stack 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;
+       /* U-Boot is at the top */
        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);
+       /* Stack is at the bottom, so it can grow down */
+       gd->start_addr_sp = dest_addr - CONFIG_SYS_MALLOC_LEN;
 
        return 0;
 }
@@ -179,14 +146,6 @@ int flash_init_r(void)
 }
 #endif
 
-int init_ip_address_r(void)
-{
-       /* IP Address */
-       bd_data.bi_ip_addr = getenv_IPaddr("ipaddr");
-
-       return 0;
-}
-
 #ifdef CONFIG_STATUS_LED
 int status_led_set_r(void)
 {
@@ -196,22 +155,18 @@ int status_led_set_r(void)
 }
 #endif
 
-int set_bootfile_r(void)
+int set_load_addr_r(void)
 {
-       char *s;
-
-       s = getenv("bootfile");
-
-       if (s != NULL)
-               copy_filename(BootFile, s, sizeof(BootFile));
+       /* Initialize from environment */
+       load_addr = getenv_ulong("loadaddr", 16, load_addr);
 
        return 0;
 }
 
-int set_load_addr_r(void)
+int init_func_spi(void)
 {
-       /* Initialize from environment */
-       load_addr = getenv_ulong("loadaddr", 16, load_addr);
-
+       puts("SPI:   ");
+       spi_init();
+       puts("ready\n");
        return 0;
 }