Skip to content

Commit 67de89d

Browse files
author
Cruz Monrreal
authored
Merge pull request #10346 from lrusinowicz/sequana_armc6_fixes
FUTURE_SEQUANA: Add suport for ARMC6
2 parents d1672d0 + e5d970d commit 67de89d

File tree

96 files changed

+175
-127
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

96 files changed

+175
-127
lines changed

‎targets/TARGET_Cypress/TARGET_PSOC6_FUTURE/TARGET_CY8C63XX/TARGET_MCU_PSOC6_M0/device/TOOLCHAIN_ARM_STD/cy8c6xx7_cm0plus.sct

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,13 @@ LR_IROM1 FLASH_START (FLASH_SIZE - 0x8000)
142142
* (.noinit)
143143
}
144144

145-
ARM_LIB_STACK RAM_START+RAM_SIZE EMPTY -Stack_Size
145+
; Application heap area (HEAP)
146+
ARM_LIB_HEAP +0
147+
{
148+
* (HEAP)
149+
}
150+
151+
ARM_LIB_STACK RAM_START + RAM_SIZE EMPTY - Stack_Size
146152
{ ; Stack region growing down
147153
}
148154
}

‎targets/TARGET_Cypress/TARGET_PSOC6_FUTURE/TARGET_CY8C63XX/TARGET_MCU_PSOC6_M0/ipc_rpc_m0.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
#include "ipc_rpc.h"
2020
#include "rpc_defs.h"
2121
#include "cy_ipc_config.h"
22-
#include "ipc/cy_ipc_pipe.h"
22+
#include "cy_ipc_pipe.h"
2323

2424
#define RPC_GEN RPC_GEN_IMPLEMENTATION
2525
#include "rpc_api.h"

‎targets/TARGET_Cypress/TARGET_PSOC6_FUTURE/TARGET_CY8C63XX/TARGET_MCU_PSOC6_M0/system_psoc63_cm0plus.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@
2121

2222
#if defined(CY_DEVICE_PSOC6ABLE2)
2323
#if !defined(CY_PSOC6ABLE2_REV_0A_SUPPORT_DISABLE)
24-
#include "syslib/cy_syslib.h"
24+
#include "cy_syslib.h"
2525
#endif /* !defined(CY_PSOC6ABLE2_REV_0A_SUPPORT_DISABLE) */
2626
#if !defined(CY_IPC_DEFAULT_CFG_DISABLE)
27-
#include "ipc/cy_ipc_drv.h"
28-
#include "flash/cy_flash.h"
27+
#include "cy_ipc_drv.h"
28+
#include "cy_flash.h"
2929
#endif /* !defined(CY_IPC_DEFAULT_CFG_DISABLE) */
3030
#endif /* defined(CY_DEVICE_PSOC6ABLE2) */
3131

@@ -583,7 +583,7 @@ void Cy_SysResetCM4(void)
583583
* linker configuration files. The following symbols used by the cymcuelftool.
584584
*
585585
*******************************************************************************/
586-
#if defined (__ARMCC_VERSION)
586+
#if defined (__ARMCC_VERSION) && (__ARMCC_VERSION < 6000000)
587587
__asm void Cy_MemorySymbols(void)
588588
{
589589
/* Flash */

‎targets/TARGET_Cypress/TARGET_PSOC6_FUTURE/TARGET_CY8C63XX/TARGET_MCU_PSOC6_M4/device/TOOLCHAIN_ARM_STD/cy8c6xx7_cm4_dual.sct

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -132,17 +132,23 @@ LR_IROM1 FLASH_START FLASH_SIZE
132132
.ANY (+RW, +ZI)
133133
}
134134

135-
ARM_LIB_STACK RAM_START+RAM_SIZE EMPTY -Stack_Size
136-
{ ; Stack region growing down
137-
}
138-
139135
; Place variables in the section that should not be initialized during the
140136
; device startup.
141137
RW_IRAM1 +0 UNINIT
142138
{
143139
* (.noinit)
144140
}
145141

142+
; Application heap area (HEAP)
143+
ARM_LIB_HEAP +0
144+
{
145+
* (HEAP)
146+
}
147+
148+
ARM_LIB_STACK RAM_START + RAM_SIZE EMPTY - Stack_Size
149+
{ ; Stack region growing down
150+
}
151+
146152
; Used for the digital signature of the secure application and the
147153
; Bootloader SDK appication. The size of the section depends on the required
148154
; data size.

‎targets/TARGET_Cypress/TARGET_PSOC6_FUTURE/TARGET_CY8C63XX/TARGET_MCU_PSOC6_M4/ipc_rpc.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#include "Semaphore.h"
2121
#include "mbed_assert.h"
2222
#include "cy_ipc_config.h"
23-
#include "ipc/cy_ipc_pipe.h"
23+
#include "cy_ipc_pipe.h"
2424
#include <stdarg.h>
2525
#include "platform/SingletonPtr.h"
2626

‎targets/TARGET_Cypress/TARGET_PSOC6_FUTURE/TARGET_CY8C63XX/TARGET_MCU_PSOC6_M4/system_psoc63_cm4.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
#include "psoc6_utils.h"
2121

2222
#if defined(CY_DEVICE_PSOC6ABLE2) && !defined(CY_IPC_DEFAULT_CFG_DISABLE)
23-
#include "ipc/cy_ipc_drv.h"
24-
#include "flash/cy_flash.h"
23+
#include "cy_ipc_drv.h"
24+
#include "cy_flash.h"
2525
#endif /* defined(CY_DEVICE_PSOC6ABLE2) && !defined(CY_IPC_DEFAULT_CFG_DISABLE) */
2626

2727

@@ -409,7 +409,7 @@ void Cy_SystemInitFpuEnable(void)
409409
* linker configuration files. The following symbols used by the cymcuelftool.
410410
*
411411
*******************************************************************************/
412-
#if defined (__ARMCC_VERSION)
412+
#if defined (__ARMCC_VERSION) && (__ARMCC_VERSION < 6000000)
413413
__asm void Cy_MemorySymbols(void)
414414
{
415415
/* Flash */

‎targets/TARGET_Cypress/TARGET_PSOC6_FUTURE/TARGET_CY8C63XX/device/cy_ipc_config.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212
* SPDX-License-Identifier: Apache-2.0
1313
*******************************************************************************/
1414

15-
#include "ipc/cy_ipc_drv.h"
16-
#include "ipc/cy_ipc_pipe.h"
17-
#include "ipc/cy_ipc_sema.h"
15+
#include "cy_ipc_drv.h"
16+
#include "cy_ipc_pipe.h"
17+
#include "cy_ipc_sema.h"
1818

1919
#include "cy_ipc_config.h"
2020

‎targets/TARGET_Cypress/TARGET_PSOC6_FUTURE/TARGET_FUTURE_SEQUANA/TARGET_FUTURE_SEQUANA_M0/board_config.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,18 +17,18 @@
1717

1818
#include <string.h>
1919
#include "device.h"
20-
#include "gpio/cy_gpio.h"
21-
#include "syslib/cy_syslib.h"
22-
#include "sysclk/cy_sysclk.h"
23-
#include "systick/cy_systick.h"
24-
#include "sysanalog/cy_sysanalog.h"
20+
#include "cy_gpio.h"
21+
#include "cy_syslib.h"
22+
#include "cy_sysclk.h"
23+
#include "cy_systick.h"
24+
#include "cy_sysanalog.h"
2525

2626
#if FEATURE_BLE
2727
#include "ble/cy_ble_clk.h"
2828
#endif // FEATURE_BLE
2929

3030
#define CY_NEED_CYCLOCKSTARTUPERROR 1
31-
#include "syspm/cy_syspm.h"
31+
#include "cy_syspm.h"
3232

3333
#include "psoc6_utils.h"
3434

‎targets/TARGET_Cypress/TARGET_PSOC6_FUTURE/device/drivers/peripheral/ctb/cy_ctb.h renamed to ‎targets/TARGET_Cypress/TARGET_PSOC6_FUTURE/device/drivers/include/cy_ctb.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -300,8 +300,8 @@
300300
#include <stdbool.h>
301301
#include <stddef.h>
302302
#include "cy_device_headers.h"
303-
#include "syslib/cy_syslib.h"
304-
#include "sysanalog/cy_sysanalog.h"
303+
#include "cy_syslib.h"
304+
#include "cy_sysanalog.h"
305305

306306
#ifndef CY_IP_MXS40PASS_CTB
307307
#error "The CTB driver is not supported on this device"

‎targets/TARGET_Cypress/TARGET_PSOC6_FUTURE/device/drivers/peripheral/ctdac/cy_ctdac.h renamed to ‎targets/TARGET_Cypress/TARGET_PSOC6_FUTURE/device/drivers/include/cy_ctdac.h

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -338,9 +338,9 @@
338338
#include <stdbool.h>
339339
#include <stddef.h>
340340
#include "cy_device_headers.h"
341-
#include "syspm/cy_syspm.h"
342-
#include "syslib/cy_syslib.h"
343-
#include "sysclk/cy_sysclk.h"
341+
#include "cy_syspm.h"
342+
#include "cy_syslib.h"
343+
#include "cy_sysclk.h"
344344

345345
#ifndef CY_IP_MXS40PASS_CTDAC
346346
#error "The CTDAC driver is not supported on this device"
@@ -922,10 +922,12 @@ __STATIC_INLINE uint32_t Cy_CTDAC_GetInterruptStatus(const CTDAC_Type *base)
922922
*******************************************************************************/
923923
__STATIC_INLINE void Cy_CTDAC_ClearInterrupt(CTDAC_Type *base)
924924
{
925+
uint32_t unused;
926+
925927
base->INTR = CTDAC_INTR_VDAC_EMPTY_Msk;
926928

927929
/* Dummy read for buffered writes. */
928-
(void) base->INTR;
930+
unused = base->INTR;
929931
}
930932

931933
/*******************************************************************************

‎targets/TARGET_Cypress/TARGET_PSOC6_FUTURE/device/drivers/peripheral/dma/cy_dma.h renamed to ‎targets/TARGET_Cypress/TARGET_PSOC6_FUTURE/device/drivers/include/cy_dma.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@
150150
#include <stdint.h>
151151
#include <stdbool.h>
152152
#include <stddef.h>
153-
#include "syslib/cy_syslib.h"
153+
#include "cy_syslib.h"
154154
#include "cy_device_headers.h"
155155

156156
#ifndef CY_IP_M4CPUSS_DMA

‎targets/TARGET_Cypress/TARGET_PSOC6_FUTURE/device/drivers/peripheral/efuse/cy_efuse.h renamed to ‎targets/TARGET_Cypress/TARGET_PSOC6_FUTURE/device/drivers/include/cy_efuse.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@
109109
*/
110110

111111
#include "cy_device_headers.h"
112-
#include "syslib/cy_syslib.h"
112+
#include "cy_syslib.h"
113113

114114
/***************************************
115115
* Macro Definitions

‎targets/TARGET_Cypress/TARGET_PSOC6_FUTURE/device/drivers/peripheral/flash/cy_flash.h renamed to ‎targets/TARGET_Cypress/TARGET_PSOC6_FUTURE/device/drivers/include/cy_flash.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,7 @@
296296
*/
297297

298298
#include <cy_device_headers.h>
299-
#include "syslib/cy_syslib.h"
299+
#include "cy_syslib.h"
300300

301301
#if defined(__cplusplus)
302302
extern "C" {

‎targets/TARGET_Cypress/TARGET_PSOC6_FUTURE/device/drivers/peripheral/gpio/cy_gpio.h renamed to ‎targets/TARGET_Cypress/TARGET_PSOC6_FUTURE/device/drivers/include/cy_gpio.h

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@
120120
#define CY_GPIO_H
121121

122122
#include <stddef.h>
123-
#include "syslib/cy_syslib.h"
123+
#include "cy_syslib.h"
124124
#include "cy_device_headers.h"
125125

126126
#if defined(__cplusplus)
@@ -1566,15 +1566,17 @@ __STATIC_INLINE uint32_t Cy_GPIO_GetInterruptStatus(GPIO_PRT_Type* base, uint32_
15661566
*******************************************************************************/
15671567
__STATIC_INLINE void Cy_GPIO_ClearInterrupt(GPIO_PRT_Type* base, uint32_t pinNum)
15681568
{
1569+
uint32_t unused;
1570+
15691571
CY_ASSERT_L2(CY_GPIO_IS_FILTER_PIN_VALID(pinNum));
15701572

15711573
/* Any INTR MMIO registers AHB clearing must be preceded with an AHB read access */
1572-
(void)base->INTR;
1574+
unused = base->INTR;
15731575

15741576
base->INTR = CY_GPIO_INTR_STATUS_MASK << pinNum;
15751577

15761578
/* This read ensures that the initial write has been flushed out to the hardware */
1577-
(void)base->INTR;
1579+
unused = base->INTR;
15781580
}
15791581

15801582

‎targets/TARGET_Cypress/TARGET_PSOC6_FUTURE/device/drivers/peripheral/i2s/cy_i2s.h renamed to ‎targets/TARGET_Cypress/TARGET_PSOC6_FUTURE/device/drivers/include/cy_i2s.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,8 +142,8 @@
142142

143143
#include <stddef.h>
144144
#include <stdbool.h>
145-
#include "syslib/cy_syslib.h"
146-
#include "syspm/cy_syspm.h"
145+
#include "cy_syslib.h"
146+
#include "cy_syspm.h"
147147

148148
#ifndef CY_IP_MXAUDIOSS
149149
#error "The I2S driver is not supported on this device"

‎targets/TARGET_Cypress/TARGET_PSOC6_FUTURE/device/drivers/peripheral/ipc/cy_ipc_drv.h renamed to ‎targets/TARGET_Cypress/TARGET_PSOC6_FUTURE/device/drivers/include/cy_ipc_drv.h

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -282,7 +282,7 @@
282282
/******************************************************************************/
283283
/* Include files */
284284
/******************************************************************************/
285-
#include "syslib/cy_syslib.h"
285+
#include "cy_syslib.h"
286286
#include "cy_device_headers.h"
287287
#include "cy_ipc_config.h"
288288
#include <stddef.h>
@@ -615,11 +615,13 @@ __STATIC_INLINE void Cy_IPC_Drv_SetInterrupt(IPC_INTR_STRUCT_Type* base, uint32
615615
*******************************************************************************/
616616
__STATIC_INLINE void Cy_IPC_Drv_ClearInterrupt(IPC_INTR_STRUCT_Type* base, uint32_t ipcReleaseMask, uint32_t ipcNotifyMask)
617617
{
618+
uint32_t unused;
619+
618620
CY_ASSERT_L1(0ul == (ipcNotifyMask & ~(uint32_t)(IPC_STRUCT_NOTIFY_INTR_NOTIFY_Msk)));
619621
CY_ASSERT_L1(0ul == (ipcReleaseMask & ~(uint32_t)(IPC_STRUCT_RELEASE_INTR_RELEASE_Msk)));
620622
base->INTR = _VAL2FLD(IPC_INTR_STRUCT_INTR_NOTIFY, ipcNotifyMask) |
621623
_VAL2FLD(IPC_INTR_STRUCT_INTR_RELEASE, ipcReleaseMask);
622-
(void)base->INTR; /* Read the register to flush the cache */
624+
unused = base->INTR; /* Read the register to flush the cache */
623625
}
624626

625627
/** \} group_ipc_functions */

‎targets/TARGET_Cypress/TARGET_PSOC6_FUTURE/device/drivers/peripheral/ipc/cy_ipc_pipe.h renamed to ‎targets/TARGET_Cypress/TARGET_PSOC6_FUTURE/device/drivers/include/cy_ipc_pipe.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
/******************************************************************************/
1818
/* Include files */
1919
/******************************************************************************/
20-
#include "ipc/cy_ipc_drv.h"
21-
#include "syslib/cy_syslib.h"
22-
#include "sysint/cy_sysint.h"
20+
#include "cy_ipc_drv.h"
21+
#include "cy_syslib.h"
22+
#include "cy_sysint.h"
2323

2424
/**
2525
* \addtogroup group_ipc_pipe IPC pipes layer (IPC_PIPE)

‎targets/TARGET_Cypress/TARGET_PSOC6_FUTURE/device/drivers/peripheral/ipc/cy_ipc_sema.h renamed to ‎targets/TARGET_Cypress/TARGET_PSOC6_FUTURE/device/drivers/include/cy_ipc_sema.h

File renamed without changes.

‎targets/TARGET_Cypress/TARGET_PSOC6_FUTURE/device/drivers/peripheral/lpcomp/cy_lpcomp.h renamed to ‎targets/TARGET_Cypress/TARGET_PSOC6_FUTURE/device/drivers/include/cy_lpcomp.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -150,8 +150,8 @@
150150
#include <stdbool.h>
151151
#include <stddef.h>
152152
#include "cy_device_headers.h"
153-
#include "syslib/cy_syslib.h"
154-
#include "syspm/cy_syspm.h"
153+
#include "cy_syslib.h"
154+
#include "cy_syspm.h"
155155

156156
#ifndef CY_IP_MXLPCOMP
157157
#error "The LPCOMP driver is not supported on this device"

‎targets/TARGET_Cypress/TARGET_PSOC6_FUTURE/device/drivers/peripheral/lvd/cy_lvd.h renamed to ‎targets/TARGET_Cypress/TARGET_PSOC6_FUTURE/device/drivers/include/cy_lvd.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@
105105
#if !defined CY_LVD_H
106106
#define CY_LVD_H
107107

108-
#include "syspm/cy_syspm.h"
108+
#include "cy_syspm.h"
109109

110110
#ifdef __cplusplus
111111
extern "C" {

‎targets/TARGET_Cypress/TARGET_PSOC6_FUTURE/device/drivers/peripheral/mcwdt/cy_mcwdt.h renamed to ‎targets/TARGET_Cypress/TARGET_PSOC6_FUTURE/device/drivers/include/cy_mcwdt.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ extern "C" {
121121
#include <stdbool.h>
122122
#include <stddef.h>
123123
#include "cy_device_headers.h"
124-
#include "syslib/cy_syslib.h"
124+
#include "cy_syslib.h"
125125

126126
#ifndef CY_IP_MXS40SRSS_MCWDT
127127
#error "The MCWDT driver is not supported on this device"

‎targets/TARGET_Cypress/TARGET_PSOC6_FUTURE/device/drivers/peripheral/pdm_pcm/cy_pdm_pcm.h renamed to ‎targets/TARGET_Cypress/TARGET_PSOC6_FUTURE/device/drivers/include/cy_pdm_pcm.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -161,8 +161,8 @@
161161
/******************************************************************************/
162162

163163
#include "cy_device_headers.h"
164-
#include "syslib/cy_syslib.h"
165-
#include "syspm/cy_syspm.h"
164+
#include "cy_syslib.h"
165+
#include "cy_syspm.h"
166166
#include <stddef.h>
167167
#include <stdbool.h>
168168

‎targets/TARGET_Cypress/TARGET_PSOC6_FUTURE/device/drivers/peripheral/profile/cy_profile.h renamed to ‎targets/TARGET_Cypress/TARGET_PSOC6_FUTURE/device/drivers/include/cy_profile.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@
178178
#define CY_PROFILE_H
179179

180180
#include "cy_device_headers.h"
181-
#include "syslib/cy_syslib.h"
181+
#include "cy_syslib.h"
182182
#include <stddef.h>
183183

184184
#ifndef CY_IP_MXPROFILE

‎targets/TARGET_Cypress/TARGET_PSOC6_FUTURE/device/drivers/peripheral/prot/cy_prot.h renamed to ‎targets/TARGET_Cypress/TARGET_PSOC6_FUTURE/device/drivers/include/cy_prot.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -380,7 +380,7 @@
380380

381381
#include <stdbool.h>
382382
#include <stddef.h>
383-
#include "syslib/cy_syslib.h"
383+
#include "cy_syslib.h"
384384
#include "cy_device_headers.h"
385385

386386
#if defined(__cplusplus)

‎targets/TARGET_Cypress/TARGET_PSOC6_FUTURE/device/drivers/peripheral/rtc/cy_rtc.h renamed to ‎targets/TARGET_Cypress/TARGET_PSOC6_FUTURE/device/drivers/include/cy_rtc.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -280,8 +280,8 @@
280280
#include <stddef.h>
281281
#include <stdbool.h>
282282
#include "cy_device_headers.h"
283-
#include "syslib/cy_syslib.h"
284-
#include "syspm/cy_syspm.h"
283+
#include "cy_syslib.h"
284+
#include "cy_syspm.h"
285285

286286
#ifndef CY_IP_MXS40SRSS_RTC
287287
#error "The RTC driver is not supported on this device"

0 commit comments

Comments
 (0)