Skip to content

Commit b4831fa

Browse files
committed
feat(kconfig): Remove unused config dependence
1 parent eb6efa8 commit b4831fa

File tree

9 files changed

+2
-43
lines changed

9 files changed

+2
-43
lines changed

components/console/CMakeLists.txt

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,9 @@
1-
if(CONFIG_USING_ESP_CONSOLE)
21
set(COMPONENT_ADD_INCLUDEDIRS .)
32
set(COMPONENT_SRCS "commands.c"
43
"split_argv.c"
54
"argtable3/argtable3.c"
65
"linenoise/linenoise.c")
7-
else()
8-
set(COMPONENT_ADD_INCLUDEDIRS "")
9-
set(COMPONENT_SRCS "")
10-
endif()
116

127
set(COMPONENT_REQUIRES)
138

149
register_component()
15-

components/console/Kconfig

Lines changed: 0 additions & 10 deletions
This file was deleted.

components/console/component.mk

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,3 @@
11

2-
ifdef CONFIG_USING_ESP_CONSOLE
32
COMPONENT_ADD_INCLUDEDIRS := .
43
COMPONENT_SRCDIRS := linenoise argtable3 .
5-
else
6-
COMPONENT_ADD_INCLUDEDIRS :=
7-
COMPONENT_SRCDIRS :=
8-
endif

components/spiffs/CMakeLists.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
set(include_dirs "include")
22

3-
if(CONFIG_USING_SPIFFS)
43
set(priv_include_dirs "." "spiffs/src")
54
set(srcs "esp_spiffs.c"
65
"spiffs_api.c"
@@ -9,7 +8,6 @@ set(srcs "esp_spiffs.c"
98
"spiffs/src/spiffs_gc.c"
109
"spiffs/src/spiffs_hydrogen.c"
1110
"spiffs/src/spiffs_nucleus.c")
12-
endif()
1311

1412
set(requires "spi_flash" "vfs")
1513
set(priv_requires "bootloader_support")

components/spiffs/Kconfig

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,4 @@
1-
menuconfig USING_SPIFFS
2-
bool "SPIFFS"
3-
select USING_ESP_VFS
4-
help
5-
Select this option to enable support for the SPIFFS.
6-
7-
if USING_SPIFFS
1+
menu "SPIFFS Configuration"
82

93
config SPIFFS_MAX_PARTITIONS
104
int "Maximum Number of Partitions"
@@ -164,4 +158,4 @@ config SPIFFS_TEST_VISUALISATION
164158

165159
endmenu
166160

167-
endif
161+
endmenu

components/spiffs/component.mk

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,3 @@
1-
ifdef CONFIG_USING_SPIFFS
21
COMPONENT_ADD_INCLUDEDIRS := include
32
COMPONENT_PRIV_INCLUDEDIRS := . spiffs/src
43
COMPONENT_SRCDIRS := . spiffs/src
5-
else
6-
COMPONENT_ADD_INCLUDEDIRS :=
7-
COMPONENT_PRIV_INCLUDEDIRS :=
8-
COMPONENT_SRCDIRS :=
9-
endif
Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
11
CONFIG_PARTITION_TABLE_CUSTOM=y
22
CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions_example.csv"
33
CONFIG_PARTITION_TABLE_FILENAME="partitions_example.csv"
4-
5-
CONFIG_USING_SPIFFS=y

examples/system/console/sdkconfig.defaults

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,3 @@ CONFIG_PARTITION_TABLE_FILENAME="partitions_example.csv"
1313
# Enable FreeRTOS stats formatting functions, needed for 'tasks' command
1414
CONFIG_FREERTOS_USE_TRACE_FACILITY=y
1515
CONFIG_FREERTOS_USE_STATS_FORMATTING_FUNCTIONS=y
16-
17-
CONFIG_USING_ESP_CONSOLE=y

tools/unit-test-app/sdkconfig.defaults

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,3 @@ CONFIG_PARTITION_TABLE_FILENAME="partition_table_unit_test_app.csv"
44
CONFIG_PARTITION_TABLE_OFFSET=0x8000
55
CONFIG_TASK_WDT=
66
CONFIG_ENABLE_PTHREAD=y
7-
8-
CONFIG_USING_SPIFFS=y

0 commit comments

Comments
 (0)