Ensure all Xilinx exclusive fpga commands have a KConfig symbol and dependency to FPGA_XILINX listed. Remove (Xilinx only) text from the help command.
Signed-off-by: Ibai Erkiaga ibai.erkiaga-elorza@amd.com ---
(no changes since v1)
cmd/Kconfig | 16 +++++++++++----- cmd/fpga.c | 9 +++++---- 2 files changed, 16 insertions(+), 9 deletions(-)
diff --git a/cmd/Kconfig b/cmd/Kconfig index f3ba230db42..822adbc7da1 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -1163,6 +1163,12 @@ config CMD_FPGA help FPGA support.
+config CMD_FPGA_LOADB + bool "fpga loadb - load bitstream" + depends on CMD_FPGA && FPGA_XILINX + help + Supports loading an FPGA device from a bitstream buffer + config CMD_FPGA_LOADP bool "fpga loadp - load partial bitstream" depends on CMD_FPGA @@ -1171,15 +1177,15 @@ config CMD_FPGA_LOADP a partial bitstream.
config CMD_FPGA_LOADBP - bool "fpga loadbp - load partial bitstream (Xilinx only)" - depends on CMD_FPGA + bool "fpga loadbp - load partial bitstream" + depends on CMD_FPGA && FPGA_XILINX 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 + bool "fpga loadfs - load bitstream from FAT filesystem" + depends on CMD_FPGA && FPGA_XILINX help Supports loading an FPGA device from a FAT filesystem.
@@ -1192,7 +1198,7 @@ config CMD_FPGA_LOADMK config CMD_FPGA_LOAD_SECURE bool "fpga loads - loads secure bitstreams" depends on CMD_FPGA - select FPGA_LOAD_SECURE + select FPGA_LOAD_SECURE && FPGA_XILINX help Enables the fpga loads command which is used to load secure (authenticated or encrypted or both) bitstreams on to FPGA. diff --git a/cmd/fpga.c b/cmd/fpga.c index 13aabc95abc..65038a79930 100644 --- a/cmd/fpga.c +++ b/cmd/fpga.c @@ -412,19 +412,20 @@ U_BOOT_CMD(fpga, 6, 1, do_fpga_wrapper, "info [dev] List known device information\n" "fpga dump <dev> <address> <size> Load device to memory buffer\n" "fpga load <dev> <address> <size> Load device from memory buffer\n" +#if defined(CONFIG_CMD_FPGA_LOADB) "fpga loadb <dev> <address> <size> Load device from bitstream buffer\n" - " (Xilinx only)\n" +#endif #if defined(CONFIG_CMD_FPGA_LOADP) "fpga loadp <dev> <address> <size> Load device from memory buffer\n" " with partial bitstream\n" #endif #if defined(CONFIG_CMD_FPGA_LOADBP) "fpga loadbp <dev> <address> <size> Load device from bitstream buffer\n" - " with partial bitstream (Xilinx only)\n" + " with partial bitstream\n" #endif #if defined(CONFIG_CMD_FPGA_LOADFS) "fpga loadfs <dev> <address> <size> <blocksize> <interface> [<dev[:part]>] <filename>\n" - " Load device from filesystem (FAT by default) (Xilinx only)\n" + " Load device from filesystem (FAT by default)\n" #endif #if defined(CONFIG_CMD_FPGA_LOADMK) "fpga loadmk <dev> <address> Load device generated with mkimage\n" @@ -436,7 +437,7 @@ U_BOOT_CMD(fpga, 6, 1, do_fpga_wrapper, #if defined(CONFIG_CMD_FPGA_LOAD_SECURE) "fpga loads <dev> <address> <size> <authflag> <encflag> [Userkey address]\n" " Load device from memory buffer with secure bistream\n" - " (authenticated/encrypted/both)(Xilinx only)\n" + " (authenticated/encrypted/both)\n" " -authflag: 0 for OCM, 1 for DDR, 2 for no authentication\n" " (specifies where to perform authentication)\n" " -encflag: 0 for device key, 1 for user key, 2 for no encryption\n"