This is an automated email from the ASF dual-hosted git repository.

xiaoxiang781216 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git

commit 4c19a69ccd8025187c1a1aaf85eb1019cab90a91
Author: Yanfeng Liu <[email protected]>
AuthorDate: Tue Feb 18 10:55:27 2025 +0800

    arch/armv8-r: rename arm_gic.h as gic.h
    
    This is to use same GIC header naming convention like armv7-a and
    armv7-r and has been tested with `fvp-armv8r-aarch32:nsh` target.
    
    Signed-off-by: Yanfeng Liu <[email protected]>
---
 arch/arm/src/armv8-r/arm_doirq.c          | 2 +-
 arch/arm/src/armv8-r/arm_gicv3.c          | 2 +-
 arch/arm/src/armv8-r/{arm_gic.h => gic.h} | 8 ++++----
 arch/arm/src/fvp-v8r-aarch32/fvp_boot.c   | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/arch/arm/src/armv8-r/arm_doirq.c b/arch/arm/src/armv8-r/arm_doirq.c
index 39803ce4eb0..d7fc2db901c 100644
--- a/arch/arm/src/armv8-r/arm_doirq.c
+++ b/arch/arm/src/armv8-r/arm_doirq.c
@@ -36,7 +36,7 @@
 #include <sched/sched.h>
 
 #include "arm_internal.h"
-#include "arm_gic.h"
+#include "gic.h"
 
 /****************************************************************************
  * Public Functions
diff --git a/arch/arm/src/armv8-r/arm_gicv3.c b/arch/arm/src/armv8-r/arm_gicv3.c
index 3e9b5adb4de..b6caf8be4e1 100644
--- a/arch/arm/src/armv8-r/arm_gicv3.c
+++ b/arch/arm/src/armv8-r/arm_gicv3.c
@@ -36,7 +36,7 @@
 #include <sched/sched.h>
 
 #include "arm_internal.h"
-#include "arm_gic.h"
+#include "gic.h"
 
 /***************************************************************************
  * Pre-processor Definitions
diff --git a/arch/arm/src/armv8-r/arm_gic.h b/arch/arm/src/armv8-r/gic.h
similarity index 98%
rename from arch/arm/src/armv8-r/arm_gic.h
rename to arch/arm/src/armv8-r/gic.h
index eb03f48fd4a..a55dfb71873 100644
--- a/arch/arm/src/armv8-r/arm_gic.h
+++ b/arch/arm/src/armv8-r/gic.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/arm/src/armv8-r/arm_gic.h
+ * arch/arm/src/armv8-r/gic.h
  *
  * SPDX-License-Identifier: Apache-2.0
  *
@@ -21,8 +21,8 @@
  *
  ****************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_ARMV8_R_ARM_GIC_H
-#define __ARCH_ARM_SRC_ARMV8_R_ARM_GIC_H
+#ifndef __ARCH_ARM_SRC_ARMV8_R_GIC_H
+#define __ARCH_ARM_SRC_ARMV8_R_GIC_H
 
 /****************************************************************************
  * Included Files
@@ -364,4 +364,4 @@ static inline uint64_t arm_get_mpid(int cpu)
 #  define arm_get_mpid(cpu) GET_MPIDR()
 #endif /* CONFIG_SMP */
 
-#endif /* __ARCH_ARM_SRC_ARMV8_R_ARM_GIC_H */
+#endif /* __ARCH_ARM_SRC_ARMV8_R_GIC_H */
diff --git a/arch/arm/src/fvp-v8r-aarch32/fvp_boot.c 
b/arch/arm/src/fvp-v8r-aarch32/fvp_boot.c
index fd13aad1a88..1d1fd4bfcb2 100644
--- a/arch/arm/src/fvp-v8r-aarch32/fvp_boot.c
+++ b/arch/arm/src/fvp-v8r-aarch32/fvp_boot.c
@@ -36,7 +36,7 @@
 
 #include "arm_internal.h"
 
-#include "arm_gic.h"
+#include "gic.h"
 #include "chip.h"
 #include "fvp_boot.h"
 

Reply via email to