Merge https://source.denx.de/u-boot/custodians/u-boot-usb

[thirdparty/u-boot.git] / include / zynqmppl.h

diff --git a/include/zynqmppl.h b/include/zynqmppl.h
index 5214db99fba769b2ae8dbeba111cefacc7f2cced..3fd334a54d35364924ff54816055099c4dc09df3 100644 (file)
--- a/include/zynqmppl.h
+++ b/include/zynqmppl.h
@@ -1,17 +1,15 @@
 /* SPDX-License-Identifier: GPL-2.0 */
 /*
  * (C) Copyright 2015 Xilinx, Inc,
- * Michal Simek <michal.simek@xilinx.com>
+ * Michal Simek <michal.simek@amd.com>
  */
 
 #ifndef _ZYNQMPPL_H_
 #define _ZYNQMPPL_H_
 
 #include <xilinx.h>
+#include <linux/bitops.h>
 
-#define ZYNQMP_SIP_SVC_CSU_DMA_CHIPID          0xC2000018
-#define ZYNQMP_SIP_SVC_PM_FPGA_LOAD            0xC2000016
-#define ZYNQMP_SIP_SVC_PM_FPGA_STATUS          0xC2000017
 #define ZYNQMP_FPGA_OP_INIT                    (1 << 0)
 #define ZYNQMP_FPGA_OP_LOAD                    (1 << 1)
 #define ZYNQMP_FPGA_OP_DONE                    (1 << 2)
@@ -27,7 +25,12 @@
 
 extern struct xilinx_fpga_op zynqmp_op;
 
-#define XILINX_ZYNQMP_DESC \
-{ xilinx_zynqmp, csu_dma, 1, &zynqmp_op, 0, &zynqmp_op }
+#if CONFIG_IS_ENABLED(FPGA_LOAD_SECURE)
+#define ZYNQMP_FPGA_FLAGS      (FPGA_LEGACY | \
+                                FPGA_XILINX_ZYNQMP_DDRAUTH | \
+                                FPGA_XILINX_ZYNQMP_ENC)
+#else
+#define ZYNQMP_FPGA_FLAGS      (FPGA_LEGACY)
+#endif
 
 #endif /* _ZYNQMPPL_H_ */