fpga: zynqmp: Enable PL bitstream loading support

Enable PL bitstream loading support for ZynqMP

Signed-off-by: Siva Durga Prasad Paladugu <sivadur@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>

diff --git a/board/xilinx/zynqmp/zynqmp.c b/board/xilinx/zynqmp/zynqmp.c
index 47c5d2599fda4376d5e8377a71d38965d878d690..576e4a46ef0ad94a9fceeb8df4cd2259b76bd2d4 100644 (file)
--- a/board/xilinx/zynqmp/zynqmp.c
+++ b/board/xilinx/zynqmp/zynqmp.c
@@ -15,13 +15,24 @@
 #include <asm/io.h>
 #include <usb.h>
 #include <dwc3-uboot.h>
+#include <zynqmppl.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
+#if defined(CONFIG_FPGA) && defined(CONFIG_FPGA_ZYNQMPPL)
+static xilinx_desc zynqmppl = XILINX_ZYNQMP_DESC;
+#endif
+
 int board_init(void)
 {
        printf("EL Level:\tEL%d\n", current_el());
 
+#if defined(CONFIG_FPGA) && defined(CONFIG_FPGA_ZYNQMPPL)
+       fpga_init();
+       /* FIXME FPGA size/id will be handled via SMCs */
+       fpga_add(fpga_xilinx, &zynqmppl);
+#endif
+
        return 0;
 }
 

diff --git a/configs/xilinx_zynqmp_ep_defconfig b/configs/xilinx_zynqmp_ep_defconfig
index 952d75b5aea3d1ee0d88bd19c609f82fba8e0623..b06f38f95ef42478ec259a9b2f00976daf2bf0ac 100644 (file)
--- a/configs/xilinx_zynqmp_ep_defconfig
+++ b/configs/xilinx_zynqmp_ep_defconfig
@@ -15,7 +15,6 @@ CONFIG_SYS_PROMPT="ZynqMP> "
 # CONFIG_CMD_ENV_EXISTS is not set
 # CONFIG_CMD_LOADB is not set
 # CONFIG_CMD_LOADS is not set
-# CONFIG_CMD_FPGA is not set
 # CONFIG_CMD_ITEST is not set
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_TFTPPUT=y

diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h
index 763ec5f1a2d57e42b6bc5b765b3b86098aca2e3f..8da7f74b937ed9652cf292095c71eae9697d0097 100644 (file)
--- a/include/configs/xilinx_zynqmp.h
+++ b/include/configs/xilinx_zynqmp.h
@@ -288,6 +288,10 @@
 
 #define CONFIG_ARM_SMC
 
+#define CONFIG_FPGA_ZYNQMPPL
+#define CONFIG_FPGA_XILINX
+#define CONFIG_FPGA
+
 #define CONFIG_SYS_BOOTM_LEN   (60 * 1024 * 1024)
 
 #define CONFIG_CMD_BOOTI