From a79f0e83d145dd7e9c5c38cc5a625eecb3e72311 Mon Sep 17 00:00:00 2001
From: Siva Durga Prasad Paladugu <siva.durga.paladugu@xilinx.com>
Date: Fri, 13 Apr 2018 12:15:50 +0530
Subject: [PATCH] fpga: Fix travis build issues with sys_proto.h inclusion

This patch fixes the travis build issue for platforms which dont
have sys_proto.h.

Signed-off-by: Siva Durga Prasad Paladugu <siva.durga.paladugu@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
---
 arch/arm/include/asm/arch-zynqmp/sys_proto.h |  3 ---
 cmd/fpga.c                                   | 11 +++++------
 drivers/fpga/zynqmppl.c                      |  2 +-
 include/fpga.h                               |  4 ++++
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/arch/arm/include/asm/arch-zynqmp/sys_proto.h b/arch/arm/include/asm/arch-zynqmp/sys_proto.h
index 0623b9bce7..fb14b21046 100644
--- a/arch/arm/include/asm/arch-zynqmp/sys_proto.h
+++ b/arch/arm/include/asm/arch-zynqmp/sys_proto.h
@@ -20,10 +20,7 @@
 #define ZYNQMP_FPGA_BIT_ENC_DEV_KEY	4
 #define ZYNQMP_FPGA_BIT_NS		5
 
-#define ZYNQMP_FPGA_ENC_USR_KEY	1
 #define ZYNQMP_FPGA_AUTH_DDR	1
-#define ZYNQMP_FPGA_NO_ENC	2
-#define ZYNQMP_FPGA_NO_AUTH	2
 
 enum {
 	IDCODE,
diff --git a/cmd/fpga.c b/cmd/fpga.c
index b72ea7234c..5faf5701ca 100644
--- a/cmd/fpga.c
+++ b/cmd/fpga.c
@@ -13,7 +13,6 @@
 #include <fpga.h>
 #include <fs.h>
 #include <malloc.h>
-#include <asm/arch/sys_proto.h>
 
 /* Local functions */
 static int fpga_get_op(char *opstr);
@@ -82,15 +81,15 @@ int do_fpga(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[])
 					     simple_strtoull(argv[7], NULL, 16);
 	case 7:
 		fpga_sec_info.encflag = (u8)simple_strtoul(argv[6], NULL, 16);
-		if (((fpga_sec_info.encflag == ZYNQMP_FPGA_ENC_USR_KEY) &&
+		if (((fpga_sec_info.encflag == FPGA_ENC_USR_KEY) &&
 		     !fpga_sec_info.userkey_addr) ||
-		    (fpga_sec_info.encflag > ZYNQMP_FPGA_NO_ENC)) {
+		    (fpga_sec_info.encflag > FPGA_NO_ENC)) {
 			op = FPGA_NONE;
 			break;
 		}
 	case 6:
 		fpga_sec_info.authflag = (u8)simple_strtoul(argv[5], NULL, 16);
-		if (fpga_sec_info.authflag > ZYNQMP_FPGA_NO_AUTH) {
+		if (fpga_sec_info.authflag > FPGA_NO_AUTH) {
 			op = FPGA_NONE;
 			break;
 		}
@@ -172,8 +171,8 @@ int do_fpga(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[])
 #endif
 #if defined(CONFIG_CMD_FPGA_LOAD_SECURE)
 	case FPGA_LOADS:
-		if (fpga_sec_info.authflag == ZYNQMP_FPGA_NO_AUTH &&
-		    fpga_sec_info.encflag == ZYNQMP_FPGA_NO_ENC) {
+		if (fpga_sec_info.authflag == FPGA_NO_AUTH &&
+		    fpga_sec_info.encflag == FPGA_NO_ENC) {
 			wrong_parms = 1;
 			break;
 		}
diff --git a/drivers/fpga/zynqmppl.c b/drivers/fpga/zynqmppl.c
index a92cca4cbb..8b3034708b 100644
--- a/drivers/fpga/zynqmppl.c
+++ b/drivers/fpga/zynqmppl.c
@@ -239,7 +239,7 @@ static int zynqmp_loads(xilinx_desc *desc, const void *buf, size_t bsize,
 		flag |= BIT(ZYNQMP_FPGA_BIT_ENC_DEV_KEY);
 
 	if (fpga_sec_info->userkey_addr &&
-	    fpga_sec_info->encflag == ZYNQMP_FPGA_ENC_USR_KEY) {
+	    fpga_sec_info->encflag == FPGA_ENC_USR_KEY) {
 		flush_dcache_range((ulong)fpga_sec_info->userkey_addr,
 				   (ulong)fpga_sec_info->userkey_addr +
 				   KEY_PTR_LEN);
diff --git a/include/fpga.h b/include/fpga.h
index 8931d019b0..7050cba564 100644
--- a/include/fpga.h
+++ b/include/fpga.h
@@ -21,6 +21,10 @@
 /* device numbers must be non-negative */
 #define FPGA_INVALID_DEVICE	-1
 
+#define FPGA_ENC_USR_KEY	1
+#define FPGA_NO_ENC		2
+#define FPGA_NO_AUTH		2
+
 /* root data type defintions */
 typedef enum {			/* typedef fpga_type */
 	fpga_min_type,		/* range check value */