ColdFire 54455: Fix correct boot location for atmel and intel

[u-boot] / common / cmd_fpga.c

diff --git a/common/cmd_fpga.c b/common/cmd_fpga.c
index df859bd98786bf2cd1f0403b81d57f794cd433ac..cce23ad70d78ce4e316583d71f40d23c41bbc8dd 100644 (file)
--- a/common/cmd_fpga.c
+++ b/common/cmd_fpga.c
@@ -27,7 +27,7 @@
  */
 #include <common.h>
 #include <command.h>
-#if (CONFIG_COMMANDS & CFG_CMD_NET)
+#if defined(CONFIG_CMD_NET)
 #include <net.h>
 #endif
 #include <fpga.h>
@@ -43,7 +43,7 @@
 #define PRINTF(fmt,args...)
 #endif
 
-#if defined (CONFIG_FPGA) && ( CONFIG_COMMANDS & CFG_CMD_FPGA )
+#if defined (CONFIG_FPGA) && defined(CONFIG_CMD_FPGA)
 
 /* Local functions */
 static void fpga_usage (cmd_tbl_t * cmdtp);
@@ -60,6 +60,7 @@ static int fpga_get_op (char *opstr);
 /* Convert bitstream data and load into the fpga */
 int fpga_loadbitstream(unsigned long dev, char* fpgadata, size_t size)
 {
+#if (CONFIG_FPGA & CFG_FPGA_XILINX)
        unsigned int length;
        unsigned char* swapdata;
        unsigned int swapsize;
@@ -72,7 +73,6 @@ int fpga_loadbitstream(unsigned long dev, char* fpgadata, size_t size)
 
        dataptr = (unsigned char *)fpgadata;
 
-#if CFG_FPGA_XILINX
        /* skip the first bytes of the bitsteam, their meaning is unknown */
        length = (*dataptr << 8) + *(dataptr+1);
        dataptr+=2;
@@ -263,9 +263,9 @@ int do_fpga (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
                                puts ("Bad Magic Number\n");
                                return 1;
                        }
-                       data = (char *)(fpga_data + sizeof(image_header_t));
+                       data = ((ulong)fpga_data + sizeof(image_header_t));
                        data_size  = ntohl(hdr->ih_size);
-                       rc = fpga_load (dev, data, data_size);
+                       rc = fpga_load (dev, (void *)data, data_size);
                }
                break;
 
@@ -321,4 +321,4 @@ U_BOOT_CMD (fpga, 6, 1, do_fpga,
            "\tloadb\tLoad device from bitstream buffer (Xilinx devices only)\n"
            "\tloadmk\tLoad device generated with mkimage\n"
            "\tdump\tLoad device to memory buffer\n");
-#endif /* CONFIG_FPGA && CONFIG_COMMANDS & CFG_CMD_FPGA */
+#endif