3232board = env .BoardConfig ()
3333
3434FRAMEWORK_DIR = platform .get_package_dir ("framework-arduinoststm32" )
35- CMSIS_DIR = join (platform .get_package_dir ("framework-cmsis" ) , "CMSIS" )
35+ CMSIS_DIR = join (platform .get_package_dir ("framework-arduinoststm32" ), "CMSIS" , "CMSIS" )
3636assert isdir (FRAMEWORK_DIR )
3737assert isdir (CMSIS_DIR )
3838
@@ -168,7 +168,6 @@ def configure_application_offset(mcu, upload_protocol):
168168 join (FRAMEWORK_DIR , "cores" , "arduino" , "stm32" ),
169169 join (FRAMEWORK_DIR , "cores" , "arduino" , "stm32" , "LL" ),
170170 join (FRAMEWORK_DIR , "cores" , "arduino" , "stm32" , "usb" ),
171- join (FRAMEWORK_DIR , "cores" , "arduino" , "stm32" , "OpenAMP" ),
172171 join (FRAMEWORK_DIR , "cores" , "arduino" , "stm32" , "usb" , "hid" ),
173172 join (FRAMEWORK_DIR , "cores" , "arduino" , "stm32" , "usb" , "cdc" ),
174173 join (FRAMEWORK_DIR , "system" , "Drivers" , series + "_HAL_Driver" , "Inc" ),
@@ -192,37 +191,6 @@ def configure_application_offset(mcu, upload_protocol):
192191 "Core" ,
193192 "Src" ,
194193 ),
195- join (
196- FRAMEWORK_DIR ,
197- "system" ,
198- "Middlewares" ,
199- "OpenAMP"
200- ),
201- join (
202- FRAMEWORK_DIR ,
203- "system" ,
204- "Middlewares" ,
205- "OpenAMP" ,
206- "open-amp" ,
207- "lib" ,
208- "include" ,
209- ),
210- join (
211- FRAMEWORK_DIR ,
212- "system" ,
213- "Middlewares" ,
214- "OpenAMP" ,
215- "libmetal" ,
216- "lib" ,
217- "include" ,
218- ),
219- join (
220- FRAMEWORK_DIR ,
221- "system" ,
222- "Middlewares" ,
223- "OpenAMP" ,
224- "virtual_driver"
225- ),
226194 join (CMSIS_DIR , "Core" , "Include" ),
227195 join (
228196 FRAMEWORK_DIR ,
@@ -234,6 +202,7 @@ def configure_application_offset(mcu, upload_protocol):
234202 series ,
235203 "Include" ,
236204 ),
205+ join (CMSIS_DIR , "DSP" , "Include" ),
237206 join (
238207 FRAMEWORK_DIR ,
239208 "system" ,
@@ -246,7 +215,6 @@ def configure_application_offset(mcu, upload_protocol):
246215 "Templates" ,
247216 "gcc" ,
248217 ),
249- join (CMSIS_DIR , "DSP" , "Include" ),
250218 join (FRAMEWORK_DIR , "cores" , "arduino" ),
251219 variant_dir ,
252220 ],
@@ -273,18 +241,6 @@ def configure_application_offset(mcu, upload_protocol):
273241 LIBPATH = [variant_dir , join (CMSIS_DIR , "DSP" , "Lib" , "GCC" )],
274242)
275243
276- if "build.usb_product" in board :
277- env .Append (
278- CPPDEFINES = [
279- ("USB_VID" , board .get ("build.hwids" )[0 ][0 ]),
280- ("USB_PID" , board .get ("build.hwids" )[0 ][1 ]),
281- ("USB_PRODUCT" , '\\ "%s\\ "' %
282- board .get ("build.usb_product" , "" ).replace ('"' , "" )),
283- ("USB_MANUFACTURER" , '\\ "%s\\ "' %
284- board .get ("vendor" , "" ).replace ('"' , "" ))
285- ]
286- )
287-
288244env .ProcessFlags (board .get ("build.framework_extra_flags.arduino" , "" ))
289245
290246configure_application_offset (mcu , upload_protocol )
@@ -294,10 +250,9 @@ def configure_application_offset(mcu, upload_protocol):
294250#
295251
296252if not board .get ("build.ldscript" , "" ):
297- env .Replace (LDSCRIPT_PATH = join (FRAMEWORK_DIR , "system" , "ldscript.ld" ))
298253 if not isfile (join (env .subst (variant_dir ), "ldscript.ld" )):
299254 print ("Warning! Cannot find linker script for the current target!\n " )
300- env .Append ( LINKFLAGS = [( "-Wl,--default-script" , join (variant_dir , "ldscript.ld" ))] )
255+ env .Replace ( LDSCRIPT_PATH = join (variant_dir , "ldscript.ld" ))
301256
302257#
303258# Process configuration flags
@@ -338,4 +293,4 @@ def configure_application_offset(mcu, upload_protocol):
338293 join ("$BUILD_DIR" , "SrcWrapper" ), join (FRAMEWORK_DIR , "libraries" , "SrcWrapper" )
339294)
340295
341- env .Prepend (LIBS = libs )
296+ env .Prepend (LIBS = libs )
0 commit comments