board: ls1043ardb: fdt fixups for revision v7.0 boards

[platform/kernel/u-boot.git] / boot / image-board.c

diff --git a/boot/image-board.c b/boot/image-board.c
index 0d2e0fc..4e4d1c1 100644 (file)
--- a/boot/image-board.c
+++ b/boot/image-board.c
@@ -11,6 +11,7 @@
 #include <common.h>
 #include <bootstage.h>
 #include <cpu_func.h>
+#include <display_options.h>
 #include <env.h>
 #include <fpga.h>
 #include <image.h>
@@ -21,10 +22,6 @@
 #include <asm/cache.h>
 #include <asm/global_data.h>
 
-#ifndef CONFIG_SYS_BARGSIZE
-#define CONFIG_SYS_BARGSIZE 512
-#endif
-
 DECLARE_GLOBAL_DATA_PTR;
 
 #if CONFIG_IS_ENABLED(LEGACY_IMAGE_FORMAT)
@@ -541,6 +538,7 @@ int boot_get_ramdisk(int argc, char *const argv[], bootm_headers_t *images,
        return 0;
 }
 
+#if defined(CONFIG_LMB)
 /**
  * boot_ramdisk_high - relocate init ramdisk
  * @lmb: pointer to lmb handle, will be used for memory mgmt
@@ -634,6 +632,7 @@ int boot_ramdisk_high(struct lmb *lmb, ulong rd_data, ulong rd_len,
 error:
        return -1;
 }
+#endif
 
 int boot_get_setup(bootm_headers_t *images, u8 arch,
                   ulong *setup_start, ulong *setup_len)
@@ -707,14 +706,14 @@ int boot_get_fpga(int argc, char *const argv[], bootm_headers_t *images,
                                                 img_len, BIT_FULL);
                        if (err)
                                err = fpga_load(devnum, (const void *)img_data,
-                                               img_len, BIT_FULL);
+                                               img_len, BIT_FULL, 0);
                } else {
                        name = "partial";
                        err = fpga_loadbitstream(devnum, (char *)img_data,
                                                 img_len, BIT_PARTIAL);
                        if (err)
                                err = fpga_load(devnum, (const void *)img_data,
-                                               img_len, BIT_PARTIAL);
+                                               img_len, BIT_PARTIAL, 0);
                }
 
                if (err)
@@ -827,6 +826,8 @@ int boot_get_loadable(int argc, char *const argv[], bootm_headers_t *images,
        return 0;
 }
 
+#if defined(CONFIG_LMB)
+#ifdef CONFIG_SYS_BOOT_GET_CMDLINE
 /**
  * boot_get_cmdline - allocate and initialize kernel cmdline
  * @lmb: pointer to lmb handle, will be used for memory mgmt
@@ -900,6 +901,7 @@ int boot_get_kbd(struct lmb *lmb, struct bd_info **kbd)
 
        return 0;
 }
+#endif
 
 int image_setup_linux(bootm_headers_t *images)
 {
@@ -934,6 +936,7 @@ int image_setup_linux(bootm_headers_t *images)
 
        return 0;
 }
+#endif
 
 void genimg_print_size(uint32_t size)
 {