X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=common%2Fcmd_fpga.c;h=df859bd98786bf2cd1f0403b81d57f794cd433ac;hb=64cd52efd1dc51a4a5a0cf10efe5362fab27de29;hp=b364f14832af590e3273cf2bab09422140756f6a;hpb=b0fce99bfc116c2ddb4506268d6e4a0a7054478d;p=oweals%2Fu-boot.git diff --git a/common/cmd_fpga.c b/common/cmd_fpga.c index b364f14832..df859bd987 100644 --- a/common/cmd_fpga.c +++ b/common/cmd_fpga.c @@ -31,6 +31,7 @@ #include #endif #include +#include #if 0 #define FPGA_DEBUG @@ -45,14 +46,144 @@ #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 ); +static void fpga_usage (cmd_tbl_t * cmdtp); +static int fpga_get_op (char *opstr); /* Local defines */ #define FPGA_NONE -1 #define FPGA_INFO 0 #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) +{ + unsigned int length; + unsigned char* swapdata; + unsigned int swapsize; + char buffer[80]; + unsigned char *ptr; + unsigned char *dataptr; + unsigned char data; + unsigned int i; + int rc; + + 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; + dataptr+=length; + + /* get design name (identifier, length, string) */ + length = (*dataptr << 8) + *(dataptr+1); + dataptr+=2; + if (*dataptr++ != 0x61) { + PRINTF ("%s: Design name identifier not recognized in bitstream\n", + __FUNCTION__ ); + return FPGA_FAIL; + } + + length = (*dataptr << 8) + *(dataptr+1); + dataptr+=2; + for(i=0;i= size) { + printf("%s: Could not find right length of data in bitstream\n", + __FUNCTION__); + return FPGA_FAIL; + } + + /* allocate memory */ + swapdata = (unsigned char *)malloc(swapsize); + if (swapdata == NULL) { + printf("%s: Could not allocate %d bytes memory !\n", + __FUNCTION__, swapsize); + return FPGA_FAIL; + } + + /* read data into memory and swap bits */ + ptr = swapdata; + for (i = 0; i < swapsize; i++) { + data = 0x00; + data |= (*dataptr & 0x01) << 7; + data |= (*dataptr & 0x02) << 5; + data |= (*dataptr & 0x04) << 3; + data |= (*dataptr & 0x08) << 1; + data |= (*dataptr & 0x10) >> 1; + data |= (*dataptr & 0x20) >> 3; + data |= (*dataptr & 0x40) >> 5; + data |= (*dataptr & 0x80) >> 7; + *ptr++ = data; + dataptr++; + } + + rc = fpga_load(dev, swapdata, swapsize); + free(swapdata); + return rc; +#else + printf("Bitstream support only for Xilinx devices\n"); + return FPGA_FAIL; +#endif +} /* ------------------------------------------------------------------------- */ /* command form: @@ -62,105 +193,132 @@ static int fpga_get_op( char *opstr ); * If there is no data addr field, the fpgadata environment variable is used. * The info command requires no data address field. */ -int -do_fpga (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) +int do_fpga (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) { - int op, dev = FPGA_INVALID_DEVICE; - size_t data_size = 0; - void *fpga_data = NULL; - char *devstr = getenv("fpga"); - char *datastr = getenv("fpgadata"); - - if ( devstr ) dev = (int)simple_strtoul( devstr, NULL, 16 ); - if ( datastr ) fpga_data = (void *)simple_strtoul( datastr, NULL, 16 ); - - switch ( argc ) - { - case 5: /* fpga */ - data_size = simple_strtoul( argv[4], NULL, 16 ); - case 4: /* fpga */ - fpga_data = (void *)simple_strtoul( argv[3], NULL, 16 ); - PRINTF(__FUNCTION__": fpga_data = 0x%x\n", (uint)fpga_data ); - case 3: /* fpga */ - dev = (int)simple_strtoul( argv[2], NULL, 16 ); - PRINTF(__FUNCTION__": device = %d\n", dev ); - /* FIXME - this is a really weak test */ - if (( argc == 3 ) && ( dev > fpga_count() )) { /* must be buffer ptr */ - PRINTF(__FUNCTION__": Assuming buffer pointer in arg 3\n"); - fpga_data = (void *)dev; - PRINTF(__FUNCTION__": fpga_data = 0x%x\n", (uint)fpga_data ); - dev = FPGA_INVALID_DEVICE; /* reset device num */ - } - case 2: /* fpga */ - op = (int)fpga_get_op( argv[1] ); - break; - default: - PRINTF(__FUNCTION__": Too many or too few args (%d)\n", argc ); - op = FPGA_NONE; /* force usage display */ - break; - } - - switch ( op ) { - case FPGA_NONE: - fpga_usage( cmdtp ); - break; - - case FPGA_INFO: - fpga_info( dev ); - break; - - case FPGA_LOAD: - fpga_load( dev, fpga_data, data_size ); - break; - - case FPGA_DUMP: - fpga_dump( dev, fpga_data, data_size ); - break; - - default: - printf( "Unknown operation.\n" ); - fpga_usage( cmdtp ); - break; - } - return 0; + int op, dev = FPGA_INVALID_DEVICE; + size_t data_size = 0; + void *fpga_data = NULL; + char *devstr = getenv ("fpga"); + char *datastr = getenv ("fpgadata"); + int rc = FPGA_FAIL; + + if (devstr) + dev = (int) simple_strtoul (devstr, NULL, 16); + if (datastr) + fpga_data = (void *) simple_strtoul (datastr, NULL, 16); + + switch (argc) { + case 5: /* fpga */ + data_size = simple_strtoul (argv[4], NULL, 16); + case 4: /* fpga */ + fpga_data = (void *) simple_strtoul (argv[3], NULL, 16); + PRINTF ("%s: fpga_data = 0x%x\n", __FUNCTION__, (uint) fpga_data); + case 3: /* fpga */ + dev = (int) simple_strtoul (argv[2], NULL, 16); + 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", + __FUNCTION__); + fpga_data = (void *) dev; + PRINTF ("%s: fpga_data = 0x%x\n", + __FUNCTION__, (uint) fpga_data); + dev = FPGA_INVALID_DEVICE; /* reset device num */ + } + case 2: /* fpga */ + op = (int) fpga_get_op (argv[1]); + break; + default: + PRINTF ("%s: Too many or too few args (%d)\n", + __FUNCTION__, argc); + op = FPGA_NONE; /* force usage display */ + break; + } + + switch (op) { + case FPGA_NONE: + fpga_usage (cmdtp); + break; + + case FPGA_INFO: + rc = fpga_info (dev); + break; + + case FPGA_LOAD: + rc = fpga_load (dev, fpga_data, data_size); + break; + + case FPGA_LOADB: + 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 = (char *)(fpga_data + sizeof(image_header_t)); + data_size = ntohl(hdr->ih_size); + rc = fpga_load (dev, data, data_size); + } + break; + + case FPGA_DUMP: + rc = fpga_dump (dev, fpga_data, data_size); + break; + + default: + printf ("Unknown operation\n"); + fpga_usage (cmdtp); + break; + } + return (rc); } -static void fpga_usage ( cmd_tbl_t *cmdtp ) +static void fpga_usage (cmd_tbl_t * cmdtp) { - printf( "Usage:\n%s\n", cmdtp->usage ); + printf ("Usage:\n%s\n", cmdtp->usage); } /* * Map op to supported operations. We don't use a table since we * would just have to relocate it from flash anyway. */ -static int fpga_get_op( char *opstr ) +static int fpga_get_op (char *opstr) { int op = FPGA_NONE; if (!strcmp ("info", opstr)) { op = FPGA_INFO; - } - else if (!strcmp ("load", opstr)) { + } else if (!strcmp ("loadb", opstr)) { + op = FPGA_LOADB; + } else if (!strcmp ("load", opstr)) { op = FPGA_LOAD; - } - else if (!strcmp ("dump", opstr)) { + } else if (!strcmp ("loadmk", opstr)) { + op = FPGA_LOADMK; + } else if (!strcmp ("dump", opstr)) { op = FPGA_DUMP; } - if ( op == FPGA_NONE ) { + if (op == FPGA_NONE) { printf ("Unknown fpga operation \"%s\"\n", opstr); } return op; } -cmd_tbl_t U_BOOT_CMD(FPGA) = MK_CMD_ENTRY( - "fpga", 6, 1, do_fpga, - "fpga - loadable FPGA image support\n", - "fpga [operation type] [device number] [image address] [image size]\n" - "fpga operations:\n" - "\tinfo\tlist known device information.\n" - "\tload\tLoad device from memory buffer.\n" - "\tdump\tLoad device to memory buffer.\n" -); -#endif /* CONFIG_FPGA && CONFIG_COMMANDS & CFG_CMD_FPGA */ +U_BOOT_CMD (fpga, 6, 1, do_fpga, + "fpga - loadable FPGA image support\n", + "fpga [operation type] [device number] [image address] [image size]\n" + "fpga operations:\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"); +#endif /* CONFIG_FPGA && CONFIG_COMMANDS & CFG_CMD_FPGA */