Merge branch 'feature/rm_unused_config_dependence' into 'master'

feat(kconfig): Remove unused config dependence

See merge request sdk/ESP8266_RTOS_SDK!1524
This commit is contained in:
Dong Heng
2020-09-10 16:13:42 +08:00
9 changed files with 2 additions and 43 deletions

View File

@ -1,15 +1,9 @@
if(CONFIG_USING_ESP_CONSOLE)
set(COMPONENT_ADD_INCLUDEDIRS .)
set(COMPONENT_SRCS "commands.c"
"split_argv.c"
"argtable3/argtable3.c"
"linenoise/linenoise.c")
else()
set(COMPONENT_ADD_INCLUDEDIRS "")
set(COMPONENT_SRCS "")
endif()
set(COMPONENT_REQUIRES)
register_component()

View File

@ -1,10 +0,0 @@
menu "Console"
config USING_ESP_CONSOLE
bool "Using Espressif Console"
default n
select USING_ESP_VFS
help
Enable this option, espressif console can be used.
endmenu

View File

@ -1,8 +1,3 @@
ifdef CONFIG_USING_ESP_CONSOLE
COMPONENT_ADD_INCLUDEDIRS := .
COMPONENT_SRCDIRS := linenoise argtable3 .
else
COMPONENT_ADD_INCLUDEDIRS :=
COMPONENT_SRCDIRS :=
endif

View File

@ -1,6 +1,5 @@
set(include_dirs "include")
if(CONFIG_USING_SPIFFS)
set(priv_include_dirs "." "spiffs/src")
set(srcs "esp_spiffs.c"
"spiffs_api.c"
@ -9,7 +8,6 @@ set(srcs "esp_spiffs.c"
"spiffs/src/spiffs_gc.c"
"spiffs/src/spiffs_hydrogen.c"
"spiffs/src/spiffs_nucleus.c")
endif()
set(requires "spi_flash" "vfs")
set(priv_requires "bootloader_support")

View File

@ -1,10 +1,4 @@
menuconfig USING_SPIFFS
bool "SPIFFS"
select USING_ESP_VFS
help
Select this option to enable support for the SPIFFS.
if USING_SPIFFS
menu "SPIFFS Configuration"
config SPIFFS_MAX_PARTITIONS
int "Maximum Number of Partitions"
@ -164,4 +158,4 @@ config SPIFFS_TEST_VISUALISATION
endmenu
endif
endmenu

View File

@ -1,9 +1,3 @@
ifdef CONFIG_USING_SPIFFS
COMPONENT_ADD_INCLUDEDIRS := include
COMPONENT_PRIV_INCLUDEDIRS := . spiffs/src
COMPONENT_SRCDIRS := . spiffs/src
else
COMPONENT_ADD_INCLUDEDIRS :=
COMPONENT_PRIV_INCLUDEDIRS :=
COMPONENT_SRCDIRS :=
endif

View File

@ -1,5 +1,3 @@
CONFIG_PARTITION_TABLE_CUSTOM=y
CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions_example.csv"
CONFIG_PARTITION_TABLE_FILENAME="partitions_example.csv"
CONFIG_USING_SPIFFS=y

View File

@ -13,5 +13,3 @@ CONFIG_PARTITION_TABLE_FILENAME="partitions_example.csv"
# Enable FreeRTOS stats formatting functions, needed for 'tasks' command
CONFIG_FREERTOS_USE_TRACE_FACILITY=y
CONFIG_FREERTOS_USE_STATS_FORMATTING_FUNCTIONS=y
CONFIG_USING_ESP_CONSOLE=y

View File

@ -4,5 +4,3 @@ CONFIG_PARTITION_TABLE_FILENAME="partition_table_unit_test_app.csv"
CONFIG_PARTITION_TABLE_OFFSET=0x8000
CONFIG_TASK_WDT=
CONFIG_ENABLE_PTHREAD=y
CONFIG_USING_SPIFFS=y