[PATCH 2/4] Patch to avoid nameclash of PAGESIZE define
Robin.Mueller
robin.mueller.m at gmail.com
Mon Apr 12 09:55:57 UTC 2021
This commit excludes the PAGESIZE legacy define
because there is a nameclash with a define of the same name
coming from the RTEMS header limits.h
---
bsps/arm/stm32h7/include/Legacy/stm32_hal_legacy.h | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/bsps/arm/stm32h7/include/Legacy/stm32_hal_legacy.h b/bsps/arm/stm32h7/include/Legacy/stm32_hal_legacy.h
index c311c1618e..b0092e60eb 100644
--- a/bsps/arm/stm32h7/include/Legacy/stm32_hal_legacy.h
+++ b/bsps/arm/stm32h7/include/Legacy/stm32_hal_legacy.h
@@ -420,7 +420,11 @@
#define TYPEPROGRAMDATA_FASTBYTE FLASH_TYPEPROGRAMDATA_FASTBYTE
#define TYPEPROGRAMDATA_FASTHALFWORD FLASH_TYPEPROGRAMDATA_FASTHALFWORD
#define TYPEPROGRAMDATA_FASTWORD FLASH_TYPEPROGRAMDATA_FASTWORD
+#ifndef __rtems__
+/* Commented out for the RTEMS BSP because there can be nameclashes with another
+similar defininition in limits.h */
#define PAGESIZE FLASH_PAGE_SIZE
+#endif /* __rtems__ */
#define TYPEPROGRAM_FASTBYTE FLASH_TYPEPROGRAM_BYTE
#define TYPEPROGRAM_FASTHALFWORD FLASH_TYPEPROGRAM_HALFWORD
#define TYPEPROGRAM_FASTWORD FLASH_TYPEPROGRAM_WORD
--
2.25.1
More information about the devel
mailing list