Whitebox
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Convert CONFIG_CMD_FPGA_LOADBP et al to Kconfig

Browse Source 
This converts the following to Kconfig:
   CONFIG_CMD_FPGA_LOADBP
   CONFIG_CMD_FPGA_LOADFS
   CONFIG_CMD_FPGA_LOADMK
   CONFIG_CMD_FPGA_LOADP

Signed-off-by: Simon Glass <sjg@chromium.org>
master
Simon Glass 7 years ago committed by Tom Rini
parent df1c489ade
commit fe7604a3bc
23 changed files with 70 additions and 29 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 13
      README
  2. 1
      arch/Kconfig
  3. 26
      cmd/Kconfig
  4. 1
      configs/astro_mcf5373l_defconfig
  5. 1
      configs/mt_ventoux_defconfig
  6. 1
      configs/x600_defconfig
  7. 4
      configs/zynq_microzed_defconfig
  8. 4
      configs/zynq_picozed_defconfig
  9. 4
      configs/zynq_zc702_defconfig
  10. 4
      configs/zynq_zc706_defconfig
  11. 4
      configs/zynq_zc770_xm010_defconfig
  12. 4
      configs/zynq_zc770_xm011_defconfig
  13. 4
      configs/zynq_zc770_xm012_defconfig
  14. 4
      configs/zynq_zc770_xm013_defconfig
  15. 4
      configs/zynq_zed_defconfig
  16. 4
      configs/zynq_zybo_defconfig
  17. 1
      include/configs/astro_mcf5373l.h
  18. 1
      include/configs/mt_ventoux.h
  19. 4
      include/configs/topic_miami.h
  20. 1
      include/configs/x600.h
  21. 1
      include/configs/x86-common.h
  22. 4
      include/configs/zynq-common.h
  23. 4
      scripts/config_whitelist.txt

13
README
Unescape View File

@ -2384,19 +2384,6 @@ The following options need to be configured:
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_CMD_FPGA_LOADP
Enable support for fpga loadp command - load partial bitstream
CONFIG_CMD_FPGA_LOADBP
Enable support for fpga loadbp command - load partial bitstream
(Xilinx only)
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.

1
arch/Kconfig
Unescape View File

@ -86,6 +86,7 @@ config X86
select DM_SPI_FLASH select DM_SPI_FLASH
select USB_EHCI_HCD select USB_EHCI_HCD
select DM_MMC if MMC select DM_MMC if MMC
imply CMD_FPGA_LOADMK
config XTENSA config XTENSA
bool "Xtensa architecture" bool "Xtensa architecture"

26
cmd/Kconfig
Unescape View File

@ -593,6 +593,32 @@ config CMD_FPGA
help help
FPGA support. FPGA support.
config CMD_FPGA_LOADBP
bool "fpga loadbp - load partial bitstream (Xilinx only)"
depends on CMD_FPGA
help
Supports loading an FPGA device from a bitstream buffer containing
a partial bitstream.
config CMD_FPGA_LOADFS
bool "fpga loadfs - load bitstream from FAT filesystem (Xilinx only)"
depends on CMD_FPGA
help
Supports loading an FPGA device from a FAT filesystem.
config CMD_FPGA_LOADMK
bool "fpga loadmk - load bitstream from image"
depends on CMD_FPGA
help
Supports loading an FPGA device from a image generated by mkimage.
config CMD_FPGA_LOADP
bool "fpga loadp - load partial bitstream"
depends on CMD_FPGA
help
Supports loading an FPGA device from a bitstream buffer containing
a partial bitstream.
config CMD_FPGAD config CMD_FPGAD
bool "fpgad - dump FPGA registers" bool "fpgad - dump FPGA registers"
help help

1
configs/astro_mcf5373l_defconfig
Unescape View File

@ -5,6 +5,7 @@ CONFIG_BOOTDELAY=1
CONFIG_HUSH_PARSER=y CONFIG_HUSH_PARSER=y
CONFIG_SYS_PROMPT="URMEL > " CONFIG_SYS_PROMPT="URMEL > "
CONFIG_CMD_I2C=y CONFIG_CMD_I2C=y
CONFIG_CMD_FPGA_LOADMK=y
# CONFIG_CMD_SETEXPR is not set # CONFIG_CMD_SETEXPR is not set
# CONFIG_CMD_NET is not set # CONFIG_CMD_NET is not set
# CONFIG_CMD_NFS is not set # CONFIG_CMD_NFS is not set

1
configs/mt_ventoux_defconfig
Unescape View File

@ -17,6 +17,7 @@ CONFIG_CMD_EEPROM=y
CONFIG_CMD_MMC=y CONFIG_CMD_MMC=y
CONFIG_CMD_I2C=y CONFIG_CMD_I2C=y
CONFIG_CMD_USB=y CONFIG_CMD_USB=y
CONFIG_CMD_FPGA_LOADMK=y
CONFIG_CMD_GPIO=y CONFIG_CMD_GPIO=y
# CONFIG_CMD_SETEXPR is not set # CONFIG_CMD_SETEXPR is not set
CONFIG_CMD_DHCP=y CONFIG_CMD_DHCP=y

1
configs/x600_defconfig
Unescape View File

@ -20,6 +20,7 @@ CONFIG_AUTOBOOT_STOP_STR=" "
CONFIG_LOOPW=y CONFIG_LOOPW=y
CONFIG_CMD_I2C=y CONFIG_CMD_I2C=y
CONFIG_CMD_USB=y CONFIG_CMD_USB=y
CONFIG_CMD_FPGA_LOADMK=y
CONFIG_CMD_GPIO=y CONFIG_CMD_GPIO=y
# CONFIG_CMD_SETEXPR is not set # CONFIG_CMD_SETEXPR is not set
CONFIG_CMD_DHCP=y CONFIG_CMD_DHCP=y

4
configs/zynq_microzed_defconfig
Unescape View File

@ -16,6 +16,10 @@ CONFIG_CMD_MMC=y
CONFIG_CMD_SF=y CONFIG_CMD_SF=y
CONFIG_CMD_USB=y CONFIG_CMD_USB=y
CONFIG_CMD_DFU=y CONFIG_CMD_DFU=y
CONFIG_CMD_FPGA_LOADBP=y
CONFIG_CMD_FPGA_LOADFS=y
CONFIG_CMD_FPGA_LOADMK=y
CONFIG_CMD_FPGA_LOADP=y
CONFIG_CMD_GPIO=y CONFIG_CMD_GPIO=y
# CONFIG_CMD_SETEXPR is not set # CONFIG_CMD_SETEXPR is not set
CONFIG_CMD_TFTPPUT=y CONFIG_CMD_TFTPPUT=y

4
configs/zynq_picozed_defconfig
Unescape View File

@ -12,6 +12,10 @@ CONFIG_SYS_PROMPT="Zynq> "
CONFIG_CMD_MMC=y CONFIG_CMD_MMC=y
CONFIG_CMD_USB=y CONFIG_CMD_USB=y
CONFIG_CMD_DFU=y CONFIG_CMD_DFU=y
CONFIG_CMD_FPGA_LOADBP=y
CONFIG_CMD_FPGA_LOADFS=y
CONFIG_CMD_FPGA_LOADMK=y
CONFIG_CMD_FPGA_LOADP=y
CONFIG_CMD_GPIO=y CONFIG_CMD_GPIO=y
# CONFIG_CMD_SETEXPR is not set # CONFIG_CMD_SETEXPR is not set
CONFIG_CMD_TFTPPUT=y CONFIG_CMD_TFTPPUT=y

4
configs/zynq_zc702_defconfig
Unescape View File

@ -19,6 +19,10 @@ CONFIG_CMD_SF=y
CONFIG_CMD_I2C=y CONFIG_CMD_I2C=y
CONFIG_CMD_USB=y CONFIG_CMD_USB=y
CONFIG_CMD_DFU=y CONFIG_CMD_DFU=y
CONFIG_CMD_FPGA_LOADBP=y
CONFIG_CMD_FPGA_LOADFS=y
CONFIG_CMD_FPGA_LOADMK=y
CONFIG_CMD_FPGA_LOADP=y
CONFIG_CMD_GPIO=y CONFIG_CMD_GPIO=y
# CONFIG_CMD_SETEXPR is not set # CONFIG_CMD_SETEXPR is not set
CONFIG_CMD_TFTPPUT=y CONFIG_CMD_TFTPPUT=y

4
configs/zynq_zc706_defconfig
Unescape View File

@ -19,6 +19,10 @@ CONFIG_CMD_SF=y
CONFIG_CMD_I2C=y CONFIG_CMD_I2C=y
CONFIG_CMD_USB=y CONFIG_CMD_USB=y
CONFIG_CMD_DFU=y CONFIG_CMD_DFU=y
CONFIG_CMD_FPGA_LOADBP=y
CONFIG_CMD_FPGA_LOADFS=y
CONFIG_CMD_FPGA_LOADMK=y
CONFIG_CMD_FPGA_LOADP=y
CONFIG_CMD_GPIO=y CONFIG_CMD_GPIO=y
# CONFIG_CMD_SETEXPR is not set # CONFIG_CMD_SETEXPR is not set
CONFIG_CMD_TFTPPUT=y CONFIG_CMD_TFTPPUT=y

4
configs/zynq_zc770_xm010_defconfig
Unescape View File

@ -15,6 +15,10 @@ CONFIG_SYS_PROMPT="Zynq> "
# CONFIG_CMD_FLASH is not set # CONFIG_CMD_FLASH is not set
CONFIG_CMD_MMC=y CONFIG_CMD_MMC=y
CONFIG_CMD_SF=y CONFIG_CMD_SF=y
CONFIG_CMD_FPGA_LOADBP=y
CONFIG_CMD_FPGA_LOADFS=y
CONFIG_CMD_FPGA_LOADMK=y
CONFIG_CMD_FPGA_LOADP=y
CONFIG_CMD_GPIO=y CONFIG_CMD_GPIO=y
# CONFIG_CMD_SETEXPR is not set # CONFIG_CMD_SETEXPR is not set
CONFIG_CMD_TFTPPUT=y CONFIG_CMD_TFTPPUT=y

4
configs/zynq_zc770_xm011_defconfig
Unescape View File

@ -14,6 +14,10 @@ CONFIG_SYS_PROMPT="Zynq> "
# CONFIG_CMD_IMLS is not set # CONFIG_CMD_IMLS is not set
# CONFIG_CMD_FLASH is not set # CONFIG_CMD_FLASH is not set
CONFIG_CMD_NAND=y CONFIG_CMD_NAND=y
CONFIG_CMD_FPGA_LOADBP=y
CONFIG_CMD_FPGA_LOADFS=y
CONFIG_CMD_FPGA_LOADMK=y
CONFIG_CMD_FPGA_LOADP=y
CONFIG_CMD_GPIO=y CONFIG_CMD_GPIO=y
# CONFIG_CMD_SETEXPR is not set # CONFIG_CMD_SETEXPR is not set
CONFIG_CMD_TFTPPUT=y CONFIG_CMD_TFTPPUT=y

4
configs/zynq_zc770_xm012_defconfig
Unescape View File

@ -11,6 +11,10 @@ CONFIG_SPL=y
CONFIG_SPL_OS_BOOT=y CONFIG_SPL_OS_BOOT=y
CONFIG_HUSH_PARSER=y CONFIG_HUSH_PARSER=y
CONFIG_SYS_PROMPT="Zynq> " CONFIG_SYS_PROMPT="Zynq> "
CONFIG_CMD_FPGA_LOADBP=y
CONFIG_CMD_FPGA_LOADFS=y
CONFIG_CMD_FPGA_LOADMK=y
CONFIG_CMD_FPGA_LOADP=y
CONFIG_CMD_GPIO=y CONFIG_CMD_GPIO=y
# CONFIG_CMD_SETEXPR is not set # CONFIG_CMD_SETEXPR is not set
CONFIG_CMD_TFTPPUT=y CONFIG_CMD_TFTPPUT=y

4
configs/zynq_zc770_xm013_defconfig
Unescape View File

@ -13,6 +13,10 @@ CONFIG_HUSH_PARSER=y
CONFIG_SYS_PROMPT="Zynq> " CONFIG_SYS_PROMPT="Zynq> "
# CONFIG_CMD_IMLS is not set # CONFIG_CMD_IMLS is not set
# CONFIG_CMD_FLASH is not set # CONFIG_CMD_FLASH is not set
CONFIG_CMD_FPGA_LOADBP=y
CONFIG_CMD_FPGA_LOADFS=y
CONFIG_CMD_FPGA_LOADMK=y
CONFIG_CMD_FPGA_LOADP=y
CONFIG_CMD_GPIO=y CONFIG_CMD_GPIO=y
# CONFIG_CMD_SETEXPR is not set # CONFIG_CMD_SETEXPR is not set
CONFIG_CMD_TFTPPUT=y CONFIG_CMD_TFTPPUT=y

4
configs/zynq_zed_defconfig
Unescape View File

@ -16,6 +16,10 @@ CONFIG_CMD_MMC=y
CONFIG_CMD_SF=y CONFIG_CMD_SF=y
CONFIG_CMD_USB=y CONFIG_CMD_USB=y
CONFIG_CMD_DFU=y CONFIG_CMD_DFU=y
CONFIG_CMD_FPGA_LOADBP=y
CONFIG_CMD_FPGA_LOADFS=y
CONFIG_CMD_FPGA_LOADMK=y
CONFIG_CMD_FPGA_LOADP=y
CONFIG_CMD_GPIO=y CONFIG_CMD_GPIO=y
# CONFIG_CMD_SETEXPR is not set # CONFIG_CMD_SETEXPR is not set
CONFIG_CMD_TFTPPUT=y CONFIG_CMD_TFTPPUT=y

4
configs/zynq_zybo_defconfig
Unescape View File

@ -19,6 +19,10 @@ CONFIG_CMD_SF=y
CONFIG_CMD_I2C=y CONFIG_CMD_I2C=y
CONFIG_CMD_USB=y CONFIG_CMD_USB=y
CONFIG_CMD_DFU=y CONFIG_CMD_DFU=y
CONFIG_CMD_FPGA_LOADBP=y
CONFIG_CMD_FPGA_LOADFS=y
CONFIG_CMD_FPGA_LOADMK=y
CONFIG_CMD_FPGA_LOADP=y
CONFIG_CMD_GPIO=y CONFIG_CMD_GPIO=y
# CONFIG_CMD_SETEXPR is not set # CONFIG_CMD_SETEXPR is not set
CONFIG_CMD_TFTPPUT=y CONFIG_CMD_TFTPPUT=y

1
include/configs/astro_mcf5373l.h
Unescape View File

@ -63,7 +63,6 @@
#define CONFIG_CMD_JFFS2 #define CONFIG_CMD_JFFS2
#endif #endif
#define CONFIG_CMD_REGINFO #define CONFIG_CMD_REGINFO
#define CONFIG_CMD_FPGA_LOADMK
#define CONFIG_CMDLINE_EDITING #define CONFIG_CMDLINE_EDITING
#define CONFIG_MCFRTC #define CONFIG_MCFRTC

1
include/configs/mt_ventoux.h
Unescape View File

@ -39,7 +39,6 @@
/* /*
* FPGA * 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

4
include/configs/topic_miami.h
Unescape View File

@ -44,10 +44,6 @@
#undef CONFIG_SPL_FPGA_SUPPORT #undef CONFIG_SPL_FPGA_SUPPORT
/* FPGA commands that we don't use */ /* FPGA commands that we don't use */
#undef CONFIG_CMD_FPGA_LOADMK
#undef CONFIG_CMD_FPGA_LOADP
#undef CONFIG_CMD_FPGA_LOADBP
#undef CONFIG_CMD_FPGA_LOADFS
/* Extras */ /* Extras */
#define CONFIG_CMD_MEMTEST #define CONFIG_CMD_MEMTEST

1
include/configs/x600.h
Unescape View File

@ -106,7 +106,6 @@
/* /*
* Command support defines * Command support defines
*/ */
#define CONFIG_CMD_FPGA_LOADMK
#define CONFIG_CMD_MTDPARTS #define CONFIG_CMD_MTDPARTS
#define CONFIG_CMD_NAND #define CONFIG_CMD_NAND
#define CONFIG_CMD_SAVES #define CONFIG_CMD_SAVES

1
include/configs/x86-common.h
Unescape View File

@ -70,7 +70,6 @@
/*----------------------------------------------------------------------- /*-----------------------------------------------------------------------
* Command line configuration. * Command line configuration.
*/ */
#define CONFIG_CMD_FPGA_LOADMK
#define CONFIG_CMD_IO #define CONFIG_CMD_IO
#define CONFIG_CMD_IRQ #define CONFIG_CMD_IRQ
#define CONFIG_CMD_PCI #define CONFIG_CMD_PCI

4
include/configs/zynq-common.h
Unescape View File

@ -259,10 +259,6 @@
#define CONFIG_FPGA #define CONFIG_FPGA
#define CONFIG_FPGA_XILINX #define CONFIG_FPGA_XILINX
#define CONFIG_FPGA_ZYNQPL #define CONFIG_FPGA_ZYNQPL
#define CONFIG_CMD_FPGA_LOADMK
#define CONFIG_CMD_FPGA_LOADP
#define CONFIG_CMD_FPGA_LOADBP
#define CONFIG_CMD_FPGA_LOADFS
/* FIT support */ /* FIT support */
#define CONFIG_IMAGE_FORMAT_LEGACY /* enable also legacy image format */ #define CONFIG_IMAGE_FORMAT_LEGACY /* enable also legacy image format */

4
scripts/config_whitelist.txt
Unescape View File

@ -383,10 +383,6 @@ CONFIG_CM922T_XA10
CONFIG_CMDLINE_EDITING CONFIG_CMDLINE_EDITING
CONFIG_CMDLINE_PS_SUPPORT CONFIG_CMDLINE_PS_SUPPORT
CONFIG_CMDLINE_TAG CONFIG_CMDLINE_TAG
CONFIG_CMD_FPGA_LOADBP
CONFIG_CMD_FPGA_LOADFS
CONFIG_CMD_FPGA_LOADMK
CONFIG_CMD_FPGA_LOADP
CONFIG_CMD_FUSE CONFIG_CMD_FUSE
CONFIG_CMD_GETTIME CONFIG_CMD_GETTIME
CONFIG_CMD_GSC CONFIG_CMD_GSC

Write Preview
Loading…
Cancel
Save