Skip to content

Commit 370b270

Browse files
bogdanmbogdanm
committed
Merge pull request #30 from pbrier/master
Experimental fix for issue #29
2 parents 9d846d9 + ac07848 commit 370b270

File tree

7 files changed

+40
-19
lines changed

7 files changed

+40
-19
lines changed

‎libraries/mbed/targets/cmsis/TARGET_NXP/TARGET_LPC176X/TOOLCHAIN_GCC_ARM/LPC1768.ld

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,26 @@ SECTIONS
115115

116116
} > RAM
117117

118+
119+
/* Code can explicitly ask for data to be
120+
placed in these higher RAM banks where
121+
they will be left uninitialized.
122+
*/
123+
.AHBSRAM0 (NOLOAD):
124+
{
125+
Image$$RW_IRAM2$$Base = . ;
126+
*(AHBSRAM0)
127+
Image$$RW_IRAM2$$ZI$$Limit = .;
128+
} > USB_RAM
129+
130+
.AHBSRAM1 (NOLOAD):
131+
{
132+
Image$$RW_IRAM3$$Base = . ;
133+
*(AHBSRAM1)
134+
Image$$RW_IRAM3$$ZI$$Limit = .;
135+
} > ETH_RAM
136+
137+
118138
.bss :
119139
{
120140
__bss_start__ = .;
@@ -123,6 +143,7 @@ SECTIONS
123143
__bss_end__ = .;
124144
Image$$RW_IRAM1$$ZI$$Limit = . ;
125145
} > RAM
146+
126147

127148
.heap :
128149
{

‎libraries/net/eth/lwip-eth/arch/lpc17_emac.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,10 @@ struct lpc_enetdata {
142142
# define ETHMEM_SECTION ALIGNED(8)
143143
#endif
144144

145+
#if defined(TARGET_LPC1768) && defined(TOOLCHAIN_GCC_ARM)
146+
#define ETHMEM_SECTION __attribute__((section("AHBSRAM1"),aligned))
147+
#endif
148+
145149
/** \brief LPC EMAC driver work data
146150
*/
147151
ETHMEM_SECTION struct lpc_enetdata lpc_enetdata;

‎libraries/tests/mbed/env/test_env.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ void led_blink(PinName led) {
1313

1414
void notify_completion(bool success) {
1515
if (success) {
16-
printf("{{success}}"NL);
16+
printf("{{success}}" NL );
1717
} else {
18-
printf("{{failure}}"NL);
18+
printf("{{failure}}" NL );
1919
}
2020

21-
printf("{{end}}"NL);
21+
printf("{{end}}" NL);
2222
led_blink(success?LED1:LED4);
2323
}

‎workspace_tools/libraries.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@
7171
"source_dir": [ETH_SOURCES, LWIP_SOURCES],
7272
"build_dir": ETH_LIBRARY,
7373
"dependencies": [MBED_LIBRARIES, RTOS_LIBRARIES, ETH_SOURCES, LWIP_SOURCES],
74-
"supported": CORTEX_ARM_SUPPORT
74+
# "supported": CORTEX_ARM_SUPPORT
7575
},
7676

7777
{

‎workspace_tools/settings.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,8 @@
7676
MY_ARM_CLIB = join(ARM_PATH, "lib", "microlib")
7777

7878
# GCC ARM
79-
GCC_ARM_PATH = "C:/arm-none-eabi-gcc-4_7/bin"
79+
# GCC_ARM_PATH = "C:/arm-none-eabi-gcc-4_7/bin"
80+
GCC_ARM_PATH = ""
8081

8182
# GCC CodeSourcery
8283
GCC_CS_PATH = "C:/Program Files (x86)/CodeSourcery/Sourcery_CodeBench_Lite_for_ARM_EABI/bin"

‎workspace_tools/tests.py

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -503,79 +503,74 @@
503503
"id": "NET_1", "description": "TCP client hello world",
504504
"source_dir": join(TEST_DIR, "net", "helloworld", "tcpclient"),
505505
"dependencies": [MBED_LIBRARIES, RTOS_LIBRARIES, ETH_LIBRARY],
506-
"supported": CORTEX_ARM_SUPPORT,
506+
# "supported": CORTEX_ARM_SUPPORT,
507507
},
508508
{
509509
"id": "NET_2", "description": "UDP client hello world",
510510
"source_dir": join(TEST_DIR, "net", "helloworld", "udpclient"),
511511
"dependencies": [MBED_LIBRARIES, RTOS_LIBRARIES, ETH_LIBRARY],
512-
"supported": CORTEX_ARM_SUPPORT,
512+
# "supported": CORTEX_ARM_SUPPORT,
513513
},
514514
{
515515
"id": "NET_3", "description": "TCP echo server",
516516
"source_dir": join(TEST_DIR, "net", "echo", "tcp_server"),
517517
"dependencies": [MBED_LIBRARIES, RTOS_LIBRARIES, ETH_LIBRARY],
518-
"supported": CORTEX_ARM_SUPPORT,
518+
# "supported": CORTEX_ARM_SUPPORT,
519519
},
520520
{
521521
"id": "NET_4", "description": "TCP echo client",
522522
"source_dir": join(TEST_DIR, "net", "echo", "tcp_client"),
523523
"dependencies": [MBED_LIBRARIES, RTOS_LIBRARIES, ETH_LIBRARY],
524-
"supported": CORTEX_ARM_SUPPORT,
524+
# "supported": CORTEX_ARM_SUPPORT,
525525
},
526526
{
527527
"id": "NET_5", "description": "UDP echo server",
528528
"source_dir": join(TEST_DIR, "net", "echo", "udp_server"),
529529
"dependencies": [MBED_LIBRARIES, RTOS_LIBRARIES, ETH_LIBRARY],
530-
"supported": CORTEX_ARM_SUPPORT,
530+
# "supported": CORTEX_ARM_SUPPORT,
531531
},
532532
{
533533
"id": "NET_6", "description": "UDP echo client",
534534
"source_dir": join(TEST_DIR, "net", "echo", "udp_client"),
535535
"dependencies": [MBED_LIBRARIES, RTOS_LIBRARIES, ETH_LIBRARY],
536-
"supported": CORTEX_ARM_SUPPORT,
536+
# "supported": CORTEX_ARM_SUPPORT,
537537
},
538538
{
539539
"id": "NET_7", "description": "HTTP client",
540540
"source_dir": join(TEST_DIR, "net", "protocols", "HTTPClient_HelloWorld"),
541541
"dependencies": [MBED_LIBRARIES, RTOS_LIBRARIES, ETH_LIBRARY],
542-
"supported": CORTEX_ARM_SUPPORT,
542+
# "supported": CORTEX_ARM_SUPPORT,
543543
},
544544
{
545545
"id": "NET_8", "description": "NTP client",
546546
"source_dir": join(TEST_DIR, "net", "protocols", "NTPClient_HelloWorld"),
547547
"dependencies": [MBED_LIBRARIES, RTOS_LIBRARIES, ETH_LIBRARY],
548-
"supported": CORTEX_ARM_SUPPORT,
548+
# "supported": CORTEX_ARM_SUPPORT,
549549
},
550550
{
551551
"id": "NET_9", "description": "Multicast Send",
552552
"source_dir": join(TEST_DIR, "net", "helloworld", "multicast_send"),
553553
"dependencies": [MBED_LIBRARIES, RTOS_LIBRARIES, ETH_LIBRARY],
554-
"supported": CORTEX_ARM_SUPPORT,
555554
},
556555
{
557556
"id": "NET_10", "description": "Multicast Receive",
558557
"source_dir": join(TEST_DIR, "net", "helloworld", "multicast_receive"),
559558
"dependencies": [MBED_LIBRARIES, RTOS_LIBRARIES, ETH_LIBRARY],
560-
"supported": CORTEX_ARM_SUPPORT,
561559
},
562560
{
563561
"id": "NET_11", "description": "Broadcast Send",
564562
"source_dir": join(TEST_DIR, "net", "helloworld", "broadcast_send"),
565563
"dependencies": [MBED_LIBRARIES, RTOS_LIBRARIES, ETH_LIBRARY],
566-
"supported": CORTEX_ARM_SUPPORT,
567564
},
568565
{
569566
"id": "NET_12", "description": "Broadcast Receive",
570567
"source_dir": join(TEST_DIR, "net", "helloworld", "broadcast_receive"),
571568
"dependencies": [MBED_LIBRARIES, RTOS_LIBRARIES, ETH_LIBRARY],
572-
"supported": CORTEX_ARM_SUPPORT,
573569
},
574570
{
575571
"id": "NET_13", "description": "TCP client echo loop",
576572
"source_dir": join(TEST_DIR, "net", "echo", "tcp_client_loop"),
577573
"dependencies": [MBED_LIBRARIES, RTOS_LIBRARIES, ETH_LIBRARY],
578-
"supported": CORTEX_ARM_SUPPORT,
579574
},
580575

581576
# Vodafone tests

‎workspace_tools/toolchains/gcc.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ def __init__(self, target, options=None, notify=None, tool_path=""):
6262
self.asm = [join(tool_path, "arm-none-eabi-as")] + self.cpu
6363

6464
self.cc = [join(tool_path, "arm-none-eabi-gcc"), "-std=gnu99"] + common_flags
65-
self.cppc =[join(tool_path, "arm-none-eabi-g++"), "-std=gnu++98"] + common_flags
65+
self.cppc =[join(tool_path, "arm-none-eabi-g++"), "-std=gnu++11"] + common_flags
6666

6767
self.ld = [join(tool_path, "arm-none-eabi-gcc"), "-Wl,--gc-sections", "-Wl,--wrap,main"] + self.cpu
6868
self.sys_libs = ["stdc++", "supc++", "m", "c", "gcc"]

0 commit comments

Comments
 (0)