Skip to content

Commit f4412c3

Browse files
authored
Merge pull request #5085 from supperthomas/lpc55sxx
[bsp][lpc55sxx] fix the complier error
2 parents cf82025 + dce28d3 commit f4412c3

File tree

9 files changed

+1551
-880
lines changed

9 files changed

+1551
-880
lines changed

bsp/lpc55sxx/lpc55s69_nxp_evk/.config

Lines changed: 226 additions & 89 deletions
Large diffs are not rendered by default.

bsp/lpc55sxx/lpc55s69_nxp_evk/applications/SConscript

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import rtconfig
22
from building import *
33

44
cwd = GetCurrentDir()
5-
src = Glob('*.c')
5+
src = Glob('main.c')
66
CPPPATH = [cwd]
77

88
# add for startup script

bsp/lpc55sxx/lpc55s69_nxp_evk/applications/main.c

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
* Date Author Notes
99
* 2019-10-24 Magicoe first version
1010
* 2020-01-10 Kevin/Karl Add PS demo
11+
* 2020-09-21 supperthomas fix the main.c
1112
*
1213
*/
1314

@@ -18,12 +19,9 @@
1819
/* GPIO1_4 is Blue LED */
1920
#define LEDB_PIN GET_PINS(1, 4)
2021

21-
extern void protected_storage_demo_thread(void * parameters);
2222

2323
int main(void)
2424
{
25-
rt_thread_t t_psa_ps_demo;
26-
2725
#if defined(__CC_ARM)
2826
rt_kprintf("using armcc, version: %d\n", __ARMCC_VERSION);
2927
#elif defined(__CLANG_ARM)
@@ -34,14 +32,6 @@ int main(void)
3432
rt_kprintf("using gcc, version: %d.%d\n", __GNUC__, __GNUC_MINOR__);
3533
#endif
3634

37-
t_psa_ps_demo = rt_thread_create("psa_ps_demo",
38-
protected_storage_demo_thread,
39-
RT_NULL,
40-
512,
41-
( RT_MAIN_THREAD_PRIORITY - 1),
42-
50);
43-
if (t_psa_ps_demo != RT_NULL) rt_thread_startup(t_psa_ps_demo);
44-
4535
rt_pin_mode(LEDB_PIN, PIN_MODE_OUTPUT); /* Set GPIO as Output */
4636
while (1)
4737
{

bsp/lpc55sxx/lpc55s69_nxp_evk/board/board.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
// </RDTConfigurator>
3232
#if defined(__CC_ARM) || defined(__CLANG_ARM)
3333
extern int Image$$ARM_LIB_HEAP$$ZI$$Base;
34+
extern int Image$$ARM_LIB_STACK$$ZI$$Base;
3435
#define HEAP_BEGIN ((void *)&Image$$ARM_LIB_HEAP$$ZI$$Base)
3536
#elif defined(__ICCARM__)
3637
#pragma section="HEAP"
@@ -40,7 +41,7 @@ extern int __HeapBase;
4041
extern int __HeapLimit;
4142
#define HEAP_BEGIN ((void *)&__HeapBase)
4243
#endif
43-
#define HEAP_END ((void*)&__HeapLimit)
44+
#define HEAP_END ((void*)&Image$$ARM_LIB_STACK$$ZI$$Base)
4445

4546
void rt_hw_board_init(void);
4647

0 commit comments

Comments
 (0)