Skip to content
Snippets Groups Projects
Commit d76d889e authored by Gregory Nutt's avatar Gregory Nutt
Browse files

Restore FLASH_ERASALL in configurations where it was previously selected

parent 082d3222
No related branches found
No related tags found
No related merge requests found
...@@ -454,10 +454,18 @@ CONFIG_STM32_SERIALDRIVER=y ...@@ -454,10 +454,18 @@ CONFIG_STM32_SERIALDRIVER=y
# #
# U[S]ART Configuration # U[S]ART Configuration
# #
#
# U[S]ART Device Configuration
#
CONFIG_STM32_USART2_SERIALDRIVER=y CONFIG_STM32_USART2_SERIALDRIVER=y
# CONFIG_STM32_USART2_1WIREDRIVER is not set # CONFIG_STM32_USART2_1WIREDRIVER is not set
# CONFIG_USART2_RS485 is not set # CONFIG_USART2_RS485 is not set
# CONFIG_USART2_RXDMA is not set # CONFIG_USART2_RXDMA is not set
#
# Serial Driver Configuration
#
# CONFIG_SERIAL_DISABLE_REORDERING is not set # CONFIG_SERIAL_DISABLE_REORDERING is not set
# CONFIG_STM32_FLOWCONTROL_BROKEN is not set # CONFIG_STM32_FLOWCONTROL_BROKEN is not set
# CONFIG_STM32_USART_BREAKS is not set # CONFIG_STM32_USART_BREAKS is not set
...@@ -753,10 +761,14 @@ CONFIG_INPUT=y ...@@ -753,10 +761,14 @@ CONFIG_INPUT=y
# CONFIG_DJOYSTICK is not set # CONFIG_DJOYSTICK is not set
# CONFIG_AJOYSTICK is not set # CONFIG_AJOYSTICK is not set
# CONFIG_IOEXPANDER is not set # CONFIG_IOEXPANDER is not set
#
# LCD Driver Support
#
CONFIG_LCD=y CONFIG_LCD=y
# #
# Common LCD Settings # Common Graphipc LCD Settings
# #
# CONFIG_LCD_CONSOLE is not set # CONFIG_LCD_CONSOLE is not set
# CONFIG_LCD_NOGETRUN is not set # CONFIG_LCD_NOGETRUN is not set
...@@ -785,11 +797,7 @@ CONFIG_LCD_LANDSCAPE=y ...@@ -785,11 +797,7 @@ CONFIG_LCD_LANDSCAPE=y
# CONFIG_LCD_RLANDSCAPE is not set # CONFIG_LCD_RLANDSCAPE is not set
# CONFIG_LCD_ILI9341 is not set # CONFIG_LCD_ILI9341 is not set
# CONFIG_LCD_RA8875 is not set # CONFIG_LCD_RA8875 is not set
# CONFIG_SLCD is not set
#
# Alphanumeric/Segment LCD Devices
#
# CONFIG_LCD_LCD1602 is not set
# #
# LED Support # LED Support
...@@ -1353,6 +1361,7 @@ CONFIG_EXAMPLES_TOUCHSCREEN_ARCHINIT=y ...@@ -1353,6 +1361,7 @@ CONFIG_EXAMPLES_TOUCHSCREEN_ARCHINIT=y
# #
# File System Utilities # File System Utilities
# #
CONFIG_FSUTILS_FLASH_ERASEALL=y
# CONFIG_FSUTILS_INIFILE is not set # CONFIG_FSUTILS_INIFILE is not set
CONFIG_FSUTILS_MKSMARTFS=y CONFIG_FSUTILS_MKSMARTFS=y
# CONFIG_FSUTILS_PASSWD is not set # CONFIG_FSUTILS_PASSWD is not set
...@@ -1721,6 +1730,7 @@ CONFIG_MIKROE_STM32F4_CONFIGDATA_PART=y ...@@ -1721,6 +1730,7 @@ CONFIG_MIKROE_STM32F4_CONFIGDATA_PART=y
# CONFIG_SYSTEM_FREE is not set # CONFIG_SYSTEM_FREE is not set
# CONFIG_SYSTEM_CLE is not set # CONFIG_SYSTEM_CLE is not set
# CONFIG_SYSTEM_CUTERM is not set # CONFIG_SYSTEM_CUTERM is not set
CONFIG_SYSTEM_FLASH_ERASEALL=y
# CONFIG_SYSTEM_INSTALL is not set # CONFIG_SYSTEM_INSTALL is not set
# CONFIG_SYSTEM_HEX2BIN is not set # CONFIG_SYSTEM_HEX2BIN is not set
# CONFIG_SYSTEM_HEXED is not set # CONFIG_SYSTEM_HEXED is not set
......
...@@ -446,9 +446,17 @@ CONFIG_STM32_SERIALDRIVER=y ...@@ -446,9 +446,17 @@ CONFIG_STM32_SERIALDRIVER=y
# #
# U[S]ART Configuration # U[S]ART Configuration
# #
#
# U[S]ART Device Configuration
#
CONFIG_STM32_USART2_SERIALDRIVER=y CONFIG_STM32_USART2_SERIALDRIVER=y
# CONFIG_STM32_USART2_1WIREDRIVER is not set # CONFIG_STM32_USART2_1WIREDRIVER is not set
# CONFIG_USART2_RS485 is not set # CONFIG_USART2_RS485 is not set
#
# Serial Driver Configuration
#
# CONFIG_SERIAL_DISABLE_REORDERING is not set # CONFIG_SERIAL_DISABLE_REORDERING is not set
# CONFIG_STM32_FLOWCONTROL_BROKEN is not set # CONFIG_STM32_FLOWCONTROL_BROKEN is not set
# CONFIG_STM32_USART_BREAKS is not set # CONFIG_STM32_USART_BREAKS is not set
...@@ -709,7 +717,12 @@ CONFIG_SPI_EXCHANGE=y ...@@ -709,7 +717,12 @@ CONFIG_SPI_EXCHANGE=y
# CONFIG_BCH is not set # CONFIG_BCH is not set
# CONFIG_INPUT is not set # CONFIG_INPUT is not set
# CONFIG_IOEXPANDER is not set # CONFIG_IOEXPANDER is not set
#
# LCD Driver Support
#
# CONFIG_LCD is not set # CONFIG_LCD is not set
# CONFIG_SLCD is not set
# #
# LED Support # LED Support
...@@ -1065,6 +1078,7 @@ CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y ...@@ -1065,6 +1078,7 @@ CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
# #
# File System Utilities # File System Utilities
# #
CONFIG_FSUTILS_FLASH_ERASEALL=y
# CONFIG_FSUTILS_INIFILE is not set # CONFIG_FSUTILS_INIFILE is not set
CONFIG_FSUTILS_MKSMARTFS=y CONFIG_FSUTILS_MKSMARTFS=y
# CONFIG_FSUTILS_PASSWD is not set # CONFIG_FSUTILS_PASSWD is not set
...@@ -1217,6 +1231,7 @@ CONFIG_NSH_ARCHINIT=y ...@@ -1217,6 +1231,7 @@ CONFIG_NSH_ARCHINIT=y
# CONFIG_SYSTEM_FREE is not set # CONFIG_SYSTEM_FREE is not set
# CONFIG_SYSTEM_CLE is not set # CONFIG_SYSTEM_CLE is not set
# CONFIG_SYSTEM_CUTERM is not set # CONFIG_SYSTEM_CUTERM is not set
CONFIG_SYSTEM_FLASH_ERASEALL=y
# CONFIG_SYSTEM_INSTALL is not set # CONFIG_SYSTEM_INSTALL is not set
# CONFIG_SYSTEM_HEX2BIN is not set # CONFIG_SYSTEM_HEX2BIN is not set
# CONFIG_SYSTEM_HEXED is not set # CONFIG_SYSTEM_HEXED is not set
......
...@@ -446,9 +446,17 @@ CONFIG_STM32_SERIALDRIVER=y ...@@ -446,9 +446,17 @@ CONFIG_STM32_SERIALDRIVER=y
# #
# U[S]ART Configuration # U[S]ART Configuration
# #
#
# U[S]ART Device Configuration
#
CONFIG_STM32_USART2_SERIALDRIVER=y CONFIG_STM32_USART2_SERIALDRIVER=y
# CONFIG_STM32_USART2_1WIREDRIVER is not set # CONFIG_STM32_USART2_1WIREDRIVER is not set
# CONFIG_USART2_RS485 is not set # CONFIG_USART2_RS485 is not set
#
# Serial Driver Configuration
#
# CONFIG_SERIAL_DISABLE_REORDERING is not set # CONFIG_SERIAL_DISABLE_REORDERING is not set
# CONFIG_STM32_FLOWCONTROL_BROKEN is not set # CONFIG_STM32_FLOWCONTROL_BROKEN is not set
# CONFIG_STM32_USART_BREAKS is not set # CONFIG_STM32_USART_BREAKS is not set
...@@ -717,7 +725,12 @@ CONFIG_SPI_EXCHANGE=y ...@@ -717,7 +725,12 @@ CONFIG_SPI_EXCHANGE=y
# CONFIG_BCH is not set # CONFIG_BCH is not set
# CONFIG_INPUT is not set # CONFIG_INPUT is not set
# CONFIG_IOEXPANDER is not set # CONFIG_IOEXPANDER is not set
#
# LCD Driver Support
#
# CONFIG_LCD is not set # CONFIG_LCD is not set
# CONFIG_SLCD is not set
# #
# LED Support # LED Support
...@@ -1114,6 +1127,7 @@ CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y ...@@ -1114,6 +1127,7 @@ CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
# #
# File System Utilities # File System Utilities
# #
CONFIG_FSUTILS_FLASH_ERASEALL=y
# CONFIG_FSUTILS_INIFILE is not set # CONFIG_FSUTILS_INIFILE is not set
CONFIG_FSUTILS_MKSMARTFS=y CONFIG_FSUTILS_MKSMARTFS=y
# CONFIG_FSUTILS_PASSWD is not set # CONFIG_FSUTILS_PASSWD is not set
...@@ -1267,6 +1281,7 @@ CONFIG_NSH_ARCHINIT=y ...@@ -1267,6 +1281,7 @@ CONFIG_NSH_ARCHINIT=y
# CONFIG_SYSTEM_FREE is not set # CONFIG_SYSTEM_FREE is not set
# CONFIG_SYSTEM_CLE is not set # CONFIG_SYSTEM_CLE is not set
# CONFIG_SYSTEM_CUTERM is not set # CONFIG_SYSTEM_CUTERM is not set
CONFIG_SYSTEM_FLASH_ERASEALL=y
# CONFIG_SYSTEM_INSTALL is not set # CONFIG_SYSTEM_INSTALL is not set
# CONFIG_SYSTEM_HEX2BIN is not set # CONFIG_SYSTEM_HEX2BIN is not set
# CONFIG_SYSTEM_HEXED is not set # CONFIG_SYSTEM_HEXED is not set
......
...@@ -451,9 +451,17 @@ CONFIG_STM32_SERIALDRIVER=y ...@@ -451,9 +451,17 @@ CONFIG_STM32_SERIALDRIVER=y
# #
# U[S]ART Configuration # U[S]ART Configuration
# #
#
# U[S]ART Device Configuration
#
CONFIG_STM32_USART1_SERIALDRIVER=y CONFIG_STM32_USART1_SERIALDRIVER=y
# CONFIG_STM32_USART1_1WIREDRIVER is not set # CONFIG_STM32_USART1_1WIREDRIVER is not set
# CONFIG_USART1_RS485 is not set # CONFIG_USART1_RS485 is not set
#
# Serial Driver Configuration
#
# CONFIG_SERIAL_DISABLE_REORDERING is not set # CONFIG_SERIAL_DISABLE_REORDERING is not set
# CONFIG_STM32_FLOWCONTROL_BROKEN is not set # CONFIG_STM32_FLOWCONTROL_BROKEN is not set
# CONFIG_STM32_USART_BREAKS is not set # CONFIG_STM32_USART_BREAKS is not set
...@@ -728,7 +736,12 @@ CONFIG_SPI_EXCHANGE=y ...@@ -728,7 +736,12 @@ CONFIG_SPI_EXCHANGE=y
# CONFIG_BCH is not set # CONFIG_BCH is not set
# CONFIG_INPUT is not set # CONFIG_INPUT is not set
# CONFIG_IOEXPANDER is not set # CONFIG_IOEXPANDER is not set
#
# LCD Driver Support
#
# CONFIG_LCD is not set # CONFIG_LCD is not set
# CONFIG_SLCD is not set
# #
# LED Support # LED Support
...@@ -1081,6 +1094,7 @@ CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y ...@@ -1081,6 +1094,7 @@ CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
# #
# File System Utilities # File System Utilities
# #
CONFIG_FSUTILS_FLASH_ERASEALL=y
# CONFIG_FSUTILS_INIFILE is not set # CONFIG_FSUTILS_INIFILE is not set
CONFIG_FSUTILS_MKSMARTFS=y CONFIG_FSUTILS_MKSMARTFS=y
# CONFIG_FSUTILS_PASSWD is not set # CONFIG_FSUTILS_PASSWD is not set
...@@ -1231,6 +1245,7 @@ CONFIG_PLATFORM_CONFIGDATA=y ...@@ -1231,6 +1245,7 @@ CONFIG_PLATFORM_CONFIGDATA=y
# CONFIG_SYSTEM_FREE is not set # CONFIG_SYSTEM_FREE is not set
# CONFIG_SYSTEM_CLE is not set # CONFIG_SYSTEM_CLE is not set
# CONFIG_SYSTEM_CUTERM is not set # CONFIG_SYSTEM_CUTERM is not set
CONFIG_SYSTEM_FLASH_ERASEALL=y
# CONFIG_SYSTEM_INSTALL is not set # CONFIG_SYSTEM_INSTALL is not set
# CONFIG_SYSTEM_HEX2BIN is not set # CONFIG_SYSTEM_HEX2BIN is not set
# CONFIG_SYSTEM_HEXED is not set # CONFIG_SYSTEM_HEXED is not set
......
...@@ -19,7 +19,7 @@ menuconfig LCD ...@@ -19,7 +19,7 @@ menuconfig LCD
if LCD if LCD
comment "Common Graphipc LCD Settings" comment "Common Graphic LCD Settings"
config LCD_CONSOLE config LCD_CONSOLE
bool "LCD console output" bool "LCD console output"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment