This is an automated email from the ASF dual-hosted git repository. xiaoxiang781216 pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit 475781c08ba189fcb6552eea133ebe86054b9edd Author: raiden00pl <[email protected]> AuthorDate: Sun Aug 16 16:11:27 2026 +0200 boards/arm/stm32f429i-disco: fix the LCD build condition stm32_lcd.c is built only when both the LCD and the framebuffer interface are selected, but those are alternatives of the same choice, so CMake never built the file and the fb and lcd configurations failed to link with an undefined up_fbinitialize. The Make.defs condition had the opposite problem: it tested the AND for being empty, so it built the file for almost any configuration. Use either interface, or LTDC alone for the RGB display path, in both build systems. Signed-off-by: raiden00pl <[email protected]> Assisted-by: Claude Code --- boards/arm/stm32f4/stm32f429i-disco/src/CMakeLists.txt | 4 ++-- boards/arm/stm32f4/stm32f429i-disco/src/Make.defs | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/boards/arm/stm32f4/stm32f429i-disco/src/CMakeLists.txt b/boards/arm/stm32f4/stm32f429i-disco/src/CMakeLists.txt index c4b340d84d8..e9839600f03 100644 --- a/boards/arm/stm32f4/stm32f429i-disco/src/CMakeLists.txt +++ b/boards/arm/stm32f4/stm32f429i-disco/src/CMakeLists.txt @@ -53,8 +53,8 @@ if(CONFIG_STM32F429I_DISCO_ILI9341) endif() if(CONFIG_STM32F429I_DISCO_ILI9341_LCDIFACE - AND CONFIG_STM32F429I_DISCO_ILI9341_FBIFACE - AND CONFIG_STM32_LTDC) + OR CONFIG_STM32F429I_DISCO_ILI9341_FBIFACE + OR CONFIG_STM32_LTDC) list(APPEND SRCS stm32_lcd.c) endif() diff --git a/boards/arm/stm32f4/stm32f429i-disco/src/Make.defs b/boards/arm/stm32f4/stm32f429i-disco/src/Make.defs index a5df5de7384..df114abb05c 100644 --- a/boards/arm/stm32f4/stm32f429i-disco/src/Make.defs +++ b/boards/arm/stm32f4/stm32f429i-disco/src/Make.defs @@ -54,10 +54,10 @@ ifeq ($(CONFIG_STM32F429I_DISCO_ILI9341),y) CSRCS += stm32_ili93414ws.c endif -ifeq ($(and \ - $(CONFIG_STM32F429I_DISCO_ILI9341_LCDIFACE), \ - $(CONFIG_STM32F429I_DISCO_ILI9341_FBIFACE), \ - $(CONFIG_STM32_LTDC)),) +ifneq ($(or \ + $(CONFIG_STM32F429I_DISCO_ILI9341_LCDIFACE), \ + $(CONFIG_STM32F429I_DISCO_ILI9341_FBIFACE), \ + $(CONFIG_STM32_LTDC)),) CSRCS += stm32_lcd.c endif
