Merge commit 'u-boot/master' into for-1.3.1

[platform/kernel/u-boot.git] / common / cmd_fpga.c

diff --git a/common/cmd_fpga.c b/common/cmd_fpga.c
index 0c0643c..377a692 100644 (file)
--- a/common/cmd_fpga.c
+++ b/common/cmd_fpga.c
@@ -27,7 +27,7 @@
  */
 #include <common.h>
 #include <command.h>
  */
 #include <common.h>
 #include <command.h>

-#if (CONFIG_COMMANDS & CFG_CMD_NET)
+#if defined(CONFIG_CMD_NET)

 #include <net.h>
 #endif
 #include <fpga.h>
 #include <net.h>
 #endif
 #include <fpga.h>


@@ -43,8 +43,6 @@
 #define PRINTF(fmt,args...)
 #endif
 
 #define PRINTF(fmt,args...)
 #endif
 

-#if defined (CONFIG_FPGA) && ( CONFIG_COMMANDS & CFG_CMD_FPGA )
-

 /* Local functions */
 static void fpga_usage (cmd_tbl_t * cmdtp);
 static int fpga_get_op (char *opstr);
 /* Local functions */
 static void fpga_usage (cmd_tbl_t * cmdtp);
 static int fpga_get_op (char *opstr);


@@ -55,10 +53,12 @@ static int fpga_get_op (char *opstr);
 #define FPGA_LOAD   1
 #define FPGA_LOADB  2
 #define FPGA_DUMP   3
 #define FPGA_LOAD   1
 #define FPGA_LOADB  2
 #define FPGA_DUMP   3

+#define FPGA_LOADMK 4

 
 /* Convert bitstream data and load into the fpga */
 int fpga_loadbitstream(unsigned long dev, char* fpgadata, size_t size)
 {
 
 /* 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;
        unsigned int length;
        unsigned char* swapdata;
        unsigned int swapsize;


@@ -69,9 +69,8 @@ int fpga_loadbitstream(unsigned long dev, char* fpgadata, size_t size)
        unsigned int i;
        int rc;
 
        unsigned int i;
        int rc;
 

-       dataptr = fpgadata;
+       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;
        /* skip the first bytes of the bitsteam, their meaning is unknown */
        length = (*dataptr << 8) + *(dataptr+1);
        dataptr+=2;


@@ -137,9 +136,9 @@ int fpga_loadbitstream(unsigned long dev, char* fpgadata, size_t size)
                        __FUNCTION__);
                return FPGA_FAIL;
        }
                        __FUNCTION__);
                return FPGA_FAIL;
        }

-       swapsize = ((unsigned int) *dataptr     <<24) + 
-                  ((unsigned int) *(dataptr+1) <<16) + 
-                  ((unsigned int) *(dataptr+2) <<8 ) + 
+       swapsize = ((unsigned int) *dataptr     <<24) +
+                  ((unsigned int) *(dataptr+1) <<16) +
+                  ((unsigned int) *(dataptr+2) <<8 ) +

                   ((unsigned int) *(dataptr+3)     ) ;
        dataptr+=4;
        printf("  bytes in bitstream = %d\n", swapsize);
                   ((unsigned int) *(dataptr+3)     ) ;
        dataptr+=4;
        printf("  bytes in bitstream = %d\n", swapsize);


@@ -217,7 +216,7 @@ int do_fpga (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
                PRINTF ("%s: device = %d\n", __FUNCTION__, dev);
                /* FIXME - this is a really weak test */
                if ((argc == 3) && (dev > fpga_count ())) {     /* must be buffer ptr */
                PRINTF ("%s: device = %d\n", __FUNCTION__, dev);
                /* FIXME - this is a really weak test */
                if ((argc == 3) && (dev > fpga_count ())) {     /* must be buffer ptr */

-                       PRINTF ("%s: Assuming buffer pointer in arg 3\n", 
+                       PRINTF ("%s: Assuming buffer pointer in arg 3\n",

                                __FUNCTION__);
                        fpga_data = (void *) dev;
                        PRINTF ("%s: fpga_data = 0x%x\n",
                                __FUNCTION__);
                        fpga_data = (void *) dev;
                        PRINTF ("%s: fpga_data = 0x%x\n",


@@ -251,6 +250,23 @@ int do_fpga (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
                rc = fpga_loadbitstream(dev, fpga_data, data_size);
                break;
 
                rc = fpga_loadbitstream(dev, fpga_data, data_size);
                break;
 

+       case FPGA_LOADMK:
+               {
+                       image_header_t header;
+                       image_header_t *hdr = &header;
+                       ulong   data;
+
+                       memmove (&header, (char *)fpga_data, sizeof(image_header_t));
+                       if (ntohl(hdr->ih_magic) != IH_MAGIC) {
+                               puts ("Bad Magic Number\n");
+                               return 1;
+                       }
+                       data = ((ulong)fpga_data + sizeof(image_header_t));
+                       data_size  = ntohl(hdr->ih_size);
+                       rc = fpga_load (dev, (void *)data, data_size);
+               }
+               break;
+

        case FPGA_DUMP:
                rc = fpga_dump (dev, fpga_data, data_size);
                break;
        case FPGA_DUMP:
                rc = fpga_dump (dev, fpga_data, data_size);
                break;


@@ -282,6 +298,8 @@ static int fpga_get_op (char *opstr)
                op = FPGA_LOADB;
        } else if (!strcmp ("load", opstr)) {
                op = FPGA_LOAD;
                op = FPGA_LOADB;
        } else if (!strcmp ("load", opstr)) {
                op = FPGA_LOAD;

+       } else if (!strcmp ("loadmk", opstr)) {
+               op = FPGA_LOADMK;

        } else if (!strcmp ("dump", opstr)) {
                op = FPGA_DUMP;
        }
        } else if (!strcmp ("dump", opstr)) {
                op = FPGA_DUMP;
        }


@@ -299,5 +317,5 @@ U_BOOT_CMD (fpga, 6, 1, do_fpga,
            "\tinfo\tlist known device information\n"
            "\tload\tLoad device from memory buffer\n"
            "\tloadb\tLoad device from bitstream buffer (Xilinx devices only)\n"
            "\tinfo\tlist known device information\n"
            "\tload\tLoad device from memory buffer\n"
            "\tloadb\tLoad device from bitstream buffer (Xilinx devices only)\n"

+           "\tloadmk\tLoad device generated with mkimage\n"

            "\tdump\tLoad device to memory buffer\n");
            "\tdump\tLoad device to memory buffer\n");

-#endif /* CONFIG_FPGA && CONFIG_COMMANDS & CFG_CMD_FPGA */