Fix STM32H745 family compile failure due to failure to include cmsis_nvic.h

Author: multiplemonomials

targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H745xI/TARGET_STM32H745xI_CM4/CMakeLists.txt

@@ -14,9 +14,4 @@ target_sources(mbed-stm32h745xi-cm4
         ${STARTUP_FILE}
 )
 
-target_include_directories(mbed-stm32h745xi-cm4
-    INTERFACE
-        .
-)
-
 target_link_libraries(mbed-stm32h745xi-cm4 INTERFACE mbed-stm32h745xi)

targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H745xI/TARGET_STM32H745xI_CM7/CMakeLists.txt

@@ -14,9 +14,4 @@ target_sources(mbed-stm32h745xi-cm7
         ${STARTUP_FILE}
 )
 
-target_include_directories(mbed-stm32h745xi-cm7
-    INTERFACE
-        .
-)
-
 target_link_libraries(mbed-stm32h745xi-cm7 INTERFACE mbed-stm32h745xi)

targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H747xI/TARGET_STM32H747xI_CM4/CMakeLists.txt

@@ -14,9 +14,4 @@ target_sources(mbed-stm32h747xi-cm4
         ${STARTUP_FILE}
 )
 
-target_include_directories(mbed-stm32h747xi-cm4
-    INTERFACE
-        .
-)
-
 target_link_libraries(mbed-stm32h747xi-cm4 INTERFACE mbed-stm32h747xi)

targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H747xI/TARGET_STM32H747xI_CM4/cmsis_nvic.h

@@ -14,9 +14,4 @@ target_sources(mbed-stm32h747xi-cm7
         ${STARTUP_FILE}
 )
 
-target_include_directories(mbed-stm32h747xi-cm7
-    INTERFACE
-        .
-)
-
 target_link_libraries(mbed-stm32h747xi-cm7 INTERFACE mbed-stm32h747xi)

targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H747xI/TARGET_STM32H747xI_CM7/CMakeLists.txt

@@ -1,6 +1,4 @@
 # Copyright (c) 2024 Jamie Smith
 # SPDX-License-Identifier: Apache-2.0
 
-if(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM")
-	add_subdirectory(TOOLCHAIN_GCC_ARM)
-endif()
+add_subdirectory(STM32H745_47_FAMILY)

targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H747xI/TARGET_STM32H747xI_CM7/cmsis_nvic.h

@@ -0,0 +1,8 @@
+if(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM")
+	mbed_set_linker_script(mbed-stm32h745xi-cm4 STM32H745_H747_CM4.ld)
+	mbed_set_linker_script(mbed-stm32h747xi-cm4 STM32H745_H747_CM4.ld)
+endif()
+
+# Pick up cmsis-nvic.h
+target_include_directories(mbed-stm32h745xi-cm4 INTERFACE .)
+target_include_directories(mbed-stm32h747xi-cm4 INTERFACE .)

targets/TARGET_STM/TARGET_STM32H7/linker_scripts/CMakeLists.txt

@@ -15,7 +15,7 @@
  ******************************************************************************
 */
 
-#include "../cmsis_nvic.h"
+#include "cmsis_nvic.h"
 
 #if !defined(MBED_CONF_TARGET_BOOT_STACK_SIZE)
     /* This value is normally defined by the tools
@@ -142,7 +142,7 @@ SECTIONS
         __data_end__ = .;
         _edata = .;
 
-    } > SRAM_D2
+    } > RAM_D2
 
     /* Uninitialized data section
      * This region is not initialized by the C/C++ library and can be used to
@@ -155,7 +155,7 @@ SECTIONS
         KEEP(*(.keep.uninitialized))
         . = ALIGN(32);
         __uninitialized_end = .;
-    } > SRAM_D2
+    } > RAM_D2
 
     .bss :
     {
@@ -167,28 +167,28 @@ SECTIONS
         . = ALIGN(8);
         __bss_end__ = .;
         _ebss = .;
-    } > SRAM_D2
+    } > RAM_D2
 
     .heap (COPY):
     {
         __end__ = .;
         PROVIDE(end = .);
         *(.heap*)
-        . = ORIGIN(SRAM_D2) + LENGTH(SRAM_D2) - MBED_CONF_TARGET_BOOT_STACK_SIZE;
+        . = ORIGIN(RAM_D2) + LENGTH(RAM_D2) - MBED_CONF_TARGET_BOOT_STACK_SIZE;
         __HeapLimit = .;
-    } > SRAM_D2
+    } > RAM_D2
 
     /* .stack_dummy section doesn't contains any symbols. It is only
      * used for linker to calculate size of stack sections, and assign
      * values to stack symbols later */
     .stack_dummy (COPY):
     {
         *(.stack*)
-    } > SRAM_D2
+    } > RAM_D2
 
-    /* Set stack top to end of SRAM_D2, and stack limit move down by
+    /* Set stack top to end of RAM_D2, and stack limit move down by
      * size of stack_dummy section */
-    __StackTop = ORIGIN(SRAM_D2) + LENGTH(SRAM_D2);
+    __StackTop = ORIGIN(RAM_D2) + LENGTH(RAM_D2);
     _estack = __StackTop;
     __StackLimit = __StackTop - MBED_CONF_TARGET_BOOT_STACK_SIZE;
     PROVIDE(__stack = __StackTop);

targets/TARGET_STM/TARGET_STM32H7/linker_scripts/STM32H745_47_FAMILY/CM4/CMakeLists.txt

@@ -18,6 +18,6 @@
 #define MBED_CMSIS_NVIC_H
 
 #define NVIC_NUM_VECTORS        166
-#define NVIC_RAM_VECTOR_ADDRESS 0x20000000
+#define NVIC_RAM_VECTOR_ADDRESS MBED_RAM_BANK_SRAM_D2_START
 
 #endif