Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'

[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 1a097f101c159c4bafd1170cb9736f7e33074428..a57a0eb4682545b3b86dde61e297cc40c1ba82da 100644 (file)
--- a/arch/x86/lib/init_helpers.c
+++ b/arch/x86/lib/init_helpers.c
@@ -21,58 +21,12 @@
  * MA 02111-1307 USA
  */
 #include <common.h>
-#include <command.h>
-#include <stdio_dev.h>
-#include <version.h>
-#include <malloc.h>
-#include <net.h>
-#include <ide.h>
-#include <serial.h>
+#include <fdtdec.h>
 #include <spi.h>
-#include <status_led.h>
-#include <asm/processor.h>
-#include <asm/u-boot-x86.h>
-#include <linux/compiler.h>
-
-#include <asm/init_helpers.h>
+#include <asm/sections.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
-/************************************************************************
- * Init Utilities                                                      *
- ************************************************************************
- * Some of this code should be moved into the core functions,
- * or dropped completely,
- * but let's get it working (again) first...
- */
-
-int display_banner(void)
-{
-       printf("\n\n%s\n\n", version_string);
-
-       return 0;
-}
-
-int display_dram_config(void)
-{
-       int i;
-
-       puts("DRAM Configuration:\n");
-
-       for (i = 0; i < CONFIG_NR_DRAM_BANKS; i++) {
-               printf("Bank #%d: %08lx ", i, gd->bd->bi_dram[i].start);
-               print_size(gd->bd->bi_dram[i].size, "\n");
-       }
-
-       return 0;
-}
-
-int init_baudrate_f(void)
-{
-       gd->baudrate = getenv_ulong("baudrate", 10, CONFIG_BAUDRATE);
-       return 0;
-}
-
 /* Get the top of usable RAM */
 __weak ulong board_get_usable_ram_top(ulong total_size)
 {
@@ -85,17 +39,35 @@ int calculate_relocation_address(void)
                        (uintptr_t)&__text_start;
        ulong total_size;
        ulong dest_addr;
+       ulong fdt_size = 0;
 
+#if defined(CONFIG_OF_SEPARATE) && defined(CONFIG_OF_CONTROL)
+       if (gd->fdt_blob)
+               fdt_size = ALIGN(fdt_totalsize(gd->fdt_blob) + 0x1000, 32);
+#endif
        total_size = ALIGN(uboot_size, 1 << 12) + CONFIG_SYS_MALLOC_LEN +
-               CONFIG_SYS_STACK_SIZE;
+               CONFIG_SYS_STACK_SIZE + fdt_size;
 
+       dest_addr = board_get_usable_ram_top(total_size);
        /*
         * NOTE: All destination address are rounded down to 16-byte
         *       boundary to satisfy various worst-case alignment
         *       requirements
         */
-       dest_addr = board_get_usable_ram_top(total_size);
+       dest_addr &= ~15;
 
+#if defined(CONFIG_OF_SEPARATE) && defined(CONFIG_OF_CONTROL)
+       /*
+        * If the device tree is sitting immediate above our image then we
+        * must relocate it. If it is embedded in the data section, then it
+        * will be relocated with other data.
+        */
+       if (gd->fdt_blob) {
+               dest_addr -= fdt_size;
+               gd->new_fdt = (void *)dest_addr;
+               dest_addr &= ~15;
+       }
+#endif
        /* U-Boot is below the FDT */
        dest_addr -= uboot_size;
        dest_addr &= ~((1 << 12) - 1);
@@ -114,21 +86,6 @@ int init_cache_f_r(void)
        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,
-                       CONFIG_SYS_MALLOC_LEN);
-
-       return 0;
-}
-
 bd_t bd_data;
 
 int init_bd_struct_r(void)
@@ -139,39 +96,6 @@ int init_bd_struct_r(void)
        return 0;
 }
 
-#ifndef CONFIG_SYS_NO_FLASH
-int flash_init_r(void)
-{
-       ulong size;
-
-       puts("Flash: ");
-
-       /* configure available FLASH banks */
-       size = flash_init();
-
-       print_size(size, "\n");
-
-       return 0;
-}
-#endif
-
-#ifdef CONFIG_STATUS_LED
-int status_led_set_r(void)
-{
-       status_led_set(STATUS_LED_BOOT, STATUS_LED_BLINKING);
-
-       return 0;
-}
-#endif
-
-int set_load_addr_r(void)
-{
-       /* Initialize from environment */
-       load_addr = getenv_ulong("loadaddr", 16, load_addr);
-
-       return 0;
-}
-
 int init_func_spi(void)
 {
        puts("SPI:   ");
@@ -180,7 +104,6 @@ int init_func_spi(void)
        return 0;
 }
 
-#ifdef CONFIG_OF_CONTROL
 int find_fdt(void)
 {
 #ifdef CONFIG_OF_EMBED
@@ -188,7 +111,7 @@ int find_fdt(void)
        gd->fdt_blob = _binary_dt_dtb_start;
 #elif defined CONFIG_OF_SEPARATE
        /* FDT is at end of image */
-       gd->fdt_blob = (void *)(_end_ofs + _TEXT_BASE);
+       gd->fdt_blob = (ulong *)&_end;
 #endif
        /* Allow the early environment to override the fdt address */
        gd->fdt_blob = (void *)getenv_ulong("fdtcontroladdr", 16,
@@ -207,4 +130,3 @@ int prepare_fdt(void)
 
        return 0;
 }
-#endif