diff --git a/lib/sw_apps/zynqmp_fsbl/src/xfsbl_hw.h b/lib/sw_apps/zynqmp_fsbl/src/xfsbl_hw.h
index 7ac4440f..f9b1e5aa 100644
--- a/lib/sw_apps/zynqmp_fsbl/src/xfsbl_hw.h
+++ b/lib/sw_apps/zynqmp_fsbl/src/xfsbl_hw.h
@@ -142,14 +142,8 @@ extern "C" {
 /**
  * Register: EFUSE_SEC_CTRL
  */
-#define EFUSE_SEC_CTRL    ( ( EFUSE_BASEADDR ) + 0X00001000U )
-
-/**
- * Register: EFUSE_RSA_CTRL
- */
-#define EFUSE_RSA_CTRL    ( ( EFUSE_BASEADDR ) + 0X00001060U )
-#define EFUSE_RSA_CTRL_RSA_EN_MASK    0X00000001U
-
+#define EFUSE_SEC_CTRL    ( ( EFUSE_BASEADDR ) + 0X00001058U )
+#define EFUSE_SEC_CTRL_RSA_EN_MASK    0X03000000U
 
 /* csudma */
 
@@ -422,14 +416,14 @@ extern "C" {
 /**
  * Definition for SD to be included
  */
-#if !defined(FSBL_SD_EXCLUDE) & defined( XPAR_XSDPS_0_DEVICE_ID)
+#if (!defined(FSBL_SD_EXCLUDE) && defined( XPAR_XSDPS_0_DEVICE_ID))
 #define XFSBL_SD
 #endif
 
 /**
  * Definition for QSPI to be included
  */
-#if !defined(FSBL_QSPI_EXCLUDE) & defined(XPAR_XQSPIPS_0_DEVICE_ID)
+#if (!defined(FSBL_QSPI_EXCLUDE) && defined(XPAR_XQSPIPS_0_DEVICE_ID))
 #define XFSBL_QSPI
 #define XFSBL_QSPI_BASEADDRESS	XPAR_XQSPIPS_0_BASEADDR
 #endif
@@ -437,7 +431,7 @@ extern "C" {
 /**
  * Definition for NAND to be included
  */
-#if !defined(FSBL_NAND_EXCLUDE) & defined(XPAR_XNANDPS8_0_DEVICE_ID)
+#if (!defined(FSBL_NAND_EXCLUDE) && defined(XPAR_XNANDPS8_0_DEVICE_ID))
 #define XFSBL_NAND
 #endif
 
diff --git a/lib/sw_apps/zynqmp_fsbl/src/xfsbl_initialization.c b/lib/sw_apps/zynqmp_fsbl/src/xfsbl_initialization.c
index 87417d0d..4e9d0984 100644
--- a/lib/sw_apps/zynqmp_fsbl/src/xfsbl_initialization.c
+++ b/lib/sw_apps/zynqmp_fsbl/src/xfsbl_initialization.c
@@ -672,8 +672,8 @@ static u32 XFsbl_ValidateHeader(XFsblPs * FsblInstancePtr)
 	/**
 	 * Read Efuse bit and check Boot Header for Authentication
 	 */
-	EfuseCtrl = XFsbl_In32(EFUSE_RSA_CTRL);
-	if (((EfuseCtrl & EFUSE_RSA_CTRL_RSA_EN_MASK) != 0) ||
+	EfuseCtrl = XFsbl_In32(EFUSE_SEC_CTRL);
+	if (((EfuseCtrl & EFUSE_SEC_CTRL_RSA_EN_MASK) != 0) ||
 	    ((BootHdrAttrb & XIH_BH_IMAGE_ATTRB_RSA_MASK)
 		== XIH_BH_IMAGE_ATTRB_RSA_MASK))
 	{