Merge git://git.denx.de/u-boot-i2c

[u-boot] / common / bootm.c

diff --git a/common/bootm.c b/common/bootm.c
index 32b3ea8e2d093a203ae67f73ee03a207ba39f212..adb12137c7b5ce6bbb69b39c64a7c022f7d7b3b0 100644 (file)
--- a/common/bootm.c
+++ b/common/bootm.c
@@ -248,7 +248,7 @@ int bootm_find_images(int flag, int argc, char * const argv[])
 #endif
 
 #if IMAGE_ENABLE_FIT
-#if defined(CONFIG_FPGA) && defined(CONFIG_FPGA_XILINX)
+#if defined(CONFIG_FPGA)
        /* find bitstreams */
        ret = boot_get_fpga(argc, argv, &images, IH_ARCH_DEFAULT,
                            NULL, NULL);
@@ -810,9 +810,6 @@ static const void *boot_get_kernel(cmd_tbl_t *cmdtp, int flag, int argc,
 
        bootstage_mark(BOOTSTAGE_ID_CHECK_MAGIC);
 
-       /* copy from dataflash if needed */
-       img_addr = genimg_get_image(img_addr);
-
        /* check image type, for FIT images get FIT kernel node */
        *os_data = *os_len = 0;
        buf = map_sysmem(img_addr, 0);