From 03cb8fbb5d769affd508c97a5327544e487eb1a9 Mon Sep 17 00:00:00 2001 From: Ryan Harkin Date: Wed, 15 Jan 2014 17:37:25 +0000 Subject: [PATCH] fvp: rename fvp_* files to plat_* The FVP platform has a few filenames that begin with fvp_. These are renamed to plat_ to make it easier to use the FVP port as a template. Change-Id: I601e6256d5ef3bae81a2e1f5df6de56db5b27069 Signed-off-by: Ryan Harkin --- docs/porting-guide.md | 8 ++++---- plat/fvp/aarch64/{fvp_common.c => plat_common.c} | 0 .../aarch64/{fvp_helpers.S => plat_helpers.S} | 0 plat/fvp/{fvp_gic.c => plat_gic.c} | 0 plat/fvp/{fvp_pm.c => plat_pm.c} | 0 plat/fvp/{fvp_topology.c => plat_topology.c} | 0 plat/fvp/platform.mk | 16 ++++++++-------- 7 files changed, 12 insertions(+), 12 deletions(-) rename plat/fvp/aarch64/{fvp_common.c => plat_common.c} (100%) rename plat/fvp/aarch64/{fvp_helpers.S => plat_helpers.S} (100%) rename plat/fvp/{fvp_gic.c => plat_gic.c} (100%) rename plat/fvp/{fvp_pm.c => plat_pm.c} (100%) rename plat/fvp/{fvp_topology.c => plat_topology.c} (100%) diff --git a/docs/porting-guide.md b/docs/porting-guide.md index 7b2e7d23..b4253e67 100644 --- a/docs/porting-guide.md +++ b/docs/porting-guide.md @@ -177,7 +177,7 @@ constants defined. In the ARM FVP port, this file is found in The following mandatory modifications may be implemented in any file the implementer chooses. In the ARM FVP port, they are implemented in -[../plat/fvp/aarch64/fvp_common.c]. +[../plat/fvp/aarch64/plat_common.c]. * **Variable : unsigned char platform_normal_stacks[X][Y]** @@ -836,7 +836,7 @@ handler routines for platform-specific power management actions by populating the passed pointer with a pointer to BL3-1's private `plat_pm_ops` structure. A description of each member of this structure is given below. Please refer to -the ARM FVP specific implementation of these handlers in [../plat/fvp/fvp_pm.c] +the ARM FVP specific implementation of these handlers in [../plat/fvp/plat_pm.c] as an example. A platform port may choose not implement some of the power management operations. For example, the ARM FVP port does not implement the `affinst_standby()` function. @@ -991,6 +991,6 @@ _Copyright (c) 2013-2014, ARM Limited and Contributors. All rights reserved._ [../plat/common/aarch64/platform_helpers.S]: ../plat/common/aarch64/platform_helpers.S [../plat/fvp/platform.h]: ../plat/fvp/platform.h -[../plat/fvp/aarch64/fvp_common.c]: ../plat/fvp/aarch64/fvp_common.c -[../plat/fvp/fvp_pm.c]: ../plat/fvp/fvp_pm.c +[../plat/fvp/aarch64/plat_common.c]: ../plat/fvp/aarch64/plat_common.c +[../plat/fvp/plat_pm.c]: ../plat/fvp/plat_pm.c [../include/runtime_svc.h]: ../include/runtime_svc.h diff --git a/plat/fvp/aarch64/fvp_common.c b/plat/fvp/aarch64/plat_common.c similarity index 100% rename from plat/fvp/aarch64/fvp_common.c rename to plat/fvp/aarch64/plat_common.c diff --git a/plat/fvp/aarch64/fvp_helpers.S b/plat/fvp/aarch64/plat_helpers.S similarity index 100% rename from plat/fvp/aarch64/fvp_helpers.S rename to plat/fvp/aarch64/plat_helpers.S diff --git a/plat/fvp/fvp_gic.c b/plat/fvp/plat_gic.c similarity index 100% rename from plat/fvp/fvp_gic.c rename to plat/fvp/plat_gic.c diff --git a/plat/fvp/fvp_pm.c b/plat/fvp/plat_pm.c similarity index 100% rename from plat/fvp/fvp_pm.c rename to plat/fvp/plat_pm.c diff --git a/plat/fvp/fvp_topology.c b/plat/fvp/plat_topology.c similarity index 100% rename from plat/fvp/fvp_topology.c rename to plat/fvp/plat_topology.c diff --git a/plat/fvp/platform.mk b/plat/fvp/platform.mk index 1765801d..5da2acdf 100644 --- a/plat/fvp/platform.mk +++ b/plat/fvp/platform.mk @@ -62,20 +62,20 @@ PLAT_BL_COMMON_OBJS := semihosting_call.o \ BL1_OBJS += bl1_plat_setup.o \ bl1_plat_helpers.o \ - fvp_helpers.o \ - fvp_common.o \ + plat_helpers.o \ + plat_common.o \ cci400.o BL2_OBJS += bl2_plat_setup.o \ - fvp_common.o + plat_common.o BL31_OBJS += bl31_plat_setup.o \ - fvp_helpers.o \ - fvp_common.o \ - fvp_pm.o \ + plat_helpers.o \ + plat_common.o \ + plat_pm.o \ + plat_topology.o \ + plat_gic.o \ fvp_pwrc.o \ - fvp_topology.o \ - fvp_gic.o \ cci400.o \ gic_v2.o \ gic_v3.o -- 2.30.2