Skip to content

Commit 9777ad1

Browse files
author
Arto Kinnunen
authored
Remove yotta references (#1954)
-Remove references to yotta build system -Remove unused Jenkinsfile
1 parent af8890b commit 9777ad1

File tree

5 files changed

+7
-305
lines changed

5 files changed

+7
-305
lines changed

.gitignore

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
.settings/
2-
.yotta.json
32
*.dep
43
*.htm
54
*.crf
@@ -66,8 +65,7 @@ cscope.files
6665
!debugger.ini
6766
*Log.txt
6867
*.mpw
69-
yotta_modules
70-
yotta_targets
7168
build
7269
html
7370
site
71+

Jenkinsfile

Lines changed: 0 additions & 290 deletions
This file was deleted.

source/nsconfig.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,6 @@
3232
#define _ns_cfg_header(x) __ns_cfg_header(configs/cfg_##x.h)
3333
#define ns_cfg_header(x) _ns_cfg_header(x)
3434

35-
36-
#ifdef YOTTA_CFG_NANOSTACK_CONFIGURATION
37-
#define NSCONFIG YOTTA_CFG_NANOSTACK_CONFIGURATION
38-
#endif
39-
4035
#ifdef MBED_CONF_NANOSTACK_CONFIGURATION
4136
#define NSCONFIG MBED_CONF_NANOSTACK_CONFIGURATION
4237
#endif

test/nanostack/unittest/6LoWPAN/ws_management_api/run_tests

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ lcov -q -d ../. -c -o app.info
4040
lcov -q -r app.info "/test*" -o app.info
4141
lcov -q -r app.info "/usr*" -o app.info
4242
lcov -q -r app.info "/libService*" -o app.info
43-
lcov -q -r app.info "/yotta_modules*" -o app.info
4443
genhtml -q --no-branch-coverage app.info
4544
cd ..
4645
echo

test/nanostack/unittest/stub/mbed_trace_stub.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,13 @@
1919
#include <stdarg.h>
2020
#include <stdlib.h>
2121

22-
#ifndef YOTTA_CFG_MBED_TRACE
23-
#define YOTTA_CFG_MBED_TRACE 1
24-
#define YOTTA_CFG_MBED_TRACE_FEA_IPV6 1
22+
#ifndef MBED_CONF_MBED_TRACE_ENABLE
23+
#define MBED_CONF_MBED_TRACE_ENABLE 1
24+
#define MBED_CONF_MBED_TRACE_FEA_IPV6 1
2525
#endif
2626

2727
#include "mbed-trace/mbed_trace.h"
28-
#if YOTTA_CFG_MBED_TRACE_FEA_IPV6 == 1
28+
#if MBED_CONF_MBED_TRACE_FEA_IPV6 == 1
2929
#include "mbed-client-libservice/ip6string.h"
3030
#include "mbed-client-libservice/common_functions.h"
3131
#endif
@@ -103,7 +103,7 @@ const char *mbed_trace_last(void)
103103

104104
/* Helping functions */
105105
#define tmp_data_left() m_trace.tmp_data_length-(m_trace.tmp_data_ptr-m_trace.tmp_data)
106-
#if YOTTA_CFG_MBED_TRACE_FEA_IPV6 == 1
106+
#if MBED_CONF_MBED_TRACE_FEA_IPV6 == 1
107107
char *mbed_trace_ipv6(const void *addr_ptr)
108108
{
109109
return NULL;
@@ -113,7 +113,7 @@ char *mbed_trace_ipv6_prefix(const uint8_t *prefix, uint8_t prefix_len)
113113
{
114114
return NULL;
115115
}
116-
#endif //YOTTA_CFG_MBED_TRACE_FEA_IPV6
116+
#endif //MBED_CONF_MBED_TRACE_FEA_IPV6
117117

118118
char *mbed_trace_array(const uint8_t *buf, uint16_t len)
119119
{

0 commit comments

Comments
 (0)