From 61ea3dd4bb7b6d7bca8b846f2752e6ff2a7c6dc2 Mon Sep 17 00:00:00 2001 From: Krishna Chaitanya Date: Fri, 25 Jul 2014 16:12:38 +0530 Subject: [PATCH] sw_apps:zynq_fsbl: Updated the PCAP defines with driver defines Updated the PCAP FSBL defines with driver definitions Signed-off-by: Krishna Chaitanya Acked-by: Nirmala Pelluri --- lib/sw_apps/zynq_fsbl/src/main.c | 4 ++-- lib/sw_apps/zynq_fsbl/src/pcap.c | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/lib/sw_apps/zynq_fsbl/src/main.c b/lib/sw_apps/zynq_fsbl/src/main.c index 9027451b..f4e0cc5a 100644 --- a/lib/sw_apps/zynq_fsbl/src/main.c +++ b/lib/sw_apps/zynq_fsbl/src/main.c @@ -355,7 +355,7 @@ int main(void) /* * Check for AES source key */ - if (PcapCtrlRegVal & PCAP_CTRL_PCFG_AES_FUSE_EFUSE_MASK) { + if (PcapCtrlRegVal & XDCFG_CTRL_PCFG_AES_FUSE_MASK) { /* * For E-Fuse AES encryption Watch dog Timer disabled and * User not allowed to do system reset @@ -641,7 +641,7 @@ void FsblFallback(void) /* * Check for AES source key */ - if (PcapCtrlRegVal & PCAP_CTRL_PCFG_AES_FUSE_EFUSE_MASK) { + if (PcapCtrlRegVal & XDCFG_CTRL_PCFG_AES_FUSE_MASK) { /* * Next valid image search can happen only * when system initialization done diff --git a/lib/sw_apps/zynq_fsbl/src/pcap.c b/lib/sw_apps/zynq_fsbl/src/pcap.c index 791d06a1..a2f3f23c 100644 --- a/lib/sw_apps/zynq_fsbl/src/pcap.c +++ b/lib/sw_apps/zynq_fsbl/src/pcap.c @@ -71,6 +71,7 @@ * and PCAP_PR bits are not modified * 8.00a kc 2/20/14 Fix for CR#775631 - FSBL: FsblGetGlobalTimer() * is not proper +* 10.00a kc 07/24/14 Fix for CR#809336 - Minor code cleanup * * * @note @@ -436,7 +437,7 @@ void FabricInit(void) * Check for AES source key */ PcapCtrlRegVal = XDcfg_GetControlRegister(DcfgInstPtr); - if (PcapCtrlRegVal & PCAP_CTRL_PCFG_AES_FUSE_EFUSE_MASK) { + if (PcapCtrlRegVal & XDCFG_CTRL_PCFG_AES_FUSE_MASK) { /* * 5msec delay */ @@ -452,7 +453,7 @@ void FabricInit(void) /* * Check for AES source key */ - if (PcapCtrlRegVal & PCAP_CTRL_PCFG_AES_FUSE_EFUSE_MASK) { + if (PcapCtrlRegVal & XDCFG_CTRL_PCFG_AES_FUSE_MASK) { /* * 5msec delay */