From 87459e26caa21c20df47192107aa027d77282fde Mon Sep 17 00:00:00 2001 From: Paul Guenette Date: Wed, 16 Jun 2021 21:26:26 -0400 Subject: [PATCH] reorder link order to put .s files first --- Firmware/Tupfile.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Firmware/Tupfile.lua b/Firmware/Tupfile.lua index 4d66884d..2b10f5ac 100644 --- a/Firmware/Tupfile.lua +++ b/Firmware/Tupfile.lua @@ -239,10 +239,10 @@ board_v3 = { '../../ThirdParty/FreeRTOS/Source/portable/GCC/ARM_CM4F', }, code_files = { + 'startup_stm32f405xx.s', '../../ThirdParty/FreeRTOS/Source/portable/GCC/ARM_CM4F/port.c', '../../Drivers/DRV8301/drv8301.cpp', 'board.cpp', - 'startup_stm32f405xx.s', 'Src/stm32f4xx_hal_timebase_TIM.c', 'Src/tim.c', 'Src/dma.c', @@ -279,10 +279,10 @@ board_v4 = { '../../ThirdParty/FreeRTOS/Source/portable/GCC/ARM_CM7/r0p1', }, code_files = { + 'startup_stm32f722xx.s', '../../ThirdParty/FreeRTOS/Source/portable/GCC/ARM_CM7/r0p1/port.c', '../Drivers/DRV8353/drv8353.cpp', '../Drivers/status_led.cpp', - 'startup_stm32f722xx.s', 'board.cpp', 'Src/main.c', 'Src/gpio.c', @@ -418,10 +418,10 @@ tup.frule{inputs={'fibre-cpp/endpoints_template.j2', extra_inputs='odrive-interf tup.frule{inputs={'fibre-cpp/type_info_template.j2', extra_inputs='odrive-interface.yaml'}, command=python_command..' interface_generator_stub.py --definitions odrive-interface.yaml --template %f --output %o', outputs='autogen/type_info.hpp'} +add_pkg(board) add_pkg(freertos_pkg) add_pkg(cmsis_pkg) add_pkg(stm32_usb_device_library_pkg) -add_pkg(board) add_pkg(fibre_pkg) add_pkg(odrive_firmware_pkg)