Start upconverting linker scripts and target definitions

Author: multiplemonomials

targets/TARGET_Cypress/TARGET_PSOC6/TARGET_CY8CPROTO_062_4343W/COMPONENT_CM4/TOOLCHAIN_GCC_ARM/cy8c6xxa_cm4_dual.ld

@@ -47,36 +47,20 @@ ENTRY(Reset_Handler)
 /* The size of the Cortex-M0+ application image at the start of FLASH */
 FLASH_CM0P_SIZE = 0x2000;
 
-#if !defined(MBED_ROM_START)
-  #define MBED_ROM_START    0x10000000
-#endif
-
 /* MBED_APP_START is being used by the bootloader build script and
 * will be calculate by the system. In case if MBED_APP_START address is
 * customized by the bootloader config, the application image should not
 * include CM0p prebuilt image.
 */
 #if !defined(MBED_APP_START)
-  #define MBED_APP_START (MBED_ROM_START + FLASH_CM0P_SIZE)
-#endif
-
-#if !defined(MBED_ROM_SIZE)
-  #define MBED_ROM_SIZE     0x00200000
+  #define MBED_APP_START (MBED_CONFIGURED_ROM_BANK_IROM1_START + FLASH_CM0P_SIZE)
 #endif
 
 /* MBED_APP_SIZE is being  used by the bootloader build script and
 * will be calculate by the system.
 */
 #if !defined(MBED_APP_SIZE)
-  #define MBED_APP_SIZE (MBED_ROM_SIZE - FLASH_CM0P_SIZE)
-#endif
-
-#if !defined(MBED_RAM_START)
-  #define MBED_RAM_START    0x08002000
-#endif
-
-#if !defined(MBED_RAM_SIZE)
-  #define MBED_RAM_SIZE     0x000FD800
+  #define MBED_APP_SIZE (MBED_CONFIGURED_ROM_BANK_IROM1_SIZE - FLASH_CM0P_SIZE)
 #endif
 
 #if !defined(MBED_BOOT_STACK_SIZE)
@@ -106,8 +90,8 @@ MEMORY
      * Your changes must be aligned with the corresponding memory regions for CM0+ core in 'xx_cm0plus.ld',
      * where 'xx' is the device group; for example, 'cy8c6xx7_cm0plus.ld'.
      */
-    ram               (rwx)   : ORIGIN = MBED_RAM_START, LENGTH = MBED_RAM_SIZE
-    cm0p_image        (rx)    : ORIGIN = MBED_ROM_START, LENGTH = FLASH_CM0P_SIZE
+    ram               (rwx)   : ORIGIN = MBED_CONFIGURED_RAM_BANK_IRAM1_START, LENGTH = MBED_CONFIGURED_RAM_BANK_IRAM1_SIZE
+    cm0p_image        (rx)    : ORIGIN = MBED_CONFIGURED_ROM_BANK_IROM1_START, LENGTH = FLASH_CM0P_SIZE
     flash             (rx)    : ORIGIN = MBED_APP_START, LENGTH = MBED_APP_SIZE
 
     /* This is a 32K flash region used for EEPROM emulation. This region can also be used as the general purpose flash.
@@ -440,8 +424,8 @@ SECTIONS
 
 /* The following symbols used by the cymcuelftool. */
 /* Flash */
-__cy_memory_0_start    = 0x10000000;
-__cy_memory_0_length   = 0x00200000;
+__cy_memory_0_start    = MBED_ROM_BANK_IROM1_START;
+__cy_memory_0_length   = MBED_ROM_BANK_IROM1_SIZE;
 __cy_memory_0_row_size = 0x200;
 
 /* Emulated EEPROM Flash area */

targets/TARGET_STM/TARGET_STM32H7/CMakeLists.txt

@@ -42,4 +42,7 @@ elseif("STM32H7_550MHZ" IN_LIST MBED_TARGET_LABELS)
     target_sources(mbed-stm32h7 INTERFACE clock_cfg/TARGET_STM32H7_550MHZ/system_clock.c)
 elseif("STM32H7_280MHZ" IN_LIST MBED_TARGET_LABELS)
     target_sources(mbed-stm32h7 INTERFACE clock_cfg/TARGET_STM32H7_280MHZ/system_clock.c)
-endif()
+endif()
+
+# Add linker scripts
+add_subdirectory(linker_scripts)

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

@@ -3,10 +3,8 @@
 
 if(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM")
     set(STARTUP_FILE TOOLCHAIN_GCC_ARM/startup_stm32h745xx.S)
-    set(LINKER_FILE TOOLCHAIN_GCC_ARM/STM32H745xI_CM4.ld)
 elseif(${MBED_TOOLCHAIN} STREQUAL "ARM")
     set(STARTUP_FILE TOOLCHAIN_ARM/startup_stm32h745xx.S)
-    set(LINKER_FILE TOOLCHAIN_ARM/stm32h745xI_CM4.sct)
 endif()
 
 add_library(mbed-stm32h745xi-cm4 INTERFACE)
@@ -21,6 +19,4 @@ target_include_directories(mbed-stm32h745xi-cm4
         .
 )
 
-mbed_set_linker_script(mbed-stm32h745xi-cm4 ${CMAKE_CURRENT_SOURCE_DIR}/${LINKER_FILE})
-
 target_link_libraries(mbed-stm32h745xi-cm4 INTERFACE mbed-stm32h745xi)

targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H745xI/TARGET_STM32H745xI_CM4/cmsis_nvic.h

@@ -17,24 +17,7 @@
 #ifndef MBED_CMSIS_NVIC_H
 #define MBED_CMSIS_NVIC_H
 
-#if !defined(MBED_ROM_START)
-#define MBED_ROM_START  0x8100000
-#endif
-
-#if !defined(MBED_ROM_SIZE)
-#define MBED_ROM_SIZE  0x100000  // 1.0 MB
-#endif
-
-#if !defined(MBED_RAM_START)
-#define MBED_RAM_START  0x10000000
-#endif
-
-#if !defined(MBED_RAM_SIZE)
-#define MBED_RAM_SIZE  0x48000  // 288 KB
-#endif
-
-
 #define NVIC_NUM_VECTORS        166
-#define NVIC_RAM_VECTOR_ADDRESS MBED_RAM_START
+#define NVIC_RAM_VECTOR_ADDRESS MBED_RAM_BANK_SRAM_DTC_START
 
 #endif

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

@@ -3,10 +3,8 @@
 
 if(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM")
     set(STARTUP_FILE TOOLCHAIN_GCC_ARM/startup_stm32h745xx.S)
-    set(LINKER_FILE TOOLCHAIN_GCC_ARM/STM32H745xI_CM7.ld)
 elseif(${MBED_TOOLCHAIN} STREQUAL "ARM")
     set(STARTUP_FILE TOOLCHAIN_ARM/startup_stm32h745xx.S)
-    set(LINKER_FILE TOOLCHAIN_ARM/stm32h745xI_CM7.sct)
 endif()
 
 add_library(mbed-stm32h745xi-cm7 INTERFACE)
@@ -21,6 +19,4 @@ target_include_directories(mbed-stm32h745xi-cm7
         .
 )
 
-mbed_set_linker_script(mbed-stm32h745xi-cm7 ${CMAKE_CURRENT_SOURCE_DIR}/${LINKER_FILE})
-
 target_link_libraries(mbed-stm32h745xi-cm7 INTERFACE mbed-stm32h745xi)

targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H745xI/TARGET_STM32H745xI_CM7/cmsis_nvic.h

@@ -17,23 +17,6 @@
 #ifndef MBED_CMSIS_NVIC_H
 #define MBED_CMSIS_NVIC_H
 
-#if !defined(MBED_ROM_START)
-#define MBED_ROM_START  0x8000000
-#endif
-
-#if !defined(MBED_ROM_SIZE)
-#define MBED_ROM_SIZE  0x100000  // 1.0 MB
-#endif
-
-#if !defined(MBED_RAM_START)
-#define MBED_RAM_START  0x24000000
-#endif
-
-#if !defined(MBED_RAM_SIZE)
-#define MBED_RAM_SIZE  0x80000  // 512 KB
-#endif
-
-
 #define NVIC_NUM_VECTORS        166
 #define NVIC_RAM_VECTOR_ADDRESS 0x20000000
 

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

@@ -3,10 +3,8 @@
 
 if(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM")
     set(STARTUP_FILE TOOLCHAIN_GCC_ARM/startup_stm32h747xx.S)
-    set(LINKER_FILE TOOLCHAIN_GCC_ARM/stm32h747xI_CM4.ld)
 elseif(${MBED_TOOLCHAIN} STREQUAL "ARM")
     set(STARTUP_FILE TOOLCHAIN_ARM/startup_stm32h747xx.S)
-    set(LINKER_FILE TOOLCHAIN_ARM/stm32h747xI_CM4.sct)
 endif()
 
 add_library(mbed-stm32h747xi-cm4 INTERFACE)
@@ -21,6 +19,4 @@ target_include_directories(mbed-stm32h747xi-cm4
         .
 )
 
-mbed_set_linker_script(mbed-stm32h747xi-cm4 ${CMAKE_CURRENT_SOURCE_DIR}/${LINKER_FILE})
-
 target_link_libraries(mbed-stm32h747xi-cm4 INTERFACE mbed-stm32h747xi)

targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H747xI/TARGET_STM32H747xI_CM4/TOOLCHAIN_GCC_ARM/stm32h747xI_CM4.ld

@@ -3,10 +3,8 @@
 
 if(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM")
     set(STARTUP_FILE TOOLCHAIN_GCC_ARM/startup_stm32h747xx.S)
-    set(LINKER_FILE TOOLCHAIN_GCC_ARM/STM32H747xI_CM7.ld)
 elseif(${MBED_TOOLCHAIN} STREQUAL "ARM")
     set(STARTUP_FILE TOOLCHAIN_ARM/startup_stm32h747xx.S)
-    set(LINKER_FILE TOOLCHAIN_ARM/stm32h747xI_CM7.sct)
 endif()
 
 add_library(mbed-stm32h747xi-cm7 INTERFACE)
@@ -21,6 +19,4 @@ target_include_directories(mbed-stm32h747xi-cm7
         .
 )
 
-mbed_set_linker_script(mbed-stm32h747xi-cm7 ${CMAKE_CURRENT_SOURCE_DIR}/${LINKER_FILE})
-
 target_link_libraries(mbed-stm32h747xi-cm7 INTERFACE mbed-stm32h747xi)