From 510dc79c859bab3291e97ae924d836bf40700fd7 Mon Sep 17 00:00:00 2001 From: Sandrine Bailleux Date: Fri, 18 Mar 2022 12:44:27 +0100 Subject: [PATCH] refactor(corstone700): namespace MHU driver filenames There are plans to contribute a generic MHU driver to the TF-A code base in the short term. In preparation for this, rename the Corstone-700 MHU driver source files and prefix them with the name of the platform to avoid any ambiguity or name clashes with the upcoming generic MHU driver. Also rename the header guard accordingly. This renaming is inline with other platform-specific MHU drivers, such as the ones used on Broadcom [1], Socionext [2] or Amlogic [3] platforms. [1] plat/brcm/common/brcm_mhu.h [2] plat/socionext/synquacer/drivers/mhu/sq_mhu.h [3] plat/amlogic/common/aml_mhu.c Change-Id: I8a5e5b16e7c19bf931a90422dfca8f6a2a0663b4 Signed-off-by: Sandrine Bailleux --- plat/arm/board/corstone700/common/corstone700_plat.c | 4 ++-- .../common/drivers/mhu/{mhu.c => corstone700_mhu.c} | 4 ++-- .../common/drivers/mhu/{mhu.h => corstone700_mhu.h} | 8 ++++---- plat/arm/board/corstone700/platform.mk | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) rename plat/arm/board/corstone700/common/drivers/mhu/{mhu.c => corstone700_mhu.c} (96%) rename plat/arm/board/corstone700/common/drivers/mhu/{mhu.h => corstone700_mhu.h} (86%) diff --git a/plat/arm/board/corstone700/common/corstone700_plat.c b/plat/arm/board/corstone700/common/corstone700_plat.c index 629f076ba..dd7531d51 100644 --- a/plat/arm/board/corstone700/common/corstone700_plat.c +++ b/plat/arm/board/corstone700/common/corstone700_plat.c @@ -1,12 +1,12 @@ /* - * Copyright (c) 2019-2020, Arm Limited and Contributors. All rights reserved. + * Copyright (c) 2019-2022, Arm Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ #include -#include +#include #include #include #include diff --git a/plat/arm/board/corstone700/common/drivers/mhu/mhu.c b/plat/arm/board/corstone700/common/drivers/mhu/corstone700_mhu.c similarity index 96% rename from plat/arm/board/corstone700/common/drivers/mhu/mhu.c rename to plat/arm/board/corstone700/common/drivers/mhu/corstone700_mhu.c index 2231d1173..832cfb732 100644 --- a/plat/arm/board/corstone700/common/drivers/mhu/mhu.c +++ b/plat/arm/board/corstone700/common/drivers/mhu/corstone700_mhu.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2020, ARM Limited. All rights reserved. + * Copyright (c) 2019-2022, Arm Limited. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -12,7 +12,7 @@ #include #include -#include "mhu.h" +#include "corstone700_mhu.h" #include #include diff --git a/plat/arm/board/corstone700/common/drivers/mhu/mhu.h b/plat/arm/board/corstone700/common/drivers/mhu/corstone700_mhu.h similarity index 86% rename from plat/arm/board/corstone700/common/drivers/mhu/mhu.h rename to plat/arm/board/corstone700/common/drivers/mhu/corstone700_mhu.h index 3808746e9..7f14ca5a2 100644 --- a/plat/arm/board/corstone700/common/drivers/mhu/mhu.h +++ b/plat/arm/board/corstone700/common/drivers/mhu/corstone700_mhu.h @@ -1,11 +1,11 @@ /* - * Copyright (c) 2019-2020, ARM Limited. All rights reserved. + * Copyright (c) 2019-2022, Arm Limited. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef MHU_H -#define MHU_H +#ifndef CORSTONE700_MHU_H +#define CORSTONE700_MHU_H #define MHU_POLL_INTR_STAT_TIMEOUT 50000 /*timeout value in us*/ @@ -34,4 +34,4 @@ void mhu_secure_message_send(uintptr_t address, void mhu_secure_message_end(uintptr_t address, unsigned int slot_id); void mhu_secure_init(void); -#endif /* MHU_H */ +#endif /* CORSTONE700_MHU_H */ diff --git a/plat/arm/board/corstone700/platform.mk b/plat/arm/board/corstone700/platform.mk index 9a8d38c11..75833f651 100644 --- a/plat/arm/board/corstone700/platform.mk +++ b/plat/arm/board/corstone700/platform.mk @@ -1,5 +1,5 @@ # -# Copyright (c) 2019-2020, Arm Limited and Contributors. All rights reserved. +# Copyright (c) 2019-2022, Arm Limited and Contributors. All rights reserved. # # SPDX-License-Identifier: BSD-3-Clause # @@ -17,7 +17,7 @@ BL32_SOURCES += plat/arm/common/aarch32/arm_helpers.S \ lib/xlat_tables/aarch32/xlat_tables.c \ lib/xlat_tables/xlat_tables_common.c \ ${CORSTONE700_CPU_LIBS} \ - plat/arm/board/corstone700/common/drivers/mhu/mhu.c + plat/arm/board/corstone700/common/drivers/mhu/corstone700_mhu.c PLAT_INCLUDES := -Iplat/arm/board/corstone700/common/include \ -Iinclude/plat/arm/common \