From 2ff9f0e5b141d61c7215eb9e620791d830a48ea5 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Mon, 13 Nov 2017 14:52:10 -0600 Subject: [PATCH] configs/stm32f429i-disco/fb: Fix a compile issue. Disable all NX features in the fb configuration. NX is not needed. --- configs/stm32f429i-disco/fb/defconfig | 6 ------ configs/stm32f429i-disco/src/stm32_appinit.c | 9 +-------- 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/configs/stm32f429i-disco/fb/defconfig b/configs/stm32f429i-disco/fb/defconfig index d7c7afb6de..42121c1bf3 100644 --- a/configs/stm32f429i-disco/fb/defconfig +++ b/configs/stm32f429i-disco/fb/defconfig @@ -1,5 +1,4 @@ # CONFIG_ARCH_FPU is not set -# CONFIG_NX_DISABLE_16BPP is not set # CONFIG_STM32_DMA2D_RGB888 is not set # CONFIG_STM32_FLASH_PREFETCH is not set CONFIG_ARCH_BOARD_STM32F429I_DISCO=y @@ -20,8 +19,6 @@ CONFIG_DRIVERS_VIDEO=y CONFIG_EXAMPLES_FB=y CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y CONFIG_EXAMPLES_NSH=y -CONFIG_EXAMPLES_NX_BPP=16 -CONFIG_EXAMPLES_NX=y CONFIG_FS_PROCFS_REGISTER=y CONFIG_FS_PROCFS=y CONFIG_HAVE_CXX=y @@ -39,9 +36,6 @@ CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y -CONFIG_NX_BLOCKING=y -CONFIG_NX=y -CONFIG_NXFONT_MONO5X8=y CONFIG_PREALLOC_MQ_MSGS=4 CONFIG_PREALLOC_TIMERS=4 CONFIG_PREALLOC_WDOGS=4 diff --git a/configs/stm32f429i-disco/src/stm32_appinit.c b/configs/stm32f429i-disco/src/stm32_appinit.c index fabc7862d8..ff494a785b 100644 --- a/configs/stm32f429i-disco/src/stm32_appinit.c +++ b/configs/stm32f429i-disco/src/stm32_appinit.c @@ -160,18 +160,10 @@ int board_app_initialize(uintptr_t arg) FAR struct mtd_dev_s *mtd; FAR struct mtd_geometry_s geo; #endif - #if defined(CONFIG_MTD_PARTITION_NAMES) FAR const char *partname = CONFIG_STM32F429I_DISCO_FLASH_PART_NAMES; #endif - -#if defined(CONFIG_MTD) && defined(CONFIG_MTD_SST25XX) int ret; -#elif defined(HAVE_USBHOST) || defined(HAVE_USBMONITOR) - int ret; -#elif defined(CONFIG_SENSORS_L3GD20) - int ret; -#endif /* Configure SPI-based devices */ @@ -402,5 +394,6 @@ int board_app_initialize(uintptr_t arg) } #endif + UNUSED(ret); return OK; }