Merge pull request #15325 from deepak-shreshti/master

Updated System file and Scatter file
ARMmbed · Aug 25, 2022 · d4f97aa · d4f97aa
2 parents 48ae844 + 61e5a61
commit d4f97aa
Show file tree

Hide file tree

Showing 3 changed files with 277 additions and 130 deletions.
diff --git a/targets/TARGET_TOSHIBA/TARGET_TMPM4KN/device/TMPM4KNA.h b/targets/TARGET_TOSHIBA/TARGET_TMPM4KN/device/TMPM4KNA.h
@@ -7,7 +7,7 @@
  * $Date:: #$
  *
  * DO NOT USE THIS SOFTWARE WITHOUT THE SOFTWARE LICENSE AGREEMENT.
- * 
+ *
  * Copyright(C) Toshiba Electronic Device Solutions Corporation 2021
  * SPDX-License-Identifier: Apache-2.0
  *
@@ -1322,6 +1322,7 @@ typedef struct {
 
 /* Clock Control and Operation Mode (CG) */
 #define TSB_CG_OSCCR_IHOSC1EN (*((__IO uint32_t *)BITBAND_PERI(&TSB_CG->OSCCR,0)))
+#define TSB_CG_OSCCR_IHOSC2EN (*((__IO uint32_t *)BITBAND_PERI(&TSB_CG->OSCCR,3)))
 #define TSB_CG_OSCCR_OSCSEL (*((__IO uint32_t *)BITBAND_PERI(&TSB_CG->OSCCR,8)))
 #define TSB_CG_OSCCR_OSCF (*((__I uint32_t *)BITBAND_PERI(&TSB_CG->OSCCR,9)))
 #define TSB_CG_OSCCR_IHOSC1F (*((__I uint32_t *)BITBAND_PERI(&TSB_CG->OSCCR,16)))

diff --git a/targets/TARGET_TOSHIBA/TARGET_TMPM4KN/device/TOOLCHAIN_ARM_STD/tmpm4knfyafg.sct b/targets/TARGET_TOSHIBA/TARGET_TMPM4KN/device/TOOLCHAIN_ARM_STD/tmpm4knfyafg.sct
@@ -65,8 +65,13 @@ LR_IROM1 MBED_APP_START MBED_APP_SIZE ; load region size_region
  .ANY (+RW, +ZI)
  rda_flash512ud32_b.o(+RO)
  }
+
+ FLASH_CODE_RAM AlignExpr(+0, 16) (0x6000 - 0x238 - Stack_Size - Imagelength(RW_IRAM1))
+ {
+ system_TMPM4KyA.o(FLASH_ROM)
+ }
 
- ARM_LIB_HEAP AlignExpr(+0, 16) EMPTY (0x20000000+0x6000 - MBED_CONF_TARGET_BOOT_STACK_SIZE - AlignExpr(ImageLimit(RW_IRAM1), 16)) { ; Heap growing up
+ ARM_LIB_HEAP AlignExpr(+0, 16) EMPTY (0x20000000+0x6000 - MBED_CONF_TARGET_BOOT_STACK_SIZE - AlignExpr(ImageLimit(FLASH_CODE_RAM), 16)) { ; Heap growing up
  }
 
  ARM_LIB_STACK (0x20000000+0x6000) EMPTY -Stack_Size { ; stack