From 3e34f20971b04b61d8e7921974010dafda0f554d Mon Sep 17 00:00:00 2001
From: Krishna Chaitanya Patakamuri <krishna.chaitanya.patakamuri@xilinx.com>
Date: Wed, 27 Aug 2014 12:31:50 +0530
Subject: [PATCH] sw_apps:zynq_fsbl: Changes for IAR compiler

Modified code for IAR compilation

Signed-off-by: Krishna Chaitanya Patakamuri <kpataka@xilinx.com>
---
 lib/sw_apps/zynq_fsbl/src/fsbl.h         | 2 ++
 lib/sw_apps/zynq_fsbl/src/fsbl_handoff.S | 2 +-
 lib/sw_apps/zynq_fsbl/src/main.c         | 6 ++++--
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/lib/sw_apps/zynq_fsbl/src/fsbl.h b/lib/sw_apps/zynq_fsbl/src/fsbl.h
index 64aec8c9..f3ff14e8 100644
--- a/lib/sw_apps/zynq_fsbl/src/fsbl.h
+++ b/lib/sw_apps/zynq_fsbl/src/fsbl.h
@@ -211,6 +211,8 @@
 * 						Resolution: Same as 773866
 * 						809336 Minor code cleanup
 * 						Resolution Minor code changes
+*        kc 08/27/14	820356 - FSBL compilation fails with IAR compiler
+* 						Resolution: Change of __asm__ to __asm
 * </pre>
 *
 * </pre>
diff --git a/lib/sw_apps/zynq_fsbl/src/fsbl_handoff.S b/lib/sw_apps/zynq_fsbl/src/fsbl_handoff.S
index 5fc8bd05..33494417 100644
--- a/lib/sw_apps/zynq_fsbl/src/fsbl_handoff.S
+++ b/lib/sw_apps/zynq_fsbl/src/fsbl_handoff.S
@@ -106,7 +106,7 @@ FsblHandoffExit:
 .Ldone: b		.Ldone					/* Paranoia: we should never get here */
 .end
 
-#elif defined (__ICCARM__)
+#elif defined (__IASMARM__)
 	
 	PUBLIC FsblHandoffJtagExit
 	
diff --git a/lib/sw_apps/zynq_fsbl/src/main.c b/lib/sw_apps/zynq_fsbl/src/main.c
index 567033d8..14891f17 100644
--- a/lib/sw_apps/zynq_fsbl/src/main.c
+++ b/lib/sw_apps/zynq_fsbl/src/main.c
@@ -93,7 +93,9 @@
 * 9.00a kc  04/16/14	Fix for CR#724166 - SetPpk() will fail on secure
 *		 									fallback unless FSBL* and FSBL
 *		 									are identical in length
-* 10.00a kc 07/24/14    Fix for CR#809336 - Minor code cleanup
+* 10.00a kc 07/24/14	Fix for CR#809336 - Minor code cleanup
+*        kc 08/27/14	Fix for CR#820356 - FSBL compilation fails with
+* 											IAR compiler
 * </pre>
 *
 * @note
@@ -624,7 +626,7 @@ void FsblFallback(void)
 	/*
 	 * Barrier for synchronization
 	 */
-		__asm__(
+		__asm(
 			"dsb\n\t"
 			"isb"
 		);