Merge branch 'next'

[J-u-boot.git] / drivers / fpga / xilinx.c

diff --git a/drivers/fpga/xilinx.c b/drivers/fpga/xilinx.c
index f5135504eeb60748d0e073e678710644fb437489..8170c3368ef6f89646e8617d869f1ca1f38b8cea 100644 (file)
--- a/drivers/fpga/xilinx.c
+++ b/drivers/fpga/xilinx.c
@@ -13,6 +13,7 @@
 
 #include <common.h>
 #include <fpga.h>
+#include <log.h>
 #include <virtex2.h>
 #include <spartan2.h>
 #include <spartan3.h>
@@ -134,11 +135,11 @@ int fpga_loadbitstream(int devnum, char *fpgadata, size_t size,
        dataptr += 4;
        printf("  bytes in bitstream = %d\n", swapsize);
 
-       return fpga_load(devnum, dataptr, swapsize, bstype);
+       return fpga_load(devnum, dataptr, swapsize, bstype, 0);
 }
 
 int xilinx_load(xilinx_desc *desc, const void *buf, size_t bsize,
-               bitstream_type bstype)
+               bitstream_type bstype, int flags)
 {
        if (!xilinx_validate (desc, (char *)__FUNCTION__)) {
                printf ("%s: Invalid device descriptor\n", __FUNCTION__);
@@ -150,7 +151,7 @@ int xilinx_load(xilinx_desc *desc, const void *buf, size_t bsize,
                return FPGA_FAIL;
        }
 
-       return desc->operations->load(desc, buf, bsize, bstype);
+       return desc->operations->load(desc, buf, bsize, bstype, flags);
 }
 
 #if defined(CONFIG_CMD_FPGA_LOADFS)
@@ -171,7 +172,7 @@ int xilinx_loadfs(xilinx_desc *desc, const void *buf, size_t bsize,
 }
 #endif
 
-#if defined(CONFIG_CMD_FPGA_LOAD_SECURE)
+#if CONFIG_IS_ENABLED(FPGA_LOAD_SECURE)
 int xilinx_loads(xilinx_desc *desc, const void *buf, size_t bsize,
                 struct fpga_secure_info *fpga_sec_info)
 {
@@ -226,7 +227,10 @@ int xilinx_info(xilinx_desc *desc)
                case xilinx_zynqmp:
                        printf("ZynqMP PL\n");
                        break;
-                       /* Add new family types here */
+               case xilinx_versal:
+                       printf("Versal PL\n");
+                       break;
+               /* Add new family types here */
                default:
                        printf ("Unknown family type, %d\n", desc->family);
                }
@@ -257,6 +261,9 @@ int xilinx_info(xilinx_desc *desc)
                case csu_dma:
                        printf("csu_dma configuration interface (ZynqMP)\n");
                        break;
+               case cfi:
+                       printf("CFI configuration interface (Versal)\n");
+                       break;
                        /* Add new interface types here */
                default:
                        printf ("Unsupported interface type, %d\n", desc->iface);