diff options
| author | Soby Mathew <soby.mathew@arm.com> | 2016-01-13 17:06:00 +0000 |
|---|---|---|
| committer | Soby Mathew <soby.mathew@arm.com> | 2016-04-27 16:59:20 +0100 |
| commit | 21a3973de044a640861cee92265be9191a76a462 (patch) | |
| tree | 54a903f9856479170f3e5b515e9ca9b1ab8b32d5 /plat/arm/board/fvp/fvp_common.c | |
| parent | 142ff9b5f5d80d0c5e5a235f5c80570a535c7e72 (diff) | |
| download | arm-trusted-firmware-21a3973de044a640861cee92265be9191a76a462.tar.gz | |
Remove support for legacy VE memory map in FVP
This patch removes support for legacy Versatile Express memory map for the
GIC peripheral in the FVP platform. The user guide is also updated for the
same.
Change-Id: Ib8cfb819083aca359e5b46b5757cb56cb0ea6533
Diffstat (limited to 'plat/arm/board/fvp/fvp_common.c')
| -rw-r--r-- | plat/arm/board/fvp/fvp_common.c | 25 |
1 files changed, 2 insertions, 23 deletions
diff --git a/plat/arm/board/fvp/fvp_common.c b/plat/arm/board/fvp/fvp_common.c index 1de99991..78782d43 100644 --- a/plat/arm/board/fvp/fvp_common.c +++ b/plat/arm/board/fvp/fvp_common.c @@ -37,10 +37,6 @@ #include <v2m_def.h> #include "../fvp_def.h" -#if (FVP_USE_GIC_DRIVER == FVP_GICV2) -extern gicv2_driver_data_t arm_gic_data; -#endif - /* Defines for GIC Driver build time selection */ #define FVP_GICV2 1 #define FVP_GICV3 2 @@ -159,26 +155,9 @@ void fvp_config_setup(void) */ switch (bld) { case BLD_GIC_VE_MMAP: -#if IMAGE_BL31 || IMAGE_BL32 -#if FVP_USE_GIC_DRIVER == FVP_GICV2 - /* - * If the FVP implements the VE compatible memory map, then the - * GICv2 driver must be included in the build. Update the platform - * data with the correct GICv2 base addresses before it is used - * to initialise the driver. - * - * This update of platform data is temporary and will be removed - * once VE memory map for FVP is no longer supported by Trusted - * Firmware. - */ - arm_gic_data.gicd_base = VE_GICD_BASE; - arm_gic_data.gicc_base = VE_GICC_BASE; - -#else - ERROR("Only GICv2 driver supported for VE memory map\n"); + ERROR("Legacy Versatile Express memory map for GIC peripheral" + " is not supported\n"); panic(); -#endif /* __FVP_USE_GIC_DRIVER == FVP_GICV2__ */ -#endif /* __IMAGE_BL31 || IMAGE_BL32__ */ break; case BLD_GIC_A53A57_MMAP: break; |