Merge tag 'xilinx-for-v2020.01' of https://gitlab.denx.de/u-boot/custodians/u-boot...

[platform/kernel/u-boot.git] / drivers / fpga / zynqmppl.c

diff --git a/drivers/fpga/zynqmppl.c b/drivers/fpga/zynqmppl.c
index 22bfdd8..c267027 100644 (file)
--- a/drivers/fpga/zynqmppl.c
+++ b/drivers/fpga/zynqmppl.c
@@ -8,6 +8,7 @@
 #include <console.h>
 #include <common.h>
 #include <zynqmppl.h>
+#include <zynqmp_firmware.h>
 #include <linux/sizes.h>
 #include <asm/arch/sys_proto.h>
 #include <memalign.h>
@@ -151,9 +152,9 @@ static ulong zynqmp_align_dma_buffer(u32 *buf, u32 len, u32 swap)
 
                buf = new_buf;
        } else if ((swap != SWAP_DONE) &&
-                  (zynqmp_pmufw_version() <= PMUFW_V1_0)) {
+                  (zynqmp_firmware_version() <= PMUFW_V1_0)) {
                /* For bitstream which are aligned */
-               u32 *new_buf = (u32 *)buf;
+               new_buf = buf;
 
                printf("%s: Bitstream is not swapped(%d) - swap it\n", __func__,
                       swap);
@@ -204,7 +205,7 @@ static int zynqmp_load(xilinx_desc *desc, const void *buf, size_t bsize,
        u32 ret_payload[PAYLOAD_ARG_CNT];
        bool xilfpga_old = false;
 
-       if (zynqmp_pmufw_version() <= PMUFW_V1_0) {
+       if (zynqmp_firmware_version() <= PMUFW_V1_0) {
                puts("WARN: PMUFW v1.0 or less is detected\n");
                puts("WARN: Not all bitstream formats are supported\n");
                puts("WARN: Please upgrade PMUFW\n");