This is an automated email from the ASF dual-hosted git repository.
pkarashchenko pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
The following commit(s) were added to refs/heads/master by this push:
new 49afeb4d63 arch/arm/stm: Fix duplicate include guard
49afeb4d63 is described below
commit 49afeb4d63639c03cc0e096761c754a671da9582
Author: Mingjie Shen <shen...@purdue.edu>
AuthorDate: Sat Jun 24 21:27:51 2023 -0400
arch/arm/stm: Fix duplicate include guard
The following macros
__ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F74XX75XX_FLASH_H
__ARCH_ARM_SRC_STM32L4_HARDWARE_STM32L4X6XX_RCC_H
are used in other header files.
Signed-off-by: Mingjie Shen <shen...@purdue.edu>
---
arch/arm/src/stm32f7/hardware/stm32f76xx77xx_flash.h | 6 +++---
arch/arm/src/stm32l4/hardware/stm32l4xrxx_rcc.h | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/arch/arm/src/stm32f7/hardware/stm32f76xx77xx_flash.h
b/arch/arm/src/stm32f7/hardware/stm32f76xx77xx_flash.h
index dd934f4d21..d3ea257fd2 100644
--- a/arch/arm/src/stm32f7/hardware/stm32f76xx77xx_flash.h
+++ b/arch/arm/src/stm32f7/hardware/stm32f76xx77xx_flash.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F74XX75XX_FLASH_H
-#define __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F74XX75XX_FLASH_H
+#ifndef __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F76XX77XX_FLASH_H
+#define __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F76XX77XX_FLASH_H
/****************************************************************************
* Pre-processor Definitions
@@ -204,4 +204,4 @@
#define FLASH_OPTCR1_BOOTADD1_MASK (0xffff << FLASH_OPTCR1_BOOTADD1_SHIFT)
# define FLASH_OPTCR1_BOOTADD1(n) ((uint32_t)(n) <<
FLASH_OPTCR1_BOOTADD1_SHIFT)
-#endif /* __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F74XX75XX_FLASH_H */
+#endif /* __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F76XX77XX_FLASH_H */
diff --git a/arch/arm/src/stm32l4/hardware/stm32l4xrxx_rcc.h
b/arch/arm/src/stm32l4/hardware/stm32l4xrxx_rcc.h
index 9a2598f6a1..7e909e7f92 100644
--- a/arch/arm/src/stm32l4/hardware/stm32l4xrxx_rcc.h
+++ b/arch/arm/src/stm32l4/hardware/stm32l4xrxx_rcc.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_STM32L4_HARDWARE_STM32L4X6XX_RCC_H
-#define __ARCH_ARM_SRC_STM32L4_HARDWARE_STM32L4X6XX_RCC_H
+#ifndef __ARCH_ARM_SRC_STM32L4_HARDWARE_STM32L4XRXX_RCC_H
+#define __ARCH_ARM_SRC_STM32L4_HARDWARE_STM32L4XRXX_RCC_H
/****************************************************************************
* Included Files
