From bc149bfcaeecb947a8a631715c66c712b2cb9436 Mon Sep 17 00:00:00 2001 From: Soby Mathew Date: Thu, 7 Jul 2016 08:45:56 +0100 Subject: [PATCH] Move `arm_common.c` out of aarch64 folder This patch moves the `arm_common.c` file from `plat/arm/common/aarch64/` to the parent directory since the functions implemented in the file are not AArch64 specific. The platform makefiles are also modified for this change. Change-Id: I776d2e4958f59041476cf2f53a9adb5b2d304ee0 --- plat/arm/common/{aarch64 => }/arm_common.c | 0 plat/arm/common/arm_common.mk | 2 +- plat/xilinx/zynqmp/platform.mk | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) rename plat/arm/common/{aarch64 => }/arm_common.c (100%) diff --git a/plat/arm/common/aarch64/arm_common.c b/plat/arm/common/arm_common.c similarity index 100% rename from plat/arm/common/aarch64/arm_common.c rename to plat/arm/common/arm_common.c diff --git a/plat/arm/common/arm_common.mk b/plat/arm/common/arm_common.mk index 249a40684..03b9fe47b 100644 --- a/plat/arm/common/arm_common.mk +++ b/plat/arm/common/arm_common.mk @@ -97,8 +97,8 @@ PLAT_INCLUDES += -Iinclude/common/tbbr \ PLAT_BL_COMMON_SOURCES += lib/xlat_tables/xlat_tables_common.c \ lib/xlat_tables/aarch64/xlat_tables.c \ - plat/arm/common/aarch64/arm_common.c \ plat/arm/common/aarch64/arm_helpers.S \ + plat/arm/common/arm_common.c \ plat/common/aarch64/plat_common.c BL1_SOURCES += drivers/arm/sp805/sp805.c \ diff --git a/plat/xilinx/zynqmp/platform.mk b/plat/xilinx/zynqmp/platform.mk index b27586f77..7cfb15950 100644 --- a/plat/xilinx/zynqmp/platform.mk +++ b/plat/xilinx/zynqmp/platform.mk @@ -68,9 +68,9 @@ PLAT_BL_COMMON_SOURCES := lib/xlat_tables/xlat_tables_common.c \ drivers/arm/gic/v2/gicv2_helpers.c \ drivers/cadence/uart/cdns_console.S \ drivers/console/console.S \ - plat/arm/common/aarch64/arm_common.c \ plat/arm/common/aarch64/arm_helpers.S \ plat/arm/common/arm_cci.c \ + plat/arm/common/arm_common.c \ plat/arm/common/arm_gicv2.c \ plat/common/plat_gicv2.c \ plat/common/aarch64/plat_common.c \