redonkable
/
remarkable-uboot
1
0
Fork 0
Code Releases Activity

fpga: Guard the LOADMK functionality with CMD_FPGA_LOADMK 

Guard the LOADMK functionality with config to provide
an option to enable or disable it.
Enable it for all platforms in mainline which enable CONFIG_CMD_FPGA.

Signed-off-by: Siva Durga Prasad Paladugu <sivadur@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
utp
Siva Durga Prasad Paladugu 2014-03-14 16:35:38 +05:30 committed by Michal Simek
parent d0db28f940
commit 64e809afea
17 changed files with 27 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README
View File

@ -2550,6 +2550,10 @@ CBFS (Coreboot Filesystem) support
Specify the number of FPGA devices to support. Specify the number of FPGA devices to support.
CONFIG_CMD_FPGA_LOADMK
Enable support for fpga loadmk command
CONFIG_SYS_FPGA_PROG_FEEDBACK CONFIG_SYS_FPGA_PROG_FEEDBACK
Enable printing of hash marks during FPGA configuration. Enable printing of hash marks during FPGA configuration.

8
common/cmd_fpga.c
View File

@ -126,10 +126,12 @@ int do_fpga(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[])
if (!fpga_data || !data_size) if (!fpga_data || !data_size)
wrong_parms = 1; wrong_parms = 1;
break; break;
#if defined(CONFIG_CMD_FPGA_LOADMK)
case FPGA_LOADMK: case FPGA_LOADMK:
if (!fpga_data) if (!fpga_data)
wrong_parms = 1; wrong_parms = 1;
break; break;
#endif
} }
if (wrong_parms) { if (wrong_parms) {
@ -153,6 +155,7 @@ int do_fpga(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[])
rc = fpga_loadbitstream(dev, fpga_data, data_size); rc = fpga_loadbitstream(dev, fpga_data, data_size);
break; break;
#if defined(CONFIG_CMD_FPGA_LOADMK)
case FPGA_LOADMK: case FPGA_LOADMK:
switch (genimg_get_format(fpga_data)) { switch (genimg_get_format(fpga_data)) {
case IMAGE_FORMAT_LEGACY: case IMAGE_FORMAT_LEGACY:
@ -231,6 +234,7 @@ int do_fpga(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[])
break; break;
} }
break; break;
#endif
case FPGA_DUMP: case FPGA_DUMP:
rc = fpga_dump(dev, fpga_data, data_size); rc = fpga_dump(dev, fpga_data, data_size);
@ -257,8 +261,10 @@ static int fpga_get_op(char *opstr)
op = FPGA_LOADB; op = FPGA_LOADB;
else if (!strcmp("load", opstr)) else if (!strcmp("load", opstr))
op = FPGA_LOAD; op = FPGA_LOAD;
#if defined(CONFIG_CMD_FPGA_LOADMK)
else if (!strcmp("loadmk", opstr)) else if (!strcmp("loadmk", opstr))
op = FPGA_LOADMK; op = FPGA_LOADMK;
#endif
else if (!strcmp("dump", opstr)) else if (!strcmp("dump", opstr))
op = FPGA_DUMP; op = FPGA_DUMP;
@ -277,10 +283,12 @@ U_BOOT_CMD(fpga, 6, 1, do_fpga,
" load\t[dev] [address] [size]\tLoad device from memory buffer\n" " load\t[dev] [address] [size]\tLoad device from memory buffer\n"
" loadb\t[dev] [address] [size]\t" " loadb\t[dev] [address] [size]\t"
"Load device from bitstream buffer (Xilinx only)\n" "Load device from bitstream buffer (Xilinx only)\n"
#if defined(CONFIG_CMD_FPGA_LOADMK)
" loadmk [dev] [address]\tLoad device generated with mkimage" " loadmk [dev] [address]\tLoad device generated with mkimage"
#if defined(CONFIG_FIT) #if defined(CONFIG_FIT)
"\n" "\n"
"\tFor loadmk operating on FIT format uImage address must include\n" "\tFor loadmk operating on FIT format uImage address must include\n"
"\tsubimage unit name in the form of addr:<subimg_uname>" "\tsubimage unit name in the form of addr:<subimg_uname>"
#endif #endif
#endif
); );

1
include/configs/GEN860T.h
View File

@ -219,6 +219,7 @@
#define CONFIG_CMD_ELF #define CONFIG_CMD_ELF
#define CONFIG_CMD_DATE #define CONFIG_CMD_DATE
#define CONFIG_CMD_FPGA #define CONFIG_CMD_FPGA
#define CONFIG_CMD_FPGA_LOADMK
#define CONFIG_CMD_MII #define CONFIG_CMD_MII
#define CONFIG_CMD_BEDBUG #define CONFIG_CMD_BEDBUG

1
include/configs/MVBC_P.h
View File

@ -89,6 +89,7 @@
#define CONFIG_CMD_SDRAM #define CONFIG_CMD_SDRAM
#define CONFIG_CMD_PCI #define CONFIG_CMD_PCI
#define CONFIG_CMD_FPGA #define CONFIG_CMD_FPGA
#define CONFIG_CMD_FPGA_LOADMK
#define CONFIG_CMD_I2C #define CONFIG_CMD_I2C
#undef CONFIG_WATCHDOG #undef CONFIG_WATCHDOG

1
include/configs/MVBLM7.h
View File

@ -267,6 +267,7 @@
#define CONFIG_CMD_PCI #define CONFIG_CMD_PCI
#define CONFIG_CMD_I2C #define CONFIG_CMD_I2C
#define CONFIG_CMD_FPGA #define CONFIG_CMD_FPGA
#define CONFIG_CMD_FPGA_LOADMK
#define CONFIG_CMD_USB #define CONFIG_CMD_USB
#define CONFIG_DOS_PARTITION #define CONFIG_DOS_PARTITION

1
include/configs/MVSMR.h
View File

@ -74,6 +74,7 @@
#define CONFIG_CMD_CACHE #define CONFIG_CMD_CACHE
#define CONFIG_CMD_DHCP #define CONFIG_CMD_DHCP
#define CONFIG_CMD_FPGA #define CONFIG_CMD_FPGA
#define CONFIG_CMD_FPGA_LOADMK
#define CONFIG_CMD_I2C #define CONFIG_CMD_I2C
#define CONFIG_CMD_MII #define CONFIG_CMD_MII
#define CONFIG_CMD_NET #define CONFIG_CMD_NET

1
include/configs/alpr.h
View File

@ -222,6 +222,7 @@
#define CONFIG_CMD_DHCP #define CONFIG_CMD_DHCP
#define CONFIG_CMD_EEPROM #define CONFIG_CMD_EEPROM
#define CONFIG_CMD_FPGA #define CONFIG_CMD_FPGA
#define CONFIG_CMD_FPGA_LOADMK
#define CONFIG_CMD_I2C #define CONFIG_CMD_I2C
#undef CONFIG_CMD_LOADB #undef CONFIG_CMD_LOADB
#undef CONFIG_CMD_LOADS #undef CONFIG_CMD_LOADS

1
include/configs/astro_mcf5373l.h
View File

@ -88,6 +88,7 @@
#define CONFIG_CMD_LOADS #define CONFIG_CMD_LOADS
#define CONFIG_CMD_LOADB #define CONFIG_CMD_LOADB
#define CONFIG_CMD_FPGA #define CONFIG_CMD_FPGA
#define CONFIG_CMD_FPGA_LOADMK
#define CONFIG_CMDLINE_EDITING #define CONFIG_CMDLINE_EDITING
#define CONFIG_SYS_HUSH_PARSER #define CONFIG_SYS_HUSH_PARSER

1
include/configs/balloon3.h
View File

@ -54,6 +54,7 @@
#undef CONFIG_CMD_IMLS #undef CONFIG_CMD_IMLS
#define CONFIG_CMD_USB #define CONFIG_CMD_USB
#define CONFIG_CMD_FPGA #define CONFIG_CMD_FPGA
#define CONFIG_CMD_FPGA_LOADMK
#undef CONFIG_LCD #undef CONFIG_LCD
/* /*

1
include/configs/coreboot.h
View File

@ -167,6 +167,7 @@
#define CONFIG_CMD_ECHO #define CONFIG_CMD_ECHO
#undef CONFIG_CMD_FLASH #undef CONFIG_CMD_FLASH
#define CONFIG_CMD_FPGA #define CONFIG_CMD_FPGA
#define CONFIG_CMD_FPGA_LOADMK
#define CONFIG_CMD_GPIO #define CONFIG_CMD_GPIO
#define CONFIG_CMD_IMI #define CONFIG_CMD_IMI
#undef CONFIG_CMD_IMLS #undef CONFIG_CMD_IMLS

1
include/configs/grsim.h
View File

@ -53,6 +53,7 @@
#define CONFIG_CMD_DIAG #define CONFIG_CMD_DIAG
#define CONFIG_CMD_ECHO /* echo arguments */ #define CONFIG_CMD_ECHO /* echo arguments */
#define CONFIG_CMD_FPGA /* FPGA configuration Support */ #define CONFIG_CMD_FPGA /* FPGA configuration Support */
#define CONFIG_CMD_FPGA_LOADMK
#define CONFIG_CMD_IRQ #define CONFIG_CMD_IRQ
#define CONFIG_CMD_ITEST /* Integer (and string) test */ #define CONFIG_CMD_ITEST /* Integer (and string) test */
#define CONFIG_CMD_LOADB /* loadb */ #define CONFIG_CMD_LOADB /* loadb */

1
include/configs/grsim_leon2.h
View File

@ -51,6 +51,7 @@
#define CONFIG_CMD_DIAG #define CONFIG_CMD_DIAG
#define CONFIG_CMD_ECHO /* echo arguments */ #define CONFIG_CMD_ECHO /* echo arguments */
#define CONFIG_CMD_FPGA /* FPGA configuration Support */ #define CONFIG_CMD_FPGA /* FPGA configuration Support */
#define CONFIG_CMD_FPGA_LOADMK
#define CONFIG_CMD_IRQ #define CONFIG_CMD_IRQ
#define CONFIG_CMD_ITEST /* Integer (and string) test */ #define CONFIG_CMD_ITEST /* Integer (and string) test */
#define CONFIG_CMD_LOADB /* loadb */ #define CONFIG_CMD_LOADB /* loadb */

1
include/configs/iocon.h
View File

@ -63,6 +63,7 @@
*/ */
#define CONFIG_CMD_CACHE #define CONFIG_CMD_CACHE
#define CONFIG_CMD_FPGA #define CONFIG_CMD_FPGA
#define CONFIG_CMD_FPGA_LOADMK
#undef CONFIG_CMD_EEPROM #undef CONFIG_CMD_EEPROM
/* /*

1
include/configs/mt_ventoux.h
View File

@ -49,6 +49,7 @@
* FPGA * FPGA
*/ */
#define CONFIG_CMD_FPGA #define CONFIG_CMD_FPGA
#define CONFIG_CMD_FPGA_LOADMK
#define CONFIG_FPGA #define CONFIG_FPGA
#define CONFIG_FPGA_XILINX #define CONFIG_FPGA_XILINX
#define CONFIG_FPGA_SPARTAN3 #define CONFIG_FPGA_SPARTAN3

1
include/configs/omap3_mvblx.h
View File

@ -127,6 +127,7 @@
#define CONFIG_CMD_DHCP #define CONFIG_CMD_DHCP
#define CONFIG_CMD_PING #define CONFIG_CMD_PING
#define CONFIG_CMD_FPGA #define CONFIG_CMD_FPGA
#define CONFIG_CMD_FPGA_LOADMK
#define CONFIG_SYS_I2C #define CONFIG_SYS_I2C
#define CONFIG_SYS_OMAP24_I2C_SPEED 100000 #define CONFIG_SYS_OMAP24_I2C_SPEED 100000

1
include/configs/x600.h
View File

@ -107,6 +107,7 @@
#define CONFIG_CMD_DHCP #define CONFIG_CMD_DHCP
#define CONFIG_CMD_ENV #define CONFIG_CMD_ENV
#define CONFIG_CMD_FPGA #define CONFIG_CMD_FPGA
#define CONFIG_CMD_FPGA_LOADMK
#define CONFIG_CMD_GPIO #define CONFIG_CMD_GPIO
#define CONFIG_CMD_I2C #define CONFIG_CMD_I2C
#define CONFIG_CMD_MEMORY #define CONFIG_CMD_MEMORY

1
include/configs/zynq-common.h
View File

@ -191,6 +191,7 @@
#define CONFIG_FPGA_XILINX #define CONFIG_FPGA_XILINX
#define CONFIG_FPGA_ZYNQPL #define CONFIG_FPGA_ZYNQPL
#define CONFIG_CMD_FPGA #define CONFIG_CMD_FPGA
#define CONFIG_CMD_FPGA_LOADMK
/* Open Firmware flat tree */ /* Open Firmware flat tree */
#define CONFIG_OF_LIBFDT #define CONFIG_OF_LIBFDT