From d88d7fdad8ba6c27daf11ce5972b58d09a9989d7 Mon Sep 17 00:00:00 2001 From: Raphael Coeffic Date: Fri, 16 Aug 2024 14:17:05 +0200 Subject: [PATCH] chore(bw): disable USBJ_EX on all F4 targets with only 512KB flash (#5443) --- radio/src/CMakeLists.txt | 7 +------ radio/src/targets/taranis/CMakeLists.txt | 2 ++ 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/radio/src/CMakeLists.txt b/radio/src/CMakeLists.txt index e7cdc6c9d..501bdf1a1 100644 --- a/radio/src/CMakeLists.txt +++ b/radio/src/CMakeLists.txt @@ -57,12 +57,7 @@ option(BOOTLOADER "Include Bootloader" ON) option(FWDRIVE "Attach also firmware drive with USB" OFF) option(DISABLE_MCUCHECK "Disable MCU check at start" OFF) option(LUA_MIXER "Enable LUA mixer/model scripts support" ON) - -if(PCB STREQUAL X9D+ AND PCBREV STREQUAL 2019) - option(USBJ_EX "Enable USB Joystick Extension" OFF) -else() - option(USBJ_EX "Enable USB Joystick Extension" ON) -endif() +option(USBJ_EX "Enable USB Joystick Extension" ON) # since we reset all default CMAKE compiler flags for firmware builds, provide an alternate way for user to specify additional flags. set(FIRMWARE_C_FLAGS "" CACHE STRING "Additional flags for firmware target c compiler (note: all CMAKE_C_FLAGS[_*] are ignored for firmware/bootloader).") diff --git a/radio/src/targets/taranis/CMakeLists.txt b/radio/src/targets/taranis/CMakeLists.txt index a379bae71..d0d3006fb 100644 --- a/radio/src/targets/taranis/CMakeLists.txt +++ b/radio/src/targets/taranis/CMakeLists.txt @@ -493,6 +493,8 @@ elseif ((CPU_TYPE_FULL STREQUAL STM32F407xE) OR (CPU_TYPE_FULL STREQUAL STM32F40 if (CPU_TYPE_FULL STREQUAL STM32F407xG) set(TARGET_FLASH_SIZE 1M) add_definitions(-DSTM32F407xG) + else() + set(USBJ_EX OFF) endif() elseif (CPU_TYPE_FULL STREQUAL STM32F413xG) set(CPU_TYPE STM32F4)