From 50e6dcb1e06fd37b8366c9e25b6a87584cf5c449 Mon Sep 17 00:00:00 2001
From: simbit18 <101105604+simbit18@users.noreply.github.com>
Date: Wed, 13 Sep 2023 15:53:27 +0200
Subject: [PATCH] Fix nuttx coding style

Correct forming guard names
---
 arch/arm64/include/imx8/chip.h                            | 4 ++--
 arch/arm64/include/imx8/irq.h                             | 6 +++---
 .../fvp-v8r-aarch32/fvp-armv8r-aarch32/src/fvp-armv8r.h   | 8 ++++----
 boards/arm64/fvp-v8r/fvp-armv8r/src/fvp-armv8r.h          | 6 +++---
 boards/arm64/imx8/imx8qm-mek/include/board_memorymap.h    | 6 +++---
 boards/arm64/imx8/imx8qm-mek/src/imx8qm-mek.h             | 6 +++---
 6 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/arch/arm64/include/imx8/chip.h b/arch/arm64/include/imx8/chip.h
index b952f1d88c..e38678f312 100644
--- a/arch/arm64/include/imx8/chip.h
+++ b/arch/arm64/include/imx8/chip.h
@@ -18,8 +18,8 @@
  *
  ****************************************************************************/
 
-#ifndef __ARCH_ARM64_INCLUDE_IMX8_CHIP_H__
-#define __ARCH_ARM64_INCLUDE_IMX8_CHIP_H__
+#ifndef __ARCH_ARM64_INCLUDE_IMX8_CHIP_H
+#define __ARCH_ARM64_INCLUDE_IMX8_CHIP_H
 
 /****************************************************************************
  * Included Files
diff --git a/arch/arm64/include/imx8/irq.h b/arch/arm64/include/imx8/irq.h
index 4bd4445063..795aeba462 100644
--- a/arch/arm64/include/imx8/irq.h
+++ b/arch/arm64/include/imx8/irq.h
@@ -22,8 +22,8 @@
  * only indirectly through nuttx/irq.h
  */
 
-#ifndef __ARCH_ARM64_INCLUDE_IMX8_IRQ_H__
-#define __ARCH_ARM64_INCLUDE_IMX8_IRQ_H__
+#ifndef __ARCH_ARM64_INCLUDE_IMX8_IRQ_H
+#define __ARCH_ARM64_INCLUDE_IMX8_IRQ_H
 
 /****************************************************************************
  * Pre-processor Definitions
@@ -31,4 +31,4 @@
 
 #define NR_IRQS  512                 /* Total number of interrupts */
 
-#endif /* __ARCH_ARM64_INCLUDE_IMX8_IRQ_H__ */
+#endif /* __ARCH_ARM64_INCLUDE_IMX8_IRQ_H */
diff --git a/boards/arm/fvp-v8r-aarch32/fvp-armv8r-aarch32/src/fvp-armv8r.h b/boards/arm/fvp-v8r-aarch32/fvp-armv8r-aarch32/src/fvp-armv8r.h
index 4867669570..00435994f5 100644
--- a/boards/arm/fvp-v8r-aarch32/fvp-armv8r-aarch32/src/fvp-armv8r.h
+++ b/boards/arm/fvp-v8r-aarch32/fvp-armv8r-aarch32/src/fvp-armv8r.h
@@ -18,8 +18,8 @@
  *
  ****************************************************************************/
 
-#ifndef __BOARDS_ARM_VDK_ARMV8R_BASE_SRC_VDK_ARMV8R_H__
-#define __BOARDS_ARM_VDK_ARMV8R_BASE_SRC_VDK_ARMV8R_H__
+#ifndef __BOARDS_ARM_FVP_V8R_AARCH32_FVP_ARMV8R_AARCH32_SRC_FVP_ARMV8R_H
+#define __BOARDS_ARM_FVP_V8R_AARCH32_FVP_ARMV8R_AARCH32_SRC_FVP_ARMV8R_H
 
 /****************************************************************************
  * Included Files
@@ -44,7 +44,7 @@
  ****************************************************************************/
 
 /****************************************************************************
- * Name: vdk_bringup
+ * Name: fvp_bringup
  *
  * Description:
  *   Bring up board features
@@ -56,4 +56,4 @@ int fvp_bringup(void);
 #endif
 
 #endif /* __ASSEMBLY__ */
-#endif /* __BOARDS_ARM_VDK_ARMV8R_BASE_SRC_VDK_ARMV8R_H__ */
+#endif /* __BOARDS_ARM_FVP_V8R_AARCH32_FVP_ARMV8R_AARCH32_SRC_FVP_ARMV8R_H */
diff --git a/boards/arm64/fvp-v8r/fvp-armv8r/src/fvp-armv8r.h b/boards/arm64/fvp-v8r/fvp-armv8r/src/fvp-armv8r.h
index 0605d05b28..6943109650 100644
--- a/boards/arm64/fvp-v8r/fvp-armv8r/src/fvp-armv8r.h
+++ b/boards/arm64/fvp-v8r/fvp-armv8r/src/fvp-armv8r.h
@@ -18,8 +18,8 @@
  *
  ****************************************************************************/
 
-#ifndef __BOARDS_ARM64_VDK_ARMV8R_BASE_SRC_VDK_ARMV8R_H__
-#define __BOARDS_ARM64_VDK_ARMV8R_BASE_SRC_VDK_ARMV8R_H__
+#ifndef __BOARDS_ARM64_VDK_ARMV8R_BASE_SRC_VDK_ARMV8R_H
+#define __BOARDS_ARM64_VDK_ARMV8R_BASE_SRC_VDK_ARMV8R_H
 
 /****************************************************************************
  * Included Files
@@ -56,4 +56,4 @@ int fvp_bringup(void);
 #endif
 
 #endif /* __ASSEMBLY__ */
-#endif /* __BOARDS_ARM64_VDK_ARMV8R_BASE_SRC_VDK_ARMV8R_H__ */
+#endif /* __BOARDS_ARM64_VDK_ARMV8R_BASE_SRC_VDK_ARMV8R_H */
diff --git a/boards/arm64/imx8/imx8qm-mek/include/board_memorymap.h b/boards/arm64/imx8/imx8qm-mek/include/board_memorymap.h
index aa6ec27eda..e7e567ea7c 100644
--- a/boards/arm64/imx8/imx8qm-mek/include/board_memorymap.h
+++ b/boards/arm64/imx8/imx8qm-mek/include/board_memorymap.h
@@ -18,8 +18,8 @@
  *
  ****************************************************************************/
 
-#ifndef __BOARDS_ARM_IMX8_IMX8QM_MEK_INCLUDE_BOARD_MEMORYMAP_H__
-#define __BOARDS_ARM_IMX8_IMX8QM_MEK_INCLUDE_BOARD_MEMORYMAP_H__
+#ifndef __BOARDS_ARM64_IMX8_IMX8QM_MEK_INCLUDE_BOARD_MEMORYMAP_H
+#define __BOARDS_ARM64_IMX8_IMX8QM_MEK_INCLUDE_BOARD_MEMORYMAP_H
 
 /****************************************************************************
  * Included Files
@@ -56,4 +56,4 @@ extern "C"
 #endif
 
 #endif /* __ASSEMBLY__ */
-#endif /* __BOARDS_ARM_IMX8_IMX8QM_MEK_INCLUDE_BOARD_MEMORYMAP_H__ */
+#endif /* __BOARDS_ARM64_IMX8_IMX8QM_MEK_INCLUDE_BOARD_MEMORYMAP_H */
diff --git a/boards/arm64/imx8/imx8qm-mek/src/imx8qm-mek.h b/boards/arm64/imx8/imx8qm-mek/src/imx8qm-mek.h
index 3bb9bc22d5..6dba0232a0 100644
--- a/boards/arm64/imx8/imx8qm-mek/src/imx8qm-mek.h
+++ b/boards/arm64/imx8/imx8qm-mek/src/imx8qm-mek.h
@@ -18,8 +18,8 @@
  *
  ****************************************************************************/
 
-#ifndef __BOARDS_ARM64_IMX8_IMX8QM_MEK_SRC_IMX8_IMX8QM_MEK_H__
-#define __BOARDS_ARM64_IMX8_IMX8QM_MEK_SRC_IMX8_IMX8QM_MEK_H__
+#ifndef __BOARDS_ARM64_IMX8_IMX8QM_MEK_SRC_IMX8QM_MEK_H
+#define __BOARDS_ARM64_IMX8_IMX8QM_MEK_SRC_IMX8QM_MEK_H
 
 /****************************************************************************
  * Included Files
@@ -56,4 +56,4 @@ int imx8_bringup(void);
 #endif
 
 #endif /* __ASSEMBLY__ */
-#endif /* __BOARDS_ARM64_IMX8_IMX8QM_MEK_SRC_IMX8_IMX8QM_MEK_H__ */
+#endif /* __BOARDS_ARM64_IMX8_IMX8QM_MEK_SRC_IMX8QM_MEK_H */