@@ -96,21 +96,25 @@ def get_dynamic_manifest(name, config, extra_inc_dirs=[]):
96
96
if name == "netsocket" :
97
97
manifest ['build' ]['flags' ].extend (["-DMBED_CONF_EVENTS_PRESENT" ])
98
98
manifest ['dependencies' ] = {
99
- "mbed-LWIP " : "*" ,
99
+ "mbed-lwipstack " : "*" ,
100
100
"mbed-events" : "*"
101
101
}
102
102
103
103
# arm_random_module_init
104
104
if name == "mbed-client-randlib" :
105
- manifest ['dependencies' ] = {"mbed-nanostack" : "*" }
105
+ manifest ['dependencies' ] = {"mbed-nanostack-interface" : "*" }
106
+
107
+ if name == "nfc" :
108
+ manifest ['dependencies' ] = {"mbed-events" : "*" }
106
109
107
110
return manifest
108
111
109
112
110
- def process_global_lib (libname , mbed_config ):
111
- if not libname or not mbed_config :
113
+ def process_global_lib (libname , lib_configs ):
114
+ if not libname or not lib_configs :
112
115
return
113
- lib_config = mbed_config .get ("libs" ).get (libname , {})
116
+
117
+ lib_config = lib_configs .get (libname , {})
114
118
if not lib_config :
115
119
return
116
120
lib_includes = [
@@ -169,6 +173,7 @@ def process_global_lib(libname, mbed_config):
169
173
170
174
# There is no difference in processing between lib and feature
171
175
libs = mbed_config .get ("libs" ).copy ()
176
+ libs .update (mbed_config .get ("components" ))
172
177
libs .update (mbed_config .get ("features" ))
173
178
libs .update (mbed_config .get ("frameworks" ))
174
179
@@ -195,15 +200,20 @@ def process_global_lib(libname, mbed_config):
195
200
env .get ("CPPDEFINES" , []))
196
201
197
202
if MBED_RTOS :
203
+ if not libs .get ("rtos" ):
204
+ print "Warning! This board doesn't support Mbed OS!"
198
205
env .Append (CPPDEFINES = ["MBED_CONF_RTOS_PRESENT" ])
199
- process_global_lib ("rtos" , mbed_config )
206
+ process_global_lib ("rtos" , libs )
200
207
201
208
MBED_EVENTS = "PIO_FRAMEWORK_MBED_EVENTS_PRESENT" in env .Flatten (
202
209
env .get ("CPPDEFINES" , []))
203
210
204
211
if MBED_EVENTS :
205
212
env .Append (CPPDEFINES = ["MBED_CONF_EVENTS_PRESENT" ])
206
- process_global_lib ("events" , mbed_config )
213
+ process_global_lib ("events" , libs )
214
+
215
+ if "FEATURE_CRYPTOCELL310" in env .Flatten (env .get ("CPPDEFINES" , [])):
216
+ process_global_lib ("FEATURE_CRYPTOCELL310" , libs )
207
217
208
218
core_src_files = mbed_config .get ("core" ).get ("s_sources" ) + mbed_config .get (
209
219
"core" ).get ("c_sources" ) + mbed_config .get ("core" ).get ("cpp_sources" )
@@ -248,11 +258,10 @@ def process_global_lib(libname, mbed_config):
248
258
#
249
259
250
260
for lib , lib_config in libs .items ():
261
+ if not lib_config :
262
+ continue
251
263
extra_includes = []
252
264
env .Append (EXTRA_LIB_BUILDERS = [
253
265
CustomLibBuilder (env , join (FRAMEWORK_DIR , lib_config .get ("dir" )),
254
266
get_dynamic_manifest (lib , lib_config , extra_includes ))
255
267
])
256
-
257
- if lib == "mbedtls" :
258
- env .Append (LIB_DEPS = ["mbed-mbedtls" ])
0 commit comments