From c3b552e072f45729bc4adfbb3eccc011be0c796e Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Thu, 20 Jul 2017 07:39:57 -0600 Subject: [PATCH] Minor cosmetic updates from review of last PR. --- Documentation/README.html | 2 + README.txt | 2 + arch/arm/include/stm32f7/ltdc.h | 101 ++++++++---------- arch/arm/src/stm32f7/Kconfig | 13 ++- arch/arm/src/stm32f7/stm32_dma2d.c | 29 +++-- arch/arm/src/stm32f7/stm32_dma2d.h | 11 -- arch/arm/src/stm32f7/stm32_ltdc.c | 96 ++++++++--------- configs/README.txt | 5 + configs/stm32f769i-disco/README.txt | 6 +- .../stm32f769i-disco/nsh-ethernet/defconfig | 11 -- configs/stm32f769i-disco/nsh/defconfig | 1 - .../src/stm32_appinitialize.c | 2 +- configs/stm32f769i-disco/src/stm32_buttons.c | 4 - configs/stm32f769i-disco/src/stm32_ostest.c | 1 + wireless/ieee802154/Kconfig | 2 +- 15 files changed, 122 insertions(+), 164 deletions(-) diff --git a/Documentation/README.html b/Documentation/README.html index 7c44a55916..84a0b18c43 100644 --- a/Documentation/README.html +++ b/Documentation/README.html @@ -288,6 +288,8 @@ nuttx/ | | `- README.txt | |- stm32f746g-disco/ | | `- README.txt + | |- stm32f769i-disco/ + | | `- README.txt | |- stm32l476-mdk/ | | `- README.txt | |- stm32l476vg-disco/ diff --git a/README.txt b/README.txt index 42d51047c5..f069a7ba20 100644 --- a/README.txt +++ b/README.txt @@ -1827,6 +1827,8 @@ nuttx/ | | `- README.txt | |- stm32f746g-disco/ | | `- README.txt + | |- stm32f769i-disco/ + | | `- README.txt | |- stm32l476-mdk/ | | `- README.txt | |- stm32l476vg-disco/ diff --git a/arch/arm/include/stm32f7/ltdc.h b/arch/arm/include/stm32f7/ltdc.h index ef5fa17f24..0b1e509916 100755 --- a/arch/arm/include/stm32f7/ltdc.h +++ b/arch/arm/include/stm32f7/ltdc.h @@ -114,9 +114,7 @@ struct ltdc_area_s struct ltdc_layer_s { - - /* - * Name: getvideoinfo + /* Name: getvideoinfo * * Description: * Get video information about the layer @@ -128,13 +126,12 @@ struct ltdc_layer_s * Return: * On success - OK * On error - -EINVAL - * */ + int (*getvideoinfo)(FAR struct ltdc_layer_s *layer, FAR struct fb_videoinfo_s *vinfo); - /* - * Name: getplaneinfo + /* Name: getplaneinfo * * Description: * Get plane information about the layer @@ -147,13 +144,12 @@ struct ltdc_layer_s * Return: * On success - OK * On error - -EINVAL - * */ + int (*getplaneinfo)(FAR struct ltdc_layer_s *layer, int planeno, FAR struct fb_planeinfo_s *pinfo); - /* - * Name: getlid + /* Name: getlid * * Description: * Get a specific layer identifier. @@ -168,13 +164,12 @@ struct ltdc_layer_s * Return: * On success - OK * On error - -EINVAL - * */ + int (*getlid)(FAR struct ltdc_layer_s *layer, int *lid, uint32_t flag); #ifdef CONFIG_FB_CMAP - /* - * Name: setclut + /* Name: setclut * * Description: * Configure layer clut (color lookup table). @@ -190,13 +185,12 @@ struct ltdc_layer_s * Return: * On success - OK * On error - -EINVAL - * */ + int (*setclut)(FAR struct ltdc_layer_s *layer, const FAR struct fb_cmap_s *cmap); - /* - * Name: getclut + /* Name: getclut * * Description: * Get configured layer clut (color lookup table). @@ -209,13 +203,12 @@ struct ltdc_layer_s * Return: * On success - OK * On error - -EINVAL - * */ + int (*getclut)(FAR struct ltdc_layer_s *layer, FAR struct fb_cmap_s *cmap); #endif - /* - * Name: setcolor + /* Name: setcolor * * Description: * Configure layer color for the non active layer area. @@ -229,12 +222,11 @@ struct ltdc_layer_s * Return: * On success - OK * On error - -EINVAL - * */ + int (*setcolor)(FAR struct ltdc_layer_s *layer, uint32_t argb); - /* - * Name: getcolor + /* Name: getcolor * * Description: * Get configured layer color for the non active layer area. @@ -246,12 +238,11 @@ struct ltdc_layer_s * Return: * On success - OK * On error - -EINVAL - * */ + int (*getcolor)(FAR struct ltdc_layer_s *layer, uint32_t *argb); - /* - * Name: setcolorkey + /* Name: setcolorkey * * Description: * Configure the layer color key (chromakey) for transparence. @@ -265,12 +256,11 @@ struct ltdc_layer_s * Return: * On success - OK * On error - -EINVAL - * */ + int (*setcolorkey)(FAR struct ltdc_layer_s *layer, uint32_t rgb); - /* - * Name: getcolorkey + /* Name: getcolorkey * * Description: * Get the configured layer color key (chromakey) for transparence. @@ -282,12 +272,11 @@ struct ltdc_layer_s * Return: * On success - OK * On error - -EINVAL - * */ + int (*getcolorkey)(FAR struct ltdc_layer_s *layer, uint32_t *rgb); - /* - * Name: setalpha + /* Name: setalpha * * Description: * Configure layer alpha value factor into blend operation. @@ -305,12 +294,11 @@ struct ltdc_layer_s * Return: * On success - OK * On error - -EINVAL - * */ + int (*setalpha)(FAR struct ltdc_layer_s *layer, uint8_t alpha); - /* - * Name: getalpha + /* Name: getalpha * * Description: * Get configured layer alpha value factor for blend operation. @@ -322,12 +310,11 @@ struct ltdc_layer_s * Return: * On success - OK * On error - -EINVAL - * */ + int (*getalpha)(FAR struct ltdc_layer_s *layer, uint8_t *alpha); - /* - * Name: setblendmode + /* Name: setblendmode * * Description: * Configure blend mode of the layer. @@ -363,12 +350,11 @@ struct ltdc_layer_s * Informs the driver to use the pixel alpha value of the subjacent layer * instead the constant alpha value. This is only useful for ARGB8888 * color format. - * */ + int (*setblendmode)(FAR struct ltdc_layer_s *layer, uint32_t mode); - /* - * Name: getblendmode + /* Name: getblendmode * * Description: * Get configured blend mode of the layer. @@ -380,12 +366,11 @@ struct ltdc_layer_s * Return: * On success - OK * On error - -EINVAL - * */ + int (*getblendmode)(FAR struct ltdc_layer_s *layer, uint32_t *mode); - /* - * Name: setarea + /* Name: setarea * * Description: * Configure visible layer area and the reference position of the first @@ -413,15 +398,14 @@ struct ltdc_layer_s * If the srcxpos and srcypos unequal the xpos and ypos of the coord * structure this acts like moving the visible area to another position on * the screen during the next update operation. - * */ + int (*setarea)(FAR struct ltdc_layer_s *layer, FAR const struct ltdc_area_s *area, fb_coord_t srcxpos, fb_coord_t srcypos); - /* - * Name: getarea + /* Name: getarea * * Description: * Get configured visible layer area. @@ -435,15 +419,14 @@ struct ltdc_layer_s * Return: * On success - OK * On error - -EINVAL - * */ + int (*getarea)(FAR struct ltdc_layer_s *layer, FAR struct ltdc_area_s *area, fb_coord_t *srcxpos, fb_coord_t *srcypos); - /* - * Name: update + /* Name: update * * Description: * Update current layer settings and make changes visible. @@ -478,13 +461,12 @@ struct ltdc_layer_s * LTDC_SYNC_VBLANK: * Informs the driver to update the layer upon vertical blank. Otherwise * immediately. - * */ + int (*update)(FAR struct ltdc_layer_s *layer, uint32_t mode); #ifdef CONFIG_STM32F7_DMA2D - /* - * Name: blit + /* Name: blit * * Description: * Copy selected area from a source layer to selected position of the @@ -502,15 +484,14 @@ struct ltdc_layer_s * -EINVAL - If one of the parameter invalid or if the size of the selected * source area outside the visible area of the destination layer. * (The visible area usually represents the display size) - * */ + int (*blit)(FAR struct ltdc_layer_s *dest, fb_coord_t destxpos, fb_coord_t destypos, FAR const struct dma2d_layer_s *src, FAR const struct ltdc_area_s *srcarea); - /* - * - * Name: blend + + /* Name: blend * * Description: * Blends the selected area from a foreground layer with selected position @@ -532,8 +513,8 @@ struct ltdc_layer_s * -EINVAL - If one of the parameter invalid or if the size of the selected * source area outside the visible area of the destination layer. * (The visible area usually represents the display size) - * */ + int (*blend)(FAR struct ltdc_layer_s *dest, fb_coord_t destxpos, fb_coord_t destypos, FAR const struct dma2d_layer_s *fore, @@ -541,8 +522,7 @@ struct ltdc_layer_s FAR const struct dma2d_layer_s *back, FAR const struct ltdc_area_s *backarea); - /* - * Name: fillarea + /* Name: fillarea * * Description: * Fill the selected area of the whole layer with a specific color. @@ -557,8 +537,8 @@ struct ltdc_layer_s * OK - On success * -EINVAL - If one of the parameter invalid or if the size of the selected * area outside the visible area of the layer. - * */ + int (*fillarea)(FAR struct ltdc_layer_s *layer, FAR const struct ltdc_area_s *area, uint32_t color); @@ -587,6 +567,9 @@ struct ltdc_layer_s * invalid. * ****************************************************************************/ + FAR struct ltdc_layer_s *up_ltdcgetlayer(int lid); + #endif /* CONFIG_STM32F7_LTDC */ #endif /* __ARCH_ARM_INCLUDE_STM32F7_LTDC_H */ + diff --git a/arch/arm/src/stm32f7/Kconfig b/arch/arm/src/stm32f7/Kconfig index fc257a833a..b26e05f49d 100644 --- a/arch/arm/src/stm32f7/Kconfig +++ b/arch/arm/src/stm32f7/Kconfig @@ -1177,8 +1177,8 @@ config STM32F7_LTDC ---help--- The STM32 LTDC is an LCD-TFT Display Controller available on the STM32F7x6, STM32F7x7, STM32F7x8 and STM32F7x9 devices. - It features a standard RGB888 parallel video interface (along with HSYNC, VSYNC, etc.) - for controlling TFT LCD displays. + It features a standard RGB888 parallel video interface (along + with HSYNC, VSYNC, etc.) for controlling TFT LCD displays. With the STM32F7x8/9, the graphics signals can optionally be output via DSI instead of the parallel interface: See config options STM32F7_DSIHOST and STM32F7_LTDC_USE_DSI. @@ -4655,7 +4655,8 @@ config STM32F7_ETHMAC_REGDEBUG default n depends on DEBUG_NET_INFO ---help--- - Enable very low-level register access debug. Depends on CONFIG_DEBUG_FEATURES. + Enable very low-level register access debug. Depends on + CONFIG_DEBUG_FEATURES. endmenu # Ethernet MAC configuration @@ -4675,7 +4676,8 @@ config STM32F7_LTDC_USE_DSI depends on STM32F7_DSIHOST ---help--- Select this if your display is connected via DSI. - Deselect option if your display is connected via digital RGB+HSYNC+VSYNC + Deselect option if your display is connected via digital + RGB+HSYNC+VSYNC config STM32F7_LTDC_BACKLIGHT bool "Backlight support" @@ -4811,7 +4813,8 @@ config FB_TRANSPARENCY bool "Enable transparency color map support" default y ---help--- - Enabling transparency color map support is neccessary for ltdc L8 format. + Enabling transparency color map support is neccessary for + ltdc L8 format. endif endmenu diff --git a/arch/arm/src/stm32f7/stm32_dma2d.c b/arch/arm/src/stm32f7/stm32_dma2d.c index 912ff2a5ff..0e8d4edd75 100644 --- a/arch/arm/src/stm32f7/stm32_dma2d.c +++ b/arch/arm/src/stm32f7/stm32_dma2d.c @@ -122,18 +122,18 @@ /* Define shadow layer for ltdc interface */ #ifdef CONFIG_STM32F7_LTDC_INTERFACE -# ifdef CONFIG_STM32F7_LTDC_L2 -# define DMA2D_SHADOW_LAYER 2 -# define DMA2D_SHADOW_LAYER_L1 0 -# define DMA2D_SHADOW_LAYER_L2 1 -# else -# define DMA2D_SHADOW_LAYER 1 -# define DMA2D_SHADOW_LAYER_L1 0 -# endif -# define DMA2D_LAYER_NSIZE CONFIG_STM32F7_DMA2D_NLAYERS + DMA2D_SHADOW_LAYER +# ifdef CONFIG_STM32F7_LTDC_L2 +# define DMA2D_SHADOW_LAYER 2 +# define DMA2D_SHADOW_LAYER_L1 0 +# define DMA2D_SHADOW_LAYER_L2 1 +# else +# define DMA2D_SHADOW_LAYER 1 +# define DMA2D_SHADOW_LAYER_L1 0 +# endif +# define DMA2D_LAYER_NSIZE CONFIG_STM32F7_DMA2D_NLAYERS + DMA2D_SHADOW_LAYER #else -# define DMA2D_LAYER_NSIZE CONFIG_STM32F7_DMA2D_NLAYERS -# define DMA2D_SHADOW_LAYER 0 +# define DMA2D_LAYER_NSIZE CONFIG_STM32F7_DMA2D_NLAYERS +# define DMA2D_SHADOW_LAYER 0 #endif /* Debug option */ @@ -149,9 +149,9 @@ /* check clut support */ #ifdef CONFIG_STM32F7_DMA2D_L8 -# ifndef CONFIG_FB_CMAP -# error "Enable cmap to support the configured layer formats!" -# endif +# ifndef CONFIG_FB_CMAP +# error "Enable cmap to support the configured layer formats!" +# endif #endif /**************************************************************************** @@ -517,7 +517,6 @@ static int stm32_dma2d_waitforirq(void) return OK; } - #ifdef CONFIG_STM32F7_DMA2D_L8 /**************************************************************************** * Name: stm32_dma2d_loadclut diff --git a/arch/arm/src/stm32f7/stm32_dma2d.h b/arch/arm/src/stm32f7/stm32_dma2d.h index e7bfa12fcc..7e0f0213ad 100644 --- a/arch/arm/src/stm32f7/stm32_dma2d.h +++ b/arch/arm/src/stm32f7/stm32_dma2d.h @@ -45,17 +45,6 @@ #include #ifdef CONFIG_STM32F7_DMA2D -/**************************************************************************** - * Pre-processor Definitions - ****************************************************************************/ - -/**************************************************************************** - * Public Types - ****************************************************************************/ - -/**************************************************************************** - * Public Data - ****************************************************************************/ /**************************************************************************** * Public Functions diff --git a/arch/arm/src/stm32f7/stm32_ltdc.c b/arch/arm/src/stm32f7/stm32_ltdc.c index 4b3121bb6b..36c1d628f6 100644 --- a/arch/arm/src/stm32f7/stm32_ltdc.c +++ b/arch/arm/src/stm32f7/stm32_ltdc.c @@ -59,7 +59,6 @@ #include "up_arch.h" #include "up_internal.h" -// #include "stm32.h" #include "chip/stm32_ltdc.h" #include "stm32_ltdc.h" #include "stm32_dma2d.h" @@ -335,27 +334,27 @@ /* Dithering */ #ifndef CONFIG_STM32F7_LTDC_DITHER_RED -# define STM32_LTDC_DITHER_RED 0 +# define STM32_LTDC_DITHER_RED 0 #else -# define STM32_LTDC_DITHER_RED CONFIG_STM32F7_LTDC_DITHER_RED +# define STM32_LTDC_DITHER_RED CONFIG_STM32F7_LTDC_DITHER_RED #endif #ifndef CONFIG_STM32F7_LTDC_DITHER_GREEN -# define STM32_LTDC_DITHER_GREEN 0 +# define STM32_LTDC_DITHER_GREEN 0 #else -# define STM32_LTDC_DITHER_GREEN CONFIG_STM32F7_LTDC_DITHER_GREEN +# define STM32_LTDC_DITHER_GREEN CONFIG_STM32F7_LTDC_DITHER_GREEN #endif #ifndef CONFIG_STM32F7_LTDC_DITHER_BLUE -# define STM32_LTDC_DITHER_BLUE 0 +# define STM32_LTDC_DITHER_BLUE 0 #else -# define STM32_LTDC_DITHER_BLUE CONFIG_STM32F7_LTDC_DITHER_BLUE +# define STM32_LTDC_DITHER_BLUE CONFIG_STM32F7_LTDC_DITHER_BLUE #endif /* Background color */ #ifndef CONFIG_STM32F7_LTDC_BACKCOLOR -# define STM32_LTDC_BACKCOLOR 0 +# define STM32_LTDC_BACKCOLOR 0 #else -# define STM32_LTDC_BACKCOLOR CONFIG_STM32F7_LTDC_BACKCOLOR +# define STM32_LTDC_BACKCOLOR CONFIG_STM32F7_LTDC_BACKCOLOR #endif /* Internal operation flags */ @@ -387,55 +386,55 @@ /* Check pixel format support by DMA2D driver */ #ifdef CONFIG_STM32F7_DMA2D -# if defined(CONFIG_STM32F7_LTDC_L1_L8) || \ - defined(CONFIG_STM32F7_LTDC_L2_L8) -# if !defined(CONFIG_STM32F7_DMA2D_L8) -# error "DMA2D must support FB_FMT_RGB8 pixel format" +# if defined(CONFIG_STM32F7_LTDC_L1_L8) || \ + defined(CONFIG_STM32F7_LTDC_L2_L8) +# if !defined(CONFIG_STM32F7_DMA2D_L8) +# error "DMA2D must support FB_FMT_RGB8 pixel format" +# endif # endif -# endif -# if defined(CONFIG_STM32F7_LTDC_L1_RGB565) || \ - defined(CONFIG_STM32F7_LTDC_L2_RGB565) -# if !defined(CONFIG_STM32F7_DMA2D_RGB565) -# error "DMA2D must support FB_FMT_RGB16_565 pixel format" +# if defined(CONFIG_STM32F7_LTDC_L1_RGB565) || \ + defined(CONFIG_STM32F7_LTDC_L2_RGB565) +# if !defined(CONFIG_STM32F7_DMA2D_RGB565) +# error "DMA2D must support FB_FMT_RGB16_565 pixel format" +# endif # endif -# endif -# if defined(CONFIG_STM32F7_LTDC_L1_RGB888) || \ - defined(CONFIG_STM32F7_LTDC_L2_RGB888) -# if !defined(CONFIG_STM32F7_DMA2D_RGB888) -# error "DMA2D must support FB_FMT_RGB24 pixel format" +# if defined(CONFIG_STM32F7_LTDC_L1_RGB888) || \ + defined(CONFIG_STM32F7_LTDC_L2_RGB888) +# if !defined(CONFIG_STM32F7_DMA2D_RGB888) +# error "DMA2D must support FB_FMT_RGB24 pixel format" +# endif # endif -# endif #endif /* Calculate the size of the layers clut table */ #ifdef CONFIG_FB_CMAP -# if defined(CONFIG_STM32F7_DMA2D) && !defined(CONFIG_STM32F7_DMA2D_L8) -# error "DMA2D must also support L8 CLUT pixel format if supported by LTDC" -# endif -# ifdef STM32_LTDC_L1CMAP -# ifdef CONFIG_FB_TRANSPARENCY -# define STM32_LAYER_CLUT_SIZE STM32_LTDC_NCLUT * sizeof(uint32_t) -# else -# define STM32_LAYER_CLUT_SIZE STM32_LTDC_NCLUT * 3 * sizeof(uint8_t) +# if defined(CONFIG_STM32F7_DMA2D) && !defined(CONFIG_STM32F7_DMA2D_L8) +# error "DMA2D must also support L8 CLUT pixel format if supported by LTDC" # endif -# endif -# ifdef STM32_LTDC_L2CMAP -# undef STM32_LAYER_CLUT_SIZE -# ifdef CONFIG_FB_TRANSPARENCY -# define STM32_LAYER_CLUT_SIZE STM32_LTDC_NCLUT * sizeof(uint32_t) * 2 -# else -# define STM32_LAYER_CLUT_SIZE STM32_LTDC_NCLUT * 3 * sizeof(uint8_t) * 2 +# ifdef STM32_LTDC_L1CMAP +# ifdef CONFIG_FB_TRANSPARENCY +# define STM32_LAYER_CLUT_SIZE STM32_LTDC_NCLUT * sizeof(uint32_t) +# else +# define STM32_LAYER_CLUT_SIZE STM32_LTDC_NCLUT * 3 * sizeof(uint8_t) +# endif +# endif +# ifdef STM32_LTDC_L2CMAP +# undef STM32_LAYER_CLUT_SIZE +# ifdef CONFIG_FB_TRANSPARENCY +# define STM32_LAYER_CLUT_SIZE STM32_LTDC_NCLUT * sizeof(uint32_t) * 2 +# else +# define STM32_LAYER_CLUT_SIZE STM32_LTDC_NCLUT * 3 * sizeof(uint8_t) * 2 +# endif # endif -# endif #endif #ifndef CONFIG_FB_CMAP -# if defined(STM32_LTDC_L1CMAP) || defined(STM32_LTDC_L2CMAP) -# undef STM32_LTDC_L1CMAP -# undef STM32_LTDC_L2CMAP -# error "Enable cmap to support the configured layer format!" -# endif +# if defined(STM32_LTDC_L1CMAP) || defined(STM32_LTDC_L2CMAP) +# undef STM32_LTDC_L1CMAP +# undef STM32_LTDC_L2CMAP +# error "Enable cmap to support the configured layer format!" +# endif #endif /* Layer clut rgb value positioning */ @@ -924,18 +923,11 @@ static const uintptr_t stm32_clutwr_layer_t[LTDC_NLAYERS] = static bool g_initialized; -/**************************************************************************** - * Public Data - ****************************************************************************/ /**************************************************************************** * Private Functions ****************************************************************************/ -/**************************************************************************** - * Configure global register - ****************************************************************************/ - /**************************************************************************** * Name: stm32_ltdc_gpioconfig * diff --git a/configs/README.txt b/configs/README.txt index c17dfb6356..2caf70874e 100644 --- a/configs/README.txt +++ b/configs/README.txt @@ -685,6 +685,11 @@ configs/stm32l476-mdk The STM32L476ME is a Cortex-M4 optimised for low-power operation at up to 80MHz operation with 1024Kb Flash memory and 96+32Kb SRAM. +configs/stm32f769i-disco + NuttX configurations for the STMicro STM32F769I-DISCO development board + featuring the STM32F769NIH6 MCU. The STM32F769NIH6 is a 216MHz Cortex-M7 + operating with 2048K Flash memory and 512Kb SRAM. + configs/stm32l476vg-disco STMicro STM32L476VG_DISCO development board featuring the STM32L476VG MCU. The STM32L476VG is a Cortex-M4 optimised for low-power operation diff --git a/configs/stm32f769i-disco/README.txt b/configs/stm32f769i-disco/README.txt index a0fe5800e4..e3921dab2f 100644 --- a/configs/stm32f769i-disco/README.txt +++ b/configs/stm32f769i-disco/README.txt @@ -3,7 +3,7 @@ README This README discusses issues unique to NuttX configurations for the STMicro STM32F769I-DISCO development board featuring the STM32F769NIH6 -MCU. The STM32F769NIH6 is a 216MHz Cortex-M7 operation with 2048K Flash +MCU. The STM32F769NIH6 is a 216MHz Cortex-M7 operating with 2048K Flash memory and 512Kb SRAM. The board features: - On-board ST-LINK/V2 for programming and debugging, @@ -42,7 +42,7 @@ STATUS 2017-07: STM32 F7 Ethernet appears to be functional, but has had only light testing. - + Work in progress: Use LCD over DSI interface, rest of board. Development Environment @@ -95,7 +95,6 @@ Serial Console Use the serial interface the ST/LINK provides to the USB host. - Configurations ============== @@ -110,7 +109,6 @@ Configurations Where is one of the sub-directories listed below. - Configuration Directories ------------------------- diff --git a/configs/stm32f769i-disco/nsh-ethernet/defconfig b/configs/stm32f769i-disco/nsh-ethernet/defconfig index 1344adca8c..1b3383624f 100644 --- a/configs/stm32f769i-disco/nsh-ethernet/defconfig +++ b/configs/stm32f769i-disco/nsh-ethernet/defconfig @@ -12,16 +12,6 @@ CONFIG_ARMV7M_ICACHE=y CONFIG_ARMV7M_LAZYFPU=y CONFIG_BOARD_LOOPSPERMSEC=43103 CONFIG_BUILTIN=y -CONFIG_DEBUG_ERROR=y -CONFIG_DEBUG_FEATURES=y -CONFIG_DEBUG_MEMCARD_ERROR=y -CONFIG_DEBUG_MEMCARD_WARN=y -CONFIG_DEBUG_MEMCARD=y -CONFIG_DEBUG_NET_ERROR=y -CONFIG_DEBUG_NET_WARN=y -CONFIG_DEBUG_NET=y -CONFIG_DEBUG_SYMBOLS=y -CONFIG_DEBUG_WARN=y CONFIG_DISABLE_POLL=y CONFIG_ETH0_PHY_LAN8742A=y CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y @@ -58,7 +48,6 @@ CONFIG_NSH_DISABLE_IFUPDOWN=y CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 CONFIG_NSH_MOTD=y -CONFIG_NSH_NETINIT_DEBUG=y CONFIG_NSH_READLINE=y CONFIG_PREALLOC_MQ_MSGS=4 CONFIG_PREALLOC_TIMERS=4 diff --git a/configs/stm32f769i-disco/nsh/defconfig b/configs/stm32f769i-disco/nsh/defconfig index 18a906007f..8d5cc7fdfb 100644 --- a/configs/stm32f769i-disco/nsh/defconfig +++ b/configs/stm32f769i-disco/nsh/defconfig @@ -12,7 +12,6 @@ CONFIG_ARMV7M_ICACHE=y CONFIG_ARMV7M_LAZYFPU=y CONFIG_BOARD_LOOPSPERMSEC=43103 CONFIG_BUILTIN=y -CONFIG_DEBUG_SYMBOLS=y CONFIG_DISABLE_POLL=y CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y CONFIG_EXAMPLES_NSH=y diff --git a/configs/stm32f769i-disco/src/stm32_appinitialize.c b/configs/stm32f769i-disco/src/stm32_appinitialize.c index 31e7d1d796..17d40799b3 100644 --- a/configs/stm32f769i-disco/src/stm32_appinitialize.c +++ b/configs/stm32f769i-disco/src/stm32_appinitialize.c @@ -1,5 +1,5 @@ /**************************************************************************** - * config/stm32f769i-disco/src/stm32_appinitilaize.c + * config/stm32f769i-disco/src/stm32_appinitialize.c * * Copyright (C) 2015-2016 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/configs/stm32f769i-disco/src/stm32_buttons.c b/configs/stm32f769i-disco/src/stm32_buttons.c index 8fd7b6cef2..9103f42cba 100644 --- a/configs/stm32f769i-disco/src/stm32_buttons.c +++ b/configs/stm32f769i-disco/src/stm32_buttons.c @@ -49,10 +49,6 @@ #ifdef CONFIG_ARCH_BUTTONS -/**************************************************************************** - * Pre-processor Definitions - ****************************************************************************/ - /**************************************************************************** * Public Functions ****************************************************************************/ diff --git a/configs/stm32f769i-disco/src/stm32_ostest.c b/configs/stm32f769i-disco/src/stm32_ostest.c index 184f88d670..1ca75cdfbf 100644 --- a/configs/stm32f769i-disco/src/stm32_ostest.c +++ b/configs/stm32f769i-disco/src/stm32_ostest.c @@ -82,6 +82,7 @@ static uint32_t g_saveregs[XCPTCONTEXT_REGS]; /************************************************************************************ * Public Functions ************************************************************************************/ + /* Given an array of size CONFIG_EXAMPLES_OSTEST_FPUSIZE, this function will return * the current FPU registers. */ diff --git a/wireless/ieee802154/Kconfig b/wireless/ieee802154/Kconfig index d8c698047c..5b8e379968 100644 --- a/wireless/ieee802154/Kconfig +++ b/wireless/ieee802154/Kconfig @@ -114,7 +114,7 @@ config IEEE802154_IND_IRQRESERVE dynamically allocate the meta data structure with an additional cost in performance. - NOTE: Currently marked as experimental and with a default 0 zero + NOTE: Currently marked as experimental and with a default of zero because there are no interrupt level allocations performed by the current IEEE 802.15.4 MAC code.