diff options
author | TTornblom <thomas.tornblom@iar.com> | 2020-05-06 20:22:22 +0200 |
---|---|---|
committer | David Hu <david.hu@arm.com> | 2020-06-23 07:50:53 +0000 |
commit | 9cfcd7a64a13322fc1f606abb4b7080a0fd2f86a (patch) | |
tree | ed251e66e5b02712a07ba870cd28daa4cd74905d | |
parent | 8a8b452427fb2746bc6bd1f69737a0aaaa7d7636 (diff) | |
download | trusted-firmware-m-9cfcd7a64a13322fc1f606abb4b7080a0fd2f86a.tar.gz |
Platform: IAR fix for PSoC64 stack
This fix implements the changes in 1e34b073 for Non-Secure stack
Signed-off-by: TTornblom <thomas.tornblom@iar.com>
Change-Id: I2254bdd8a0781e34e53e6f4dae32dfad21a3582c
-rw-r--r-- | platform/ext/target/cypress/psoc64/Device/Source/iar/psoc6_ns.icf | 3 | ||||
-rw-r--r-- | platform/ext/target/cypress/psoc64/Device/Source/iar/startup_psoc64_ns.s | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/platform/ext/target/cypress/psoc64/Device/Source/iar/psoc6_ns.icf b/platform/ext/target/cypress/psoc64/Device/Source/iar/psoc6_ns.icf index 353e0b665f..125d87f191 100644 --- a/platform/ext/target/cypress/psoc64/Device/Source/iar/psoc6_ns.icf +++ b/platform/ext/target/cypress/psoc64/Device/Source/iar/psoc6_ns.icf @@ -1,5 +1,6 @@ /* * Copyright (c) 2020 Arm Limited + * Copyright (c) 2020 IAR Systems AB * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -31,7 +32,7 @@ define region TFM_SHARED_MEM = mem:[from NS_DATA_SHARED_START size NS_DATA_SHA #endif define block ARM_LIB_STACK_MSP with alignment = 8, size = NS_MSP_STACK_SIZE { }; -define block ARM_LIB_STACK with alignment = 8, size = NS_PSP_STACK_SIZE { }; +define block ARM_LIB_STACK with alignment = 8, size = NS_MSP_STACK_SIZE { }; define block HEAP with alignment = 8, size = NS_HEAP_SIZE { }; define block TFM_RAM_CODE with alignment = 32 { readonly section .ramfunc }; diff --git a/platform/ext/target/cypress/psoc64/Device/Source/iar/startup_psoc64_ns.s b/platform/ext/target/cypress/psoc64/Device/Source/iar/startup_psoc64_ns.s index 70b7b837f1..695844ac64 100644 --- a/platform/ext/target/cypress/psoc64/Device/Source/iar/startup_psoc64_ns.s +++ b/platform/ext/target/cypress/psoc64/Device/Source/iar/startup_psoc64_ns.s @@ -1,6 +1,7 @@ ;/* ; * Copyright (c) 2009-2019 ARM Limited. All rights reserved. ; * Copyright (c) 2019-2020, Cypress Semiconductor Corporation. All rights reserved. +; * Copyright (c) 2020 IAR Systems AB ; * ; * SPDX-License-Identifier: Apache-2.0 ; * @@ -26,7 +27,7 @@ MODULE ?cstartup ;; Forward declaration of sections. - SECTION ARM_LIB_STACK_MSP:DATA:NOROOT(3) + SECTION ARM_LIB_STACK:DATA:NOROOT(3) SECTION .intvec:CODE:NOROOT(2) @@ -43,7 +44,7 @@ DATA __vector_table - DCD sfe(ARM_LIB_STACK_MSP) ; Top of Stack + DCD sfe(ARM_LIB_STACK) ; Top of Stack DCD Reset_Handler ; Reset Handler DCD NMI_Handler ; NMI Handler DCD HardFault_Handler ; Hard Fault Handler |