Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-21 15:25:17 +03:00
Code Issues Wiki Activity

Revert "Remove -nostartfiles linker option from bootloader (#5996)"

Browse source 
This reverts commit 17b4aa2466.

Removing the -nostartfiles caused the Taranis bootloader to include
a number of strange functions. Instead define _fini to avoid the linker
issues.
This commit is contained in:
Arne Schwabe 2018-06-30 00:36:38 +02:00
parent 9cbd0b9813
commit 429d55769c
3 changed files with 16 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
radio/src/targets/common/arm/stm32/bootloader/CMakeLists.txt
View file

@ -73,6 +73,7 @@ set(BOOTLOADER_SRC
../usb_bsp.c ../usb_bsp.c
../usb_driver.cpp ../usb_driver.cpp
../flash_driver.cpp ../flash_driver.cpp
init.c
boot.cpp boot.cpp
bin_files.cpp bin_files.cpp
) )
@ -111,7 +112,7 @@ remove_definitions(-DCLI)
remove_definitions(-DUSB_SERIAL) remove_definitions(-DUSB_SERIAL)
add_definitions(-DBOOT) add_definitions(-DBOOT)
set(CMAKE_EXE_LINKER_FLAGS "-mcpu=${MCU} -mthumb -lm -T${RADIO_SRC_DIRECTORY}/targets/${TARGET_DIR}/stm32_ramboot.ld -Wl,-Map=bootloader.map,--cref,--no-warn-mismatch,--gc-sections") set(CMAKE_EXE_LINKER_FLAGS "-mcpu=${MCU} -mthumb -nostartfiles -lm -T${RADIO_SRC_DIRECTORY}/targets/${TARGET_DIR}/stm32_ramboot.ld -Wl,-Map=bootloader.map,--cref,--no-warn-mismatch,--gc-sections")
add_executable(bootloader ${BOOTLOADER_SRC}) add_executable(bootloader ${BOOTLOADER_SRC})
add_dependencies(bootloader ${BITMAPS_TARGET} firmware_translations) add_dependencies(bootloader ${BITMAPS_TARGET} firmware_translations)

4
radio/src/targets/common/arm/stm32/bootloader/boot.cpp
View file

@ -527,3 +527,7 @@ int main()
return 0; return 0;
} }
#if defined(PCBHORUS)
void *__dso_handle = 0;
#endif

9
radio/src/targets/common/arm/stm32/bootloader/init.c Normal file
View file

@ -0,0 +1,9 @@
void _init (void)
{
}
void _fini(void)
{
}