x86: Build vga video code only if CONFIG_VIDEO_VGA is defined

[u-boot] / arch / x86 / lib / init_helpers.c

diff --git a/arch/x86/lib/init_helpers.c b/arch/x86/lib/init_helpers.c
index 547b1805922e1420f20242b27b3b741d8fbae13a..3eec9a61d66a680b81ed6c310f938c6dae880623 100644 (file)
--- a/arch/x86/lib/init_helpers.c
+++ b/arch/x86/lib/init_helpers.c
@@ -28,8 +28,11 @@
 #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>
+#include <linux/compiler.h>
 
 #include <asm/init_helpers.h>
 
@@ -70,6 +73,46 @@ int init_baudrate_f(void)
        return 0;
 }
 
+__weak 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
+        */
+
+       /* Stack is at top of available memory */
+       dest_addr = gd->ram_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);
+
+       /* Stack is at the bottom, so it can grow down */
+       gd->start_addr_sp = dest_addr - CONFIG_SYS_MALLOC_LEN;
+
+       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,
@@ -104,14 +147,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)
 {
@@ -121,22 +156,47 @@ int status_led_set_r(void)
 }
 #endif
 
-int set_bootfile_r(void)
+int set_load_addr_r(void)
 {
-       char *s;
+       /* Initialize from environment */
+       load_addr = getenv_ulong("loadaddr", 16, load_addr);
 
-       s = getenv("bootfile");
+       return 0;
+}
 
-       if (s != NULL)
-               copy_filename(BootFile, s, sizeof(BootFile));
+int init_func_spi(void)
+{
+       puts("SPI:   ");
+       spi_init();
+       puts("ready\n");
+       return 0;
+}
+
+#ifdef CONFIG_OF_CONTROL
+int find_fdt(void)
+{
+#ifdef CONFIG_OF_EMBED
+       /* Get a pointer to the FDT */
+       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);
+#endif
+       /* Allow the early environment to override the fdt address */
+       gd->fdt_blob = (void *)getenv_ulong("fdtcontroladdr", 16,
+                                               (uintptr_t)gd->fdt_blob);
 
        return 0;
 }
 
-int set_load_addr_r(void)
+int prepare_fdt(void)
 {
-       /* Initialize from environment */
-       load_addr = getenv_ulong("loadaddr", 16, load_addr);
+       /* For now, put this check after the console is ready */
+       if (fdtdec_prepare_fdt()) {
+               panic("** CONFIG_OF_CONTROL defined but no FDT - please see "
+                       "doc/README.fdt-control");
+       }
 
        return 0;
 }
+#endif