fpga: add new symbol for fpga_loadb

Adding new symbol for the fpga loadb command which is exclusive to
Xilinx. Default value is y for backward compatibility.

Clarify the type of file used for fpga programming commands

Signed-off-by: Ibai Erkiaga <ibai.erkiaga-elorza@amd.com>
Link: https://lore.kernel.org/r/20250121130138.1999916-6-ibai.erkiaga-elorza@amd.com
Signed-off-by: Michal Simek <michal.simek@amd.com>

diff --git a/cmd/Kconfig b/cmd/Kconfig
index d59a000..1f9b269 100644 (file)
--- a/cmd/Kconfig
+++ b/cmd/Kconfig
@@ -1178,19 +1178,26 @@ config CMD_FPGA
        help
          FPGA support.
 
+config CMD_FPGA_LOADB
+       bool "fpga loadb - load bitstream file"
+       default y
+       depends on CMD_FPGA && FPGA_XILINX
+       help
+         Supports loading an FPGA device from a bitstream file (.BIT)
+
 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.
+         Supports loading an FPGA device from a bitstream buffer (.BIN)
+         containing a partial bitstream.
 
 config CMD_FPGA_LOADBP
-       bool "fpga loadbp - load partial bitstream"
+       bool "fpga loadbp - load partial bitstream file"
        depends on CMD_FPGA && FPGA_XILINX
        help
-         Supports loading an FPGA device from a bitstream buffer containing
-         a partial bitstream.
+         Supports loading an FPGA device from a bitstream file (.BIT)
+         containing a partial bitstream.
 
 config CMD_FPGA_LOADFS
        bool "fpga loadfs - load bitstream from FAT filesystem"

diff --git a/cmd/fpga.c b/cmd/fpga.c
index 75d2f82..212f421 100644 (file)
--- a/cmd/fpga.c
+++ b/cmd/fpga.c
@@ -180,6 +180,7 @@ static int do_fpga_load(struct cmd_tbl *cmdtp, int flag, int argc,
        return fpga_load(dev, (void *)fpga_data, data_size, BIT_FULL, 0);
 }
 
+#if defined(CONFIG_CMD_FPGA_LOADB)
 static int do_fpga_loadb(struct cmd_tbl *cmdtp, int flag, int argc,
                         char *const argv[])
 {
@@ -194,7 +195,7 @@ static int do_fpga_loadb(struct cmd_tbl *cmdtp, int flag, int argc,
 
        return fpga_loadbitstream(dev, (void *)fpga_data, data_size, BIT_FULL);
 }
-
+#endif
 #if defined(CONFIG_CMD_FPGA_LOADP)
 static int do_fpga_loadp(struct cmd_tbl *cmdtp, int flag, int argc,
                         char *const argv[])
@@ -356,7 +357,9 @@ static struct cmd_tbl fpga_commands[] = {
        U_BOOT_CMD_MKENT(info, 1, 1, do_fpga_info, "", ""),
        U_BOOT_CMD_MKENT(dump, 3, 1, do_fpga_dump, "", ""),
        U_BOOT_CMD_MKENT(load, 3, 1, do_fpga_load, "", ""),
+#if defined(CONFIG_CMD_FPGA_LOADB)
        U_BOOT_CMD_MKENT(loadb, 3, 1, do_fpga_loadb, "", ""),
+#endif
 #if defined(CONFIG_CMD_FPGA_LOADP)
        U_BOOT_CMD_MKENT(loadp, 3, 1, do_fpga_loadp, "", ""),
 #endif
@@ -412,8 +415,9 @@ 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_LOADP)
         "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"