Skip to content

Commit f53e10e

Browse files
Update psoc6pdl to version 1.4.0
1 parent 6ef5fb1 commit f53e10e

File tree

284 files changed

+1713
-4923
lines changed

Some content is hidden

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

284 files changed

+1713
-4923
lines changed

targets/TARGET_Cypress/TARGET_PSOC6/TARGET_CY8CKIT_062_BLE/device/COMPONENT_CM0P/TOOLCHAIN_ARM/cy8c6xx7_cm0plus.sct

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -189,15 +189,13 @@ LR_IROM1 FLASH_START (FLASH_SIZE - 0x8000)
189189
}
190190

191191
; Application heap area (HEAP)
192-
ARM_LIB_HEAP +0
192+
ARM_LIB_HEAP +0 EMPTY RAM_START+RAM_SIZE-STACK_SIZE-ImageLimit(RW_IRAM2)
193193
{
194-
* (HEAP)
195194
}
196-
195+
197196
; Stack region growing down
198-
ARM_LIB_STACK RAM_START+RAM_SIZE -STACK_SIZE
197+
ARM_LIB_STACK RAM_START+RAM_SIZE EMPTY -STACK_SIZE
199198
{
200-
* (STACK)
201199
}
202200
}
203201

targets/TARGET_Cypress/TARGET_PSOC6/TARGET_CY8CKIT_062_BLE/device/COMPONENT_CM0P/TOOLCHAIN_ARM/startup_psoc6_01_cm0plus.S

Lines changed: 2 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -23,36 +23,6 @@
2323
; * limitations under the License.
2424
; */
2525

26-
;/*
27-
;//-------- <<< Use Configuration Wizard in Context Menu >>> ------------------
28-
;*/
29-
30-
; <h> Stack Configuration
31-
; <o> Stack Size (in Bytes) <0x0-0xFFFFFFFF:8>
32-
; </h>
33-
IF :DEF:__STACK_SIZE
34-
Stack_Size EQU __STACK_SIZE
35-
ELSE
36-
Stack_Size EQU 0x00000400
37-
ENDIF
38-
AREA STACK, NOINIT, READWRITE, ALIGN=3
39-
Stack_Mem SPACE Stack_Size
40-
__initial_sp
41-
42-
; <h> Heap Configuration
43-
; <o> Heap Size (in Bytes) <0x0-0xFFFFFFFF:8>
44-
; </h>
45-
IF :DEF:__HEAP_SIZE
46-
Heap_Size EQU __HEAP_SIZE
47-
ELSE
48-
Heap_Size EQU 0x00000400
49-
ENDIF
50-
AREA HEAP, NOINIT, READWRITE, ALIGN=3
51-
__heap_base
52-
Heap_Mem SPACE Heap_Size
53-
__heap_limit
54-
55-
5626
PRESERVE8
5727
THUMB
5828

@@ -62,8 +32,9 @@ __heap_limit
6232
EXPORT __Vectors
6333
EXPORT __Vectors_End
6434
EXPORT __Vectors_Size
35+
IMPORT |Image$$ARM_LIB_STACK$$ZI$$Limit|
6536

66-
__Vectors DCD __initial_sp ; Top of Stack
37+
__Vectors DCD |Image$$ARM_LIB_STACK$$ZI$$Limit| ; Top of Stack
6738
DCD Reset_Handler ; Reset Handler
6839

6940
DCD 0x0000000D ; NMI Handler located at ROM code
@@ -284,23 +255,6 @@ NvicMux31_IRQHandler
284255

285256
ALIGN
286257

287-
288-
; User Initial Stack & Heap
289-
290-
IF :DEF:__MICROLIB
291-
292-
EXPORT __initial_sp
293-
EXPORT __heap_base
294-
EXPORT __heap_limit
295-
296-
ELSE
297-
298-
IMPORT __use_two_region_memory
299-
300-
ALIGN
301-
302-
ENDIF
303-
304258
END
305259

306260

targets/TARGET_Cypress/TARGET_PSOC6/TARGET_CY8CKIT_062_BLE/device/COMPONENT_CM0P/system_psoc6_cm0plus.c

Lines changed: 7 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,6 @@
5454
/** Default SlowClk system core frequency in Hz */
5555
#define CY_CLK_SYSTEM_FREQ_HZ_DEFAULT (4000000UL)
5656

57-
/** ALTLF frequency in Hz */
58-
#define CY_CLK_ALTLF_FREQ_HZ (32768UL)
5957

6058
/**
6159
* Holds the SlowClk (Cortex-M0+) or FastClk (Cortex-M4) system core clock,
@@ -80,11 +78,7 @@ uint32_t cy_Hfclk0FreqHz = CY_CLK_HFCLK0_FREQ_HZ_DEFAULT;
8078
uint32_t cy_PeriClkFreqHz = CY_CLK_PERICLK_FREQ_HZ_DEFAULT;
8179

8280
/** Holds the Alternate high frequency clock in Hz. Updated by \ref Cy_BLE_EcoConfigure(). */
83-
#if (defined (CY_IP_MXBLESS) && (CY_IP_MXBLESS == 1UL)) || defined (CY_DOXYGEN)
84-
uint32_t cy_BleEcoClockFreqHz = CY_CLK_ALTHF_FREQ_HZ;
85-
#else
86-
uint32_t cy_BleEcoClockFreqHz = 0UL;
87-
#endif /* (defined (CY_IP_MXBLESS) && (CY_IP_MXBLESS == 1UL)) || defined (CY_DOXYGEN) */
81+
uint32_t cy_BleEcoClockFreqHz = 0UL;
8882

8983

9084
/*******************************************************************************
@@ -160,15 +154,11 @@ void SystemInit(void)
160154
Cy_SystemInit();
161155
SystemCoreClockUpdate();
162156

163-
#if defined(CY_DEVICE_PSOC6ABLE2) && !defined(CY_PSOC6ABLE2_REV_0A_SUPPORT_DISABLE)
164-
if (CY_SYSLIB_DEVICE_REV_0A == Cy_SysLib_GetDeviceRevision())
165-
{
166-
/* Clear data register of IPC structure #7, reserved for the Deep-Sleep operations. */
167-
IPC_STRUCT7->DATA = 0UL;
168-
/* Release IPC structure #7 to avoid deadlocks in case of SW or WDT reset during Deep-Sleep entering. */
169-
IPC_STRUCT7->RELEASE = 0UL;
170-
}
171-
#endif /* defined(CY_DEVICE_PSOC6ABLE2) && !defined(CY_PSOC6ABLE2_REV_0A_SUPPORT_DISABLE) */
157+
/* Clear data register of IPC structure #7, reserved for the Deep-Sleep operations. */
158+
REG_IPC_STRUCT_DATA(CY_IPC_STRUCT_PTR(CY_IPC_CHAN_DDFT)) = 0UL;
159+
160+
/* Release IPC structure #7 to avoid deadlocks in case of SW or WDT reset during Deep-Sleep entering. */
161+
REG_IPC_STRUCT_RELEASE(CY_IPC_STRUCT_PTR(CY_IPC_CHAN_DDFT)) = 0UL;
172162

173163
#if !defined(CY_IPC_DEFAULT_CFG_DISABLE)
174164
/* Allocate and initialize semaphores for the system operations. */
@@ -222,10 +212,7 @@ void SystemInit(void)
222212
/* .userPipeIsrHandler */ &Cy_SysIpcPipeIsrCm0
223213
};
224214

225-
if (cy_device->flashPipeRequired != 0u)
226-
{
227-
Cy_IPC_Pipe_Init(&systemIpcPipeConfigCm0);
228-
}
215+
Cy_IPC_Pipe_Init(&systemIpcPipeConfigCm0);
229216

230217
#if defined(CY_DEVICE_PSOC6ABLE2)
231218
Cy_Flash_Init();

targets/TARGET_Cypress/TARGET_PSOC6/TARGET_CY8CKIT_062_BLE/device/COMPONENT_CM4/TOOLCHAIN_ARM/cy8c6xx7_cm4_dual.sct

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
;*******************************************************************************
66
;* \file cy8c6xx7_cm4_dual.sct
7-
;* \version 2.60
7+
;* \version 2.70
88
;*
99
;* Linker file for the ARMCC.
1010
;*
@@ -42,7 +42,7 @@
4242
;* limitations under the License.
4343
;******************************************************************************/
4444

45-
; Size of the Cortex-M0+ application flash image
45+
; The size of the Cortex-M0+ application flash image
4646
#define FLASH_CM0P_SIZE 0x2000
4747

4848
#if !defined(MBED_ROM_START)
@@ -82,7 +82,7 @@
8282
#define MBED_BOOT_STACK_SIZE 0x400
8383
#endif
8484

85-
; Size of the stack section at the end of CM4 SRAM
85+
; The size of the stack section at the end of CM4 SRAM
8686
#define STACK_SIZE MBED_BOOT_STACK_SIZE
8787

8888
; The defines below describe the location and size of blocks of memory in the target.

targets/TARGET_Cypress/TARGET_PSOC6/TARGET_CY8CKIT_062_BLE/device/COMPONENT_CM4/TOOLCHAIN_ARM/startup_psoc6_01_cm4.S

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
; * limitations under the License.
2424
; */
2525

26-
2726
PRESERVE8
2827
THUMB
2928

@@ -633,7 +632,6 @@ pass_interrupt_dacs_IRQHandler
633632

634633
ALIGN
635634

636-
637635
END
638636

639637

targets/TARGET_Cypress/TARGET_PSOC6/TARGET_CY8CKIT_062_BLE/device/COMPONENT_CM4/TOOLCHAIN_GCC_ARM/cy8c6xx7_cm4_dual.ld

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/***************************************************************************//**
22
* \file cy8c6xx7_cm4_dual.ld
3-
* \version 2.60
3+
* \version 2.70
44
*
55
* Linker file for the GNU C compiler.
66
*
@@ -40,7 +40,7 @@ SEARCH_DIR(.)
4040
GROUP(-lgcc -lc -lnosys)
4141
ENTRY(Reset_Handler)
4242

43-
/* Size of the Cortex-M0+ application image at the start of FLASH */
43+
/* The size of the Cortex-M0+ application image at the start of FLASH */
4444
FLASH_CM0P_SIZE = 0x2000;
4545

4646
#if !defined(MBED_ROM_START)
@@ -79,7 +79,7 @@ FLASH_CM0P_SIZE = 0x2000;
7979
#define MBED_BOOT_STACK_SIZE 0x400
8080
#endif
8181

82-
/* Size of the stack section at the end of CM4 SRAM */
82+
/* The size of the stack section at the end of CM4 SRAM */
8383
STACK_SIZE = MBED_BOOT_STACK_SIZE;
8484

8585
/* Force symbol to be entered in the output file as an undefined symbol. Doing

targets/TARGET_Cypress/TARGET_PSOC6/TARGET_CY8CKIT_062_BLE/device/COMPONENT_CM4/TOOLCHAIN_IAR/cy8c6xx7_cm4_dual.icf

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/***************************************************************************//**
22
* \file cy8c6xx7_cm4_dual.icf
3-
* \version 2.60
3+
* \version 2.70
44
*
55
* Linker file for the IAR compiler.
66
*
@@ -41,7 +41,7 @@
4141
/*-Specials-*/
4242
define symbol __ICFEDIT_intvec_start__ = 0x00000000;
4343

44-
/* Size of the Cortex-M0+ application image */
44+
/* The size of the Cortex-M0+ application image */
4545
define symbol FLASH_CM0P_SIZE = 0x2000;
4646

4747
if (!isdefinedsymbol(MBED_ROM_START)) {
@@ -108,7 +108,7 @@ define symbol __ICFEDIT_region_IROM0_end__ = (MBED_ROM_START + FLASH_CM0P_SIZE
108108
define symbol __ICFEDIT_region_IROM1_start__ = MBED_APP_START;
109109
define symbol __ICFEDIT_region_IROM1_end__ = (MBED_APP_START + MBED_APP_SIZE);
110110

111-
/* The following symbols define a 32K flash region used for EEPROM emulation.
111+
/* The following symbols define a 32K flash region used for EEPROM emulation.
112112
* This region can also be used as the general purpose flash.
113113
* You can assign sections to this memory region for only one of the cores.
114114
* Note some middleware (e.g. BLE, Emulated EEPROM) can place their data into this memory region.

targets/TARGET_Cypress/TARGET_PSOC6/TARGET_CY8CKIT_062_BLE/device/COMPONENT_CM4/TOOLCHAIN_IAR/startup_psoc6_01_cm4.S

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -310,10 +310,6 @@ intvec_copy
310310
STR r0, [r1]
311311
dsb
312312

313-
; Enable the FPU if used
314-
LDR R0, =Cy_SystemInitFpuEnable
315-
BLX R0
316-
317313
; Initialize data sections
318314
LDR R0, =__iar_data_init3
319315
BLX R0

0 commit comments

Comments
 (0)