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>

diff --git a/arch/arm/include/asm/arch-zynqmp/sys_proto.h b/arch/arm/include/asm/arch-zynqmp/sys_proto.h
index 0623b9bce7ca805239dfb784f72516747ec39601..fb14b210460934ec33f86a1177a1cc59422b14c3 100644 (file)
--- 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 b72ea7234c17e8226fef5edd5d7982ee18488eb3..5faf5701caa6d756d1532f71846687a56c179ade 100644 (file)
--- 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 a92cca4cbbc79d5b8c6f2a87dade5272509b45c1..8b3034708b2a94634a014e9413a0a73fcb396af8 100644 (file)
--- 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 8931d019b01f856e2909ca93f4cf79ba8a8d8e57..7050cba5648d82ad8051dc5fad238a95a8cc7fa5 100644 (file)
--- 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 */