Merge branch 'feature/rm_unused_config_dependence' into 'master'

feat(kconfig): Remove unused config dependence See merge request sdk/ESP8266_RTOS_SDK!1524
Jukoo · Sep 10, 2020 · 18c3a19 · 18c3a19
2 parents 373cc0e + b4831fa
commit 18c3a19
Show file tree

Hide file tree

Showing 9 changed files with 2 additions and 43 deletions.
diff --git a/components/console/CMakeLists.txt b/components/console/CMakeLists.txt
@@ -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()
-
diff --git a/components/console/Kconfig b/components/console/Kconfig
diff --git a/components/console/component.mk b/components/console/component.mk
@@ -1,8 +1,3 @@
 
-ifdef CONFIG_USING_ESP_CONSOLE
 COMPONENT_ADD_INCLUDEDIRS := .
 COMPONENT_SRCDIRS := linenoise argtable3 .
-else
-COMPONENT_ADD_INCLUDEDIRS :=
-COMPONENT_SRCDIRS :=
-endif
diff --git a/components/spiffs/CMakeLists.txt b/components/spiffs/CMakeLists.txt
@@ -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")

diff --git a/components/spiffs/Kconfig b/components/spiffs/Kconfig
@@ -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
diff --git a/components/spiffs/component.mk b/components/spiffs/component.mk
@@ -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
diff --git a/examples/storage/spiffs/sdkconfig.defaults b/examples/storage/spiffs/sdkconfig.defaults
@@ -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
diff --git a/examples/system/console/sdkconfig.defaults b/examples/system/console/sdkconfig.defaults
@@ -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
diff --git a/tools/unit-test-app/sdkconfig.defaults b/tools/unit-test-app/sdkconfig.defaults
@@ -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