Skip to content

Commit 67c6bdb

Browse files
linlingaolinlingao
committed
removed xip unrelated changes
1 parent f1813e5 commit 67c6bdb

File tree

5 files changed

+27
-99
lines changed

5 files changed

+27
-99
lines changed

‎targets/TARGET_Cypress/TARGET_PSOC6/TARGET_CY8CKIT_062_BLE/device/TOOLCHAIN_GCC_ARM/startup_psoc6_01_cm4.S‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,23 @@ __StackLimit:
5353
__StackTop:
5454
.size __StackTop, . - __StackTop
5555

56+
.section .heap
57+
.align 3
58+
#ifdef __HEAP_SIZE
59+
.equ Heap_Size, __HEAP_SIZE
60+
#else
61+
.equ Heap_Size, 0x00000400
62+
#endif
63+
.globl __HeapBase
64+
.globl __HeapLimit
65+
__HeapBase:
66+
.if Heap_Size
67+
.space Heap_Size
68+
.endif
69+
.size __HeapBase, . - __HeapBase
70+
__HeapLimit:
71+
.size __HeapLimit, . - __HeapLimit
72+
5673
.section .vectors
5774
.align 2
5875
.globl __Vectors

‎targets/TARGET_Cypress/TARGET_PSOC6/TARGET_CY8CPROTO_064_SB/COMPONENT_BSP_DESIGN_MODUS/GeneratedSource/cycfg_qspi_memslot.h‎

Lines changed: 0 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -22,76 +22,6 @@
2222
* limitations under the License.
2323
********************************************************************************/
2424

25-
/*******************************************************************************
26-
27-
QSPI_CONFIG_START
28-
29-
<CySMIFConfiguration>
30-
<DevicePath>PSoC 6.xml</DevicePath>
31-
<SlotConfigs>
32-
<SlotConfig>
33-
<SlaveSlot>0</SlaveSlot>
34-
<PartNumber>S25FL512S</PartNumber>
35-
<MemoryMapped>true</MemoryMapped>
36-
<DualQuad>None</DualQuad>
37-
<StartAddress>0x18000000</StartAddress>
38-
<Size>0x40000</Size>
39-
<EndAddress>0x1803FFFF</EndAddress>
40-
<WriteEnable>true</WriteEnable>
41-
<Encrypt>false</Encrypt>
42-
<DataSelect>QUAD_SPI_DATA_0_3</DataSelect>
43-
<MemoryConfigsPath>S25FL512S</MemoryConfigsPath>
44-
<ConfigDataInFlash>true</ConfigDataInFlash>
45-
</SlotConfig>
46-
<SlotConfig>
47-
<SlaveSlot>1</SlaveSlot>
48-
<PartNumber>Not used</PartNumber>
49-
<MemoryMapped>false</MemoryMapped>
50-
<DualQuad>None</DualQuad>
51-
<StartAddress>0x18010000</StartAddress>
52-
<Size>0x10000</Size>
53-
<EndAddress>0x1801FFFF</EndAddress>
54-
<WriteEnable>false</WriteEnable>
55-
<Encrypt>false</Encrypt>
56-
<DataSelect>SPI_MOSI_MISO_DATA_0_1</DataSelect>
57-
<MemoryConfigsPath>default_memory.xml</MemoryConfigsPath>
58-
<ConfigDataInFlash>false</ConfigDataInFlash>
59-
</SlotConfig>
60-
<SlotConfig>
61-
<SlaveSlot>2</SlaveSlot>
62-
<PartNumber>Not used</PartNumber>
63-
<MemoryMapped>false</MemoryMapped>
64-
<DualQuad>None</DualQuad>
65-
<StartAddress>0x18020000</StartAddress>
66-
<Size>0x10000</Size>
67-
<EndAddress>0x1802FFFF</EndAddress>
68-
<WriteEnable>false</WriteEnable>
69-
<Encrypt>false</Encrypt>
70-
<DataSelect>SPI_MOSI_MISO_DATA_0_1</DataSelect>
71-
<MemoryConfigsPath>default_memory.xml</MemoryConfigsPath>
72-
<ConfigDataInFlash>false</ConfigDataInFlash>
73-
</SlotConfig>
74-
<SlotConfig>
75-
<SlaveSlot>3</SlaveSlot>
76-
<PartNumber>Not used</PartNumber>
77-
<MemoryMapped>false</MemoryMapped>
78-
<DualQuad>None</DualQuad>
79-
<StartAddress>0x18030000</StartAddress>
80-
<Size>0x10000</Size>
81-
<EndAddress>0x1803FFFF</EndAddress>
82-
<WriteEnable>false</WriteEnable>
83-
<Encrypt>false</Encrypt>
84-
<DataSelect>SPI_MOSI_MISO_DATA_0_1</DataSelect>
85-
<MemoryConfigsPath>default_memory.xml</MemoryConfigsPath>
86-
<ConfigDataInFlash>false</ConfigDataInFlash>
87-
</SlotConfig>
88-
</SlotConfigs>
89-
</CySMIFConfiguration>
90-
91-
QSPI_CONFIG_END
92-
93-
*******************************************************************************/
94-
9525
#ifndef CYCFG_QSPI_MEMSLOT_H
9626
#define CYCFG_QSPI_MEMSLOT_H
9727
#include "cy_smif_memslot.h"
@@ -111,7 +41,6 @@ extern const cy_stc_smif_mem_cmd_t S25FL128S_SlaveSlot_0_writeStsRegQeCmd;
11141
extern const cy_stc_smif_mem_device_cfg_t deviceCfg_S25FL128S_SlaveSlot_0;
11242

11343
extern const cy_stc_smif_mem_config_t S25FL128S_SlaveSlot_0;
114-
11544
extern const cy_stc_smif_mem_config_t* const smifMemConfigs[CY_SMIF_DEVICE_NUM];
11645

11746
extern const cy_stc_smif_block_config_t smifBlockConfig;

‎targets/TARGET_Cypress/TARGET_PSOC6/TARGET_CY8CPROTO_064_SB/device/TOOLCHAIN_GCC_ARM/cyb06xx7_cm4_dual.ld‎

Lines changed: 10 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -162,21 +162,6 @@ GROUP(libgcc.a libc.a libm.a libnosys.a)
162162
SECTIONS
163163
{
164164
/* Cortex-M4 application image */
165-
/* Places the code in the Execute in Place (XIP) section. See the smif driver
166-
* documentation for details.
167-
*/
168-
.cy_xip :
169-
{
170-
. = ALIGN(4);
171-
__cy_xip_start__ = .;
172-
KEEP(*(.cy_xip))
173-
#if XIP_ENABLE == 1
174-
*lwipstack*.o (.text .text* .rodata .rodata.* .constdata .constdata.* .conststring .conststring.*)
175-
*mbed-cloud-client*.o (.text .text* .rodata .rodata.* .constdata .constdata.* .conststring .conststring.*)
176-
#endif
177-
__cy_xip_end__ = .;
178-
} > xip
179-
180165
.text FLASH_CM4_START :
181166
{
182167
. = ALIGN(4);
@@ -188,11 +173,7 @@ SECTIONS
188173
__end__ = .;
189174

190175
. = ALIGN(4);
191-
#if XIP_ENABLE == 1
192-
*(EXCLUDE_FILE(*lwipstack*.o *mbed-cloud-client*.o) .text .text*)
193-
#else
194176
*(.text*)
195-
#endif
196177

197178
KEEP(*(.init))
198179
KEEP(*(.fini))
@@ -212,11 +193,7 @@ SECTIONS
212193
*(.dtors)
213194

214195
/* Read-only code (constants). */
215-
#if XIP_ENABLE == 1
216-
*(EXCLUDE_FILE(*lwipstack*.o *mbed-cloud-client*.o) .rodata .rodata.* .constdata .constdata.* .conststring .conststring.*)
217-
#else
218196
*(.rodata .rodata.* .constdata .constdata.* .conststring .conststring.*)
219-
#endif
220197

221198
KEEP(*(.eh_frame*))
222199
} > flash
@@ -357,7 +334,7 @@ SECTIONS
357334
__HeapBase = .;
358335
__end__ = .;
359336
end = __end__;
360-
*(.heap*)
337+
KEEP(*(.heap*))
361338
. = ORIGIN(ram) + LENGTH(ram) - STACK_SIZE;
362339
__HeapLimit = .;
363340
} > ram
@@ -423,6 +400,15 @@ SECTIONS
423400
} > sflash_rtoc_2
424401

425402

403+
/* Places the code in the Execute in Place (XIP) section. See the smif driver
404+
* documentation for details.
405+
*/
406+
.cy_xip :
407+
{
408+
KEEP(*(.cy_xip))
409+
} > xip
410+
411+
426412
/* eFuse */
427413
.cy_efuse :
428414
{

‎targets/TARGET_Cypress/TARGET_PSOC6/mbed_overrides.c‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,6 @@
3131
void mailbox_init(void);
3232
#endif
3333

34-
#if MBED_CONF_TARGET_XIP_ENABLE
35-
extern void qspi_xip_start();
36-
#endif
3734

3835
#if (defined(CY_CFG_PWR_SYS_IDLE_MODE) && (CY_CFG_PWR_SYS_IDLE_MODE == CY_CFG_PWR_MODE_ACTIVE))
3936
/*******************************************************************************

‎targets/targets.json‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8583,7 +8583,6 @@
85838583
"SERIAL_FC",
85848584
"SERIAL_ASYNCH",
85858585
"SLEEP",
8586-
"QSPI",
85878586
"SPI",
85888587
"SPI_ASYNCH",
85898588
"SPISLAVE",

0 commit comments

Comments
 (0)