aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Brand <chris.brand@cypress.com>2019-10-08 12:21:10 -0700
committerChris Brand <chris.brand@cypress.com>2019-10-16 10:15:04 -0700
commitb00c985a180ca727b73548129346cd73a85e8e2b (patch)
treecffdd1c54634c3dad7f23e694d2f47b1182954cb
parent69c009f3d24ed8b9d5e66d911f2c529f3d9f166e (diff)
downloadtrusted-firmware-m-b00c985a180ca727b73548129346cd73a85e8e2b.tar.gz
plat: Re-replace .cy_ramfunc with .ramfunc
Re-apply patch 5f7810c1f9b2e28e3ff5c16ae5b966f4479cab18 ("plat: replace .cy_ramfunc with .ram_func") to the new version of the PDL files. Signed-off-by: Chris Brand <chris.brand@cypress.com> Change-Id: Ib48f8320e783eb4277a62add426fc09dbfd640cb
-rw-r--r--platform/ext/target/psoc64/Native_Driver/include/cy_syslib.h6
-rw-r--r--platform/ext/target/psoc64/Native_Driver/source/cy_syspm.c12
2 files changed, 7 insertions, 11 deletions
diff --git a/platform/ext/target/psoc64/Native_Driver/include/cy_syslib.h b/platform/ext/target/psoc64/Native_Driver/include/cy_syslib.h
index b568337cdf..36f93ddc0a 100644
--- a/platform/ext/target/psoc64/Native_Driver/include/cy_syslib.h
+++ b/platform/ext/target/psoc64/Native_Driver/include/cy_syslib.h
@@ -510,18 +510,18 @@ typedef enum
#define CY_NOINLINE __attribute__ ((noinline))
/* Specifies the minimum alignment (in bytes) for variables of the specified type. */
#define CY_ALIGN(align) __ALIGNED(align)
- #define CY_RAMFUNC_BEGIN __attribute__ ((section(".cy_ramfunc")))
+ #define CY_RAMFUNC_BEGIN __attribute__ ((section(".ramfunc")))
#define CY_RAMFUNC_END
#elif defined (__GNUC__)
#if defined (__clang__)
#define CY_NOINIT __attribute__ ((section("__DATA, __noinit")))
#define CY_SECTION(name) __attribute__ ((section("__DATA, "name)))
- #define CY_RAMFUNC_BEGIN __attribute__ ((section("__DATA, .cy_ramfunc")))
+ #define CY_RAMFUNC_BEGIN __attribute__ ((section("__DATA, .ramfunc")))
#define CY_RAMFUNC_END
#else
#define CY_NOINIT __attribute__ ((section(".noinit")))
#define CY_SECTION(name) __attribute__ ((section(name)))
- #define CY_RAMFUNC_BEGIN __attribute__ ((section(".cy_ramfunc")))
+ #define CY_RAMFUNC_BEGIN __attribute__ ((section(".ramfunc")))
#define CY_RAMFUNC_END
#endif
diff --git a/platform/ext/target/psoc64/Native_Driver/source/cy_syspm.c b/platform/ext/target/psoc64/Native_Driver/source/cy_syspm.c
index 7b1244edfe..8368020b88 100644
--- a/platform/ext/target/psoc64/Native_Driver/source/cy_syspm.c
+++ b/platform/ext/target/psoc64/Native_Driver/source/cy_syspm.c
@@ -2903,11 +2903,9 @@ void Cy_SysPm_RestoreRegisters(cy_stc_syspm_backup_regs_t const *regs)
* - false - System Deep Sleep was not occurred.
*
*******************************************************************************/
-#if defined (__ICCARM__)
- #pragma diag_suppress=Ta023
- __ramfunc
-#else
- CY_SECTION(".cy_ramfunc") CY_NOINLINE
+CY_RAMFUNC_BEGIN
+#if !defined (__ICCARM__)
+ CY_NOINLINE
#endif
static bool EnterDeepSleepRam(cy_en_syspm_waitfor_t waitFor)
{
@@ -3082,9 +3080,7 @@ static bool EnterDeepSleepRam(cy_en_syspm_waitfor_t waitFor)
return retVal;
}
-#if defined (__ICCARM__)
- #pragma diag_default=Ta023
-#endif
+CY_RAMFUNC_END
/*******************************************************************************