From c58b9a8e12a0f0a9542d8ccec33f4ec2be44123d Mon Sep 17 00:00:00 2001 From: Rupinderjit Singh Date: Tue, 23 Aug 2022 11:55:27 +0100 Subject: [PATCH] refactor(cpu): update IP names of Makalu CPU lib * ASM files are renamed to have public IP names in their filename. * updated other files to include ASM filename changes. Signed-off-by: Rupinderjit Singh Change-Id: Ie899c512b11fd7c4312e3a808bb6b9d2376cdb8c --- lib/cpus/aarch64/{cortex_makalu.S => cortex_a715.S} | 0 lib/cpus/aarch64/{cortex_makalu_elp_arm.S => cortex_x3.S} | 0 plat/arm/board/arm_fpga/platform.mk | 8 ++++---- plat/arm/board/fvp/platform.mk | 6 +++--- plat/arm/board/tc/platform.mk | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) rename lib/cpus/aarch64/{cortex_makalu.S => cortex_a715.S} (100%) rename lib/cpus/aarch64/{cortex_makalu_elp_arm.S => cortex_x3.S} (100%) diff --git a/lib/cpus/aarch64/cortex_makalu.S b/lib/cpus/aarch64/cortex_a715.S similarity index 100% rename from lib/cpus/aarch64/cortex_makalu.S rename to lib/cpus/aarch64/cortex_a715.S diff --git a/lib/cpus/aarch64/cortex_makalu_elp_arm.S b/lib/cpus/aarch64/cortex_x3.S similarity index 100% rename from lib/cpus/aarch64/cortex_makalu_elp_arm.S rename to lib/cpus/aarch64/cortex_x3.S diff --git a/plat/arm/board/arm_fpga/platform.mk b/plat/arm/board/arm_fpga/platform.mk index 084532ce2..a14a0d8c0 100644 --- a/plat/arm/board/arm_fpga/platform.mk +++ b/plat/arm/board/arm_fpga/platform.mk @@ -1,5 +1,5 @@ # -# Copyright (c) 2021, Arm Limited. All rights reserved. +# Copyright (c) 2021-2022, Arm Limited. All rights reserved. # # SPDX-License-Identifier: BSD-3-Clause # @@ -71,9 +71,9 @@ else lib/cpus/aarch64/cortex_a65.S \ lib/cpus/aarch64/cortex_a65ae.S \ lib/cpus/aarch64/cortex_a510.S \ - lib/cpus/aarch64/cortex_a710.S \ - lib/cpus/aarch64/cortex_makalu.S \ - lib/cpus/aarch64/cortex_makalu_elp_arm.S \ + lib/cpus/aarch64/cortex_a710.S \ + lib/cpus/aarch64/cortex_a715.S \ + lib/cpus/aarch64/cortex_x3.S \ lib/cpus/aarch64/cortex_a78c.S # AArch64/AArch32 cores diff --git a/plat/arm/board/fvp/platform.mk b/plat/arm/board/fvp/platform.mk index a7e27e87f..25397121b 100644 --- a/plat/arm/board/fvp/platform.mk +++ b/plat/arm/board/fvp/platform.mk @@ -135,9 +135,9 @@ else lib/cpus/aarch64/neoverse_demeter.S \ lib/cpus/aarch64/cortex_a78_ae.S \ lib/cpus/aarch64/cortex_a510.S \ - lib/cpus/aarch64/cortex_a710.S \ - lib/cpus/aarch64/cortex_makalu.S \ - lib/cpus/aarch64/cortex_makalu_elp_arm.S \ + lib/cpus/aarch64/cortex_a710.S \ + lib/cpus/aarch64/cortex_a715.S \ + lib/cpus/aarch64/cortex_x3.S \ lib/cpus/aarch64/cortex_a65.S \ lib/cpus/aarch64/cortex_a65ae.S \ lib/cpus/aarch64/cortex_a78c.S \ diff --git a/plat/arm/board/tc/platform.mk b/plat/arm/board/tc/platform.mk index e6c1c7c9a..1a1bc567b 100644 --- a/plat/arm/board/tc/platform.mk +++ b/plat/arm/board/tc/platform.mk @@ -73,8 +73,8 @@ endif # CPU libraries for TARGET_PLATFORM=1 ifeq (${TARGET_PLATFORM}, 1) TC_CPU_SOURCES += lib/cpus/aarch64/cortex_a510.S \ - lib/cpus/aarch64/cortex_makalu.S \ - lib/cpus/aarch64/cortex_makalu_elp_arm.S + lib/cpus/aarch64/cortex_a715.S \ + lib/cpus/aarch64/cortex_x3.S endif # CPU libraries for TARGET_PLATFORM=2