mcu/stm32h7: Fix header include

cmsis_nvic.h included stm32h723xx.h which is fine for STM32H723. To have future-proof support for other variants code now includes stm32h7xx.h which in turn will provide specific header depending on variant defintion. Signed-off-by: Jerzy Kasenberg <[email protected]>
apache · Jan 4, 2024 · 16a19ac · 16a19ac
1 parent 5785c0d
commit 16a19ac
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 4 deletions.
diff --git a/hw/mcu/stm/stm32h7xx/include/mcu/cmsis_nvic.h b/hw/mcu/stm/stm32h7xx/include/mcu/cmsis_nvic.h
@@ -18,7 +18,7 @@
 #define NVIC_USER_IRQ_OFFSET  16
 #define NVIC_NUM_VECTORS      (16 + MCU_NUM_PERIPH_VECTORS)
 
-#include "stm32h723xx.h"
+#include "stm32h7xx.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/hw/mcu/stm/stm32h7xx/include/mcu/cortex_m7.h b/hw/mcu/stm/stm32h7xx/include/mcu/cortex_m7.h
@@ -20,7 +20,7 @@
 #ifndef __MCU_CORTEX_M7_H__
 #define __MCU_CORTEX_M7_H__
 
-#include "stm32h723xx.h"
+#include "stm32h7xx.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/hw/mcu/stm/stm32h7xx/include/mcu/mcu.h b/hw/mcu/stm/stm32h7xx/include/mcu/mcu.h
@@ -26,9 +26,7 @@
 extern "C" {
 #endif
 
-#if defined(STM32H723xx)
 #define STM32_SYSTEM_MEMORY     0x1FF00000
-#endif
 
 #ifdef __cplusplus
 }