From e1dd360db8ca4b1c46c13c7a3f1a739c384a5f5c Mon Sep 17 00:00:00 2001 From: Sarat Chand Savitala Date: Tue, 28 Jul 2015 14:36:02 +0530 Subject: [PATCH] sw_apps:zynqmp_fsbl: Code cleanup involving emulation platforms Signed-off-by: Sarat Chand Savitala Acked-by: Krishna Chaitanya Patakamuri --- lib/sw_apps/zynqmp_fsbl/src/xfsbl_handoff.c | 23 ++++----------------- lib/sw_apps/zynqmp_fsbl/src/xfsbl_hw.h | 5 ----- lib/sw_apps/zynqmp_fsbl/src/xfsbl_main.c | 3 --- 3 files changed, 4 insertions(+), 27 deletions(-) diff --git a/lib/sw_apps/zynqmp_fsbl/src/xfsbl_handoff.c b/lib/sw_apps/zynqmp_fsbl/src/xfsbl_handoff.c index f9006e79..1514be43 100644 --- a/lib/sw_apps/zynqmp_fsbl/src/xfsbl_handoff.c +++ b/lib/sw_apps/zynqmp_fsbl/src/xfsbl_handoff.c @@ -750,25 +750,10 @@ u32 XFsbl_Handoff (XFsblPs * FsblInstancePtr, u32 PartitionNum, u32 EarlyHandoff XFsbl_Out32(XFSBL_ERROR_STATUS_REGISTER_OFFSET, XFSBL_COMPLETED); - if (XFSBL_PLATFORM == XFSBL_PLATFORM_VELOCE) - { - /** - * Flush the L1 data cache and L2 cache, Disable Data Cache - */ - Xil_DCacheDisable(); - XFsbl_Printf(DEBUG_GENERAL,"VeloceExit from FSBL \n\r"); -#ifdef XFSBL_A53 - XFsbl_Out32(0xFFFC0000U, 0x14000000U); -#else - XFsbl_Out32(0xFFFC0000U, 0xEAFFFFFEU); -#endif - XFsbl_Exit(0xFFFC0000U, XFSBL_HANDOFFEXIT); - } else { - /** - * Exit from FSBL - */ - XFsbl_HandoffExit(0U, XFSBL_NO_HANDOFFEXIT); - } + /** + * Exit from FSBL + */ + XFsbl_HandoffExit(0U, XFSBL_NO_HANDOFFEXIT); } /** diff --git a/lib/sw_apps/zynqmp_fsbl/src/xfsbl_hw.h b/lib/sw_apps/zynqmp_fsbl/src/xfsbl_hw.h index 0f83e154..a401b5fd 100644 --- a/lib/sw_apps/zynqmp_fsbl/src/xfsbl_hw.h +++ b/lib/sw_apps/zynqmp_fsbl/src/xfsbl_hw.h @@ -629,16 +629,11 @@ extern "C" { /** * Platform */ -#if 1 #define XFSBL_PLATFORM \ (Xil_In32(CSU_VERSION) & CSU_VERSION_PLATFORM_MASK ) -#else -#define XFSBL_PLATFORM XFSBL_PLATFORM_VELOCE -#endif #define XFSBL_PLATFORM_SILICON (0X00000000U) #define XFSBL_PLATFORM_REMUS (0X00001000U) -#define XFSBL_PLATFORM_VELOCE (0X00002000U) #define XFSBL_PLATFORM_QEMU (0X00003000U) /************************** Function Prototypes ******************************/ diff --git a/lib/sw_apps/zynqmp_fsbl/src/xfsbl_main.c b/lib/sw_apps/zynqmp_fsbl/src/xfsbl_main.c index dba514e1..93323848 100644 --- a/lib/sw_apps/zynqmp_fsbl/src/xfsbl_main.c +++ b/lib/sw_apps/zynqmp_fsbl/src/xfsbl_main.c @@ -320,9 +320,6 @@ void XFsbl_PrintFsblBanner(void ) } else if (XFSBL_PLATFORM == XFSBL_PLATFORM_REMUS) { XFsbl_Printf(DEBUG_GENERAL, "Platform: REMUS, "); - } else if (XFSBL_PLATFORM == XFSBL_PLATFORM_VELOCE) - { - XFsbl_Printf(DEBUG_GENERAL, "Platform: VELOCE, "); } else { XFsbl_Printf(DEBUG_GENERAL, "Platform Not identified \r\n"); }