From 71fd386f1a1557116e9e6c64f664b55f1e29f4d4 Mon Sep 17 00:00:00 2001 From: Malte Langermann <54738901+gagarinlg@users.noreply.github.com> Date: Fri, 17 Oct 2025 06:37:09 +0200 Subject: [PATCH] chore: only use nano lib when required (#6655) --- radio/src/CMakeLists.txt | 9 +++++++-- radio/src/targets/horus/CMakeLists.txt | 1 + radio/src/targets/pl18/CMakeLists.txt | 1 + tools/build-common.sh | 6 +++--- 4 files changed, 12 insertions(+), 5 deletions(-) diff --git a/radio/src/CMakeLists.txt b/radio/src/CMakeLists.txt index d19c377d6..58b83e8b2 100644 --- a/radio/src/CMakeLists.txt +++ b/radio/src/CMakeLists.txt @@ -41,7 +41,7 @@ option(DEBUG_SEGGER_RTT "Debug output to Segger RTT" OFF) option(DEBUG_WINDOWS "Turn on windows traces" OFF) option(DEBUG_YAML "Turn on YAML traces" OFF) option(DEBUG_LABELS "Turn on Labels traces" OFF) -option(NANO "Use nano newlib and binalloc") +option(NANO "Use nano newlib and binalloc" ON) option(TEST_BUILD_WARNING "Warn this is a test build" OFF) option(MODULE_PROTOCOL_FCC "Add support for FCC modules" ON) option(MODULE_PROTOCOL_LBT "Add support for EU/LBT modules" ON) @@ -611,9 +611,14 @@ set(LINKER_SCRIPT firmware.ld) target_link_options(firmware PRIVATE -lm -T${LINKER_DIR}/${LINKER_SCRIPT} -Wl,-Map=firmware.map,--cref,--no-warn-mismatch,--gc-sections - --specs=nano.specs ) +if(NANO) + target_link_options(firmware PRIVATE + --specs=nano.specs + ) +endif() + if (DEFINED TARGET_FLASH_SIZE) # message("TARGET_FLASH_SIZE = ${TARGET_FLASH_SIZE}") target_link_options(firmware PRIVATE diff --git a/radio/src/targets/horus/CMakeLists.txt b/radio/src/targets/horus/CMakeLists.txt index cae18358f..b380a1ba9 100644 --- a/radio/src/targets/horus/CMakeLists.txt +++ b/radio/src/targets/horus/CMakeLists.txt @@ -22,6 +22,7 @@ set(PPM_LIMITS_SYMETRICAL YES) set(USB_SERIAL ON CACHE BOOL "Enable USB serial (CDC)") set(ROTARY_ENCODER YES) set(HARDWARE_EXTERNAL_MODULE YES) +set(NANO OFF) # for size report script set(CPU_TYPE_FULL STM32F429xI) diff --git a/radio/src/targets/pl18/CMakeLists.txt b/radio/src/targets/pl18/CMakeLists.txt index df7625bde..8ba9619c0 100644 --- a/radio/src/targets/pl18/CMakeLists.txt +++ b/radio/src/targets/pl18/CMakeLists.txt @@ -21,6 +21,7 @@ set(RTC_BACKUP_RAM YES) set(PPM_LIMITS_SYMETRICAL YES) set(USB_SERIAL ON CACHE BOOL "Enable USB serial (CDC)") set(HARDWARE_EXTERNAL_MODULE YES) +set(NANO OFF) # for size report script set(CPU_TYPE_FULL STM32F429xI) diff --git a/tools/build-common.sh b/tools/build-common.sh index 550e675a9..25f124ff6 100644 --- a/tools/build-common.sh +++ b/tools/build-common.sh @@ -120,7 +120,7 @@ get_target_build_options() { BUILD_OPTIONS+="-DPCB=T15PRO" ;; tx15) - BUILD_OPTIONS+="-DPCB=TX15 -DNANO=NO" + BUILD_OPTIONS+="-DPCB=TX15" ;; tx16s) BUILD_OPTIONS+="-DPCB=X10 -DPCBREV=TX16S" @@ -156,10 +156,10 @@ get_target_build_options() { BUILD_OPTIONS+="-DPCB=PL18 -DPCBREV=NB4P" ;; st16) - BUILD_OPTIONS+="-DPCB=ST16 -DNANO=NO" + BUILD_OPTIONS+="-DPCB=ST16" ;; pa01) - BUILD_OPTIONS+="-DPCB=PA01 -DNANO=NO" + BUILD_OPTIONS+="-DPCB=PA01" ;; *) echo "Unknown target: $target_name"