Skip to content

Commit f7c50a4

Browse files
author
Arto Kinnunen
authored
Merge pull request #161 from ARMmbed/IOTTHD-3286
Allow compilation with non K64F/K66F boards
2 parents 45595b1 + ea84d86 commit f7c50a4

File tree

3 files changed

+17
-3
lines changed

3 files changed

+17
-3
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
https://github.com/ARMmbed/sal-nanostack-driver-k64f-eth/#b73d37cc229c595270baf50e83c80376e7c4a95d
1+
https://github.com/ARMmbed/sal-nanostack-driver-k64f-eth/#ffb13d8887945526f53020a92658ea1bc7d100fd

source/border_router_main.cpp

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -167,15 +167,28 @@ void appl_info_trace(void)
167167
tr_info("Starting NanoStack Border Router...");
168168
tr_info("Build date: %s %s", __DATE__, __TIME__);
169169
#ifdef MBED_MAJOR_VERSION
170-
tr_info("Mbed OS version: %d.%d.%d\n", MBED_MAJOR_VERSION, MBED_MINOR_VERSION, MBED_PATCH_VERSION);
170+
tr_info("Mbed OS: %d", MBED_VERSION);
171+
#endif
172+
173+
#if defined(MBED_SYS_STATS_ENABLED)
174+
mbed_stats_sys_t stats;
175+
mbed_stats_sys_get(&stats);
176+
177+
/* ARM = 1, GCC_ARM = 2, IAR = 3 */
178+
tr_info("Compiler ID: %d", stats.compiler_id);
179+
/* Compiler versions:
180+
ARM: PVVbbbb (P = Major; VV = Minor; bbbb = build number)
181+
GCC: VVRRPP (VV = Version; RR = Revision; PP = Patch)
182+
IAR: VRRRPPP (V = Version; RRR = Revision; PPP = Patch)
183+
*/
184+
tr_info("Compiler Version: %d", stats.compiler_version);
171185
#endif
172186
}
173187

174188
/**
175189
* \brief The entry point for this application.
176190
* Sets up the application and starts the border router module.
177191
*/
178-
179192
int main(int argc, char **argv)
180193
{
181194
ns_hal_init(app_stack_heap, APP_DEFINED_HEAP_SIZE, app_heap_error_handler, &heap_info);

source/mbedtls_thread_config.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@
5050

5151
/* Save RAM by adjusting to our exact needs */
5252
#define MBEDTLS_ECP_MAX_BITS 256
53+
#undef MBEDTLS_MPI_MAX_SIZE
5354
#define MBEDTLS_MPI_MAX_SIZE 32 // 256 bits is 32 bytes
5455

5556
/* Save ROM and a few bytes of RAM by specifying our own ciphersuite list */

0 commit comments

Comments
 (0)