Skip to content

Commit 0f1dbcc

Browse files
mythbuster5mythbuster5
committed
fix(spi_flash): Make GD chip to be linked as default, also optimization the log information
1 parent 5133b89 commit 0f1dbcc

26 files changed

+139
-102
lines changed

‎components/spi_flash/Kconfig‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -374,7 +374,7 @@ menu "SPI Flash driver"
374374

375375
config SPI_FLASH_SUPPORT_ISSI_CHIP
376376
bool "ISSI"
377-
default y if SPI_FLASH_VENDOR_ISSI_SUPPORTED
377+
default y if SPI_FLASH_VENDOR_ISSI_SUPPORT_ENABLED
378378
default n
379379
help
380380
Enable this to support auto detection of ISSI chips if chip vendor not directly
@@ -383,7 +383,7 @@ menu "SPI Flash driver"
383383

384384
config SPI_FLASH_SUPPORT_MXIC_CHIP
385385
bool "MXIC"
386-
default y if SPI_FLASH_VENDOR_MXIC_SUPPORTED
386+
default y if SPI_FLASH_VENDOR_MXIC_SUPPORT_ENABLED
387387
default n
388388
help
389389
Enable this to support auto detection of MXIC chips if chip vendor not directly
@@ -392,7 +392,7 @@ menu "SPI Flash driver"
392392

393393
config SPI_FLASH_SUPPORT_GD_CHIP
394394
bool "GigaDevice"
395-
default y if SPI_FLASH_VENDOR_GD_SUPPORTED
395+
default y if SPI_FLASH_VENDOR_GD_SUPPORT_ENABLED
396396
default n
397397
help
398398
Enable this to support auto detection of GD (GigaDevice) chips if chip vendor not
@@ -406,7 +406,7 @@ menu "SPI Flash driver"
406406

407407
config SPI_FLASH_SUPPORT_WINBOND_CHIP
408408
bool "Winbond"
409-
default y if SPI_FLASH_VENDOR_WINBOND_SUPPORTED
409+
default y if SPI_FLASH_VENDOR_WINBOND_SUPPORT_ENABLED
410410
default n
411411
help
412412
Enable this to support auto detection of Winbond chips if chip vendor not directly
@@ -416,7 +416,7 @@ menu "SPI Flash driver"
416416
config SPI_FLASH_SUPPORT_BOYA_CHIP
417417
bool "BOYA"
418418
# ESP32 doesn't usually use this chip, default n to save iram.
419-
default y if SPI_FLASH_VENDOR_BOYA_SUPPORTED
419+
default y if SPI_FLASH_VENDOR_BOYA_SUPPORT_ENABLED
420420
default n
421421
help
422422
Enable this to support auto detection of BOYA chips if chip vendor not directly
@@ -426,7 +426,7 @@ menu "SPI Flash driver"
426426
config SPI_FLASH_SUPPORT_TH_CHIP
427427
bool "TH"
428428
# ESP32 doesn't usually use this chip, default n to save iram.
429-
default y if SPI_FLASH_VENDOR_TH_SUPPORTED
429+
default y if SPI_FLASH_VENDOR_TH_SUPPORT_ENABLED
430430
default n
431431
help
432432
Enable this to support auto detection of TH chips if chip vendor not directly

‎components/spi_flash/esp32/Kconfig.soc_caps.in‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,22 @@
33
# using gen_soc_caps_kconfig.py, do not edit manually
44
#####################################################
55

6-
config SPI_FLASH_VENDOR_XMC_SUPPORTED
6+
config SPI_FLASH_VENDOR_XMC_SUPPORT_ENABLED
77
bool
88
default y
99

10-
config SPI_FLASH_VENDOR_GD_SUPPORTED
10+
config SPI_FLASH_VENDOR_GD_SUPPORT_ENABLED
1111
bool
1212
default y
1313

14-
config SPI_FLASH_VENDOR_ISSI_SUPPORTED
14+
config SPI_FLASH_VENDOR_ISSI_SUPPORT_ENABLED
1515
bool
1616
default y
1717

18-
config SPI_FLASH_VENDOR_MXIC_SUPPORTED
18+
config SPI_FLASH_VENDOR_MXIC_SUPPORT_ENABLED
1919
bool
2020
default y
2121

22-
config SPI_FLASH_VENDOR_WINBOND_SUPPORTED
22+
config SPI_FLASH_VENDOR_WINBOND_SUPPORT_ENABLED
2323
bool
2424
default y

‎components/spi_flash/esp32/flash_vendor_caps.h‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,29 @@
11
/*
2-
* SPDX-FileCopyrightText: 2023 Espressif Systems (Shanghai) CO LTD
2+
* SPDX-FileCopyrightText: 2023-2025 Espressif Systems (Shanghai) CO LTD
33
*
44
* SPDX-License-Identifier: Apache-2.0
55
*/
66

77
/**
8-
* This file records the flash vendor that we offically supported.
8+
* This file records the flash vendor that we officially supported.
99
* we have many chip-specific files, like ``spi_flash_chip_gd.c``,
1010
* which means that this file is used for GD flash chips.
1111
*
12-
* The following definations illustrate what flash vendor is officially
12+
* The following definitions illustrate what flash vendor is officially
1313
* supported by ESP chips. If a flash vendor is officially supported, the chip
1414
* specific file will be linked by default, vice versa. You can also adjust this
1515
* manually in Kconfig options.
1616
*
1717
* For example:
18-
* Following `SPI_FLASH_VENDOR_ISSI_SUPPORTED` is (1), which means file `spi_flash_chip_issi.c`
18+
* Following `SPI_FLASH_VENDOR_ISSI_SUPPORT_ENABLED` is (1), which means file `spi_flash_chip_issi.c`
1919
* will be linked.
2020
*
2121
*/
2222

2323
#pragma once
2424

25-
#define SPI_FLASH_VENDOR_XMC_SUPPORTED (1)
26-
#define SPI_FLASH_VENDOR_GD_SUPPORTED (1)
27-
#define SPI_FLASH_VENDOR_ISSI_SUPPORTED (1)
28-
#define SPI_FLASH_VENDOR_MXIC_SUPPORTED (1)
29-
#define SPI_FLASH_VENDOR_WINBOND_SUPPORTED (1)
25+
#define SPI_FLASH_VENDOR_XMC_SUPPORT_ENABLED (1)
26+
#define SPI_FLASH_VENDOR_GD_SUPPORT_ENABLED (1)
27+
#define SPI_FLASH_VENDOR_ISSI_SUPPORT_ENABLED (1)
28+
#define SPI_FLASH_VENDOR_MXIC_SUPPORT_ENABLED (1)
29+
#define SPI_FLASH_VENDOR_WINBOND_SUPPORT_ENABLED (1)

‎components/spi_flash/esp32c2/Kconfig.soc_caps.in‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,30 +3,30 @@
33
# using gen_soc_caps_kconfig.py, do not edit manually
44
#####################################################
55

6-
config SPI_FLASH_VENDOR_XMC_SUPPORTED
6+
config SPI_FLASH_VENDOR_XMC_SUPPORT_ENABLED
77
bool
88
default y
99

10-
config SPI_FLASH_VENDOR_GD_SUPPORTED
10+
config SPI_FLASH_VENDOR_GD_SUPPORT_ENABLED
1111
bool
1212
default y
1313

14-
config SPI_FLASH_VENDOR_ISSI_SUPPORTED
14+
config SPI_FLASH_VENDOR_ISSI_SUPPORT_ENABLED
1515
bool
1616
default y
1717

18-
config SPI_FLASH_VENDOR_MXIC_SUPPORTED
18+
config SPI_FLASH_VENDOR_MXIC_SUPPORT_ENABLED
1919
bool
2020
default y
2121

22-
config SPI_FLASH_VENDOR_WINBOND_SUPPORTED
22+
config SPI_FLASH_VENDOR_WINBOND_SUPPORT_ENABLED
2323
bool
2424
default y
2525

26-
config SPI_FLASH_VENDOR_BOYA_SUPPORTED
26+
config SPI_FLASH_VENDOR_BOYA_SUPPORT_ENABLED
2727
bool
2828
default y
2929

30-
config SPI_FLASH_VENDOR_TH_SUPPORTED
30+
config SPI_FLASH_VENDOR_TH_SUPPORT_ENABLED
3131
bool
3232
default y

‎components/spi_flash/esp32c2/flash_vendor_caps.h‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
/*
2-
* SPDX-FileCopyrightText: 2023 Espressif Systems (Shanghai) CO LTD
2+
* SPDX-FileCopyrightText: 2023-2025 Espressif Systems (Shanghai) CO LTD
33
*
44
* SPDX-License-Identifier: Apache-2.0
55
*/
66
#pragma once
77

8-
#define SPI_FLASH_VENDOR_XMC_SUPPORTED (1)
9-
#define SPI_FLASH_VENDOR_GD_SUPPORTED (1)
10-
#define SPI_FLASH_VENDOR_ISSI_SUPPORTED (1)
11-
#define SPI_FLASH_VENDOR_MXIC_SUPPORTED (1)
12-
#define SPI_FLASH_VENDOR_WINBOND_SUPPORTED (1)
13-
#define SPI_FLASH_VENDOR_BOYA_SUPPORTED (1)
14-
#define SPI_FLASH_VENDOR_TH_SUPPORTED (1)
8+
#define SPI_FLASH_VENDOR_XMC_SUPPORT_ENABLED (1)
9+
#define SPI_FLASH_VENDOR_GD_SUPPORT_ENABLED (1)
10+
#define SPI_FLASH_VENDOR_ISSI_SUPPORT_ENABLED (1)
11+
#define SPI_FLASH_VENDOR_MXIC_SUPPORT_ENABLED (1)
12+
#define SPI_FLASH_VENDOR_WINBOND_SUPPORT_ENABLED (1)
13+
#define SPI_FLASH_VENDOR_BOYA_SUPPORT_ENABLED (1)
14+
#define SPI_FLASH_VENDOR_TH_SUPPORT_ENABLED (1)

‎components/spi_flash/esp32c3/Kconfig.soc_caps.in‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,30 +3,30 @@
33
# using gen_soc_caps_kconfig.py, do not edit manually
44
#####################################################
55

6-
config SPI_FLASH_VENDOR_XMC_SUPPORTED
6+
config SPI_FLASH_VENDOR_XMC_SUPPORT_ENABLED
77
bool
88
default y
99

10-
config SPI_FLASH_VENDOR_GD_SUPPORTED
10+
config SPI_FLASH_VENDOR_GD_SUPPORT_ENABLED
1111
bool
1212
default y
1313

14-
config SPI_FLASH_VENDOR_ISSI_SUPPORTED
14+
config SPI_FLASH_VENDOR_ISSI_SUPPORT_ENABLED
1515
bool
1616
default y
1717

18-
config SPI_FLASH_VENDOR_MXIC_SUPPORTED
18+
config SPI_FLASH_VENDOR_MXIC_SUPPORT_ENABLED
1919
bool
2020
default y
2121

22-
config SPI_FLASH_VENDOR_WINBOND_SUPPORTED
22+
config SPI_FLASH_VENDOR_WINBOND_SUPPORT_ENABLED
2323
bool
2424
default y
2525

26-
config SPI_FLASH_VENDOR_BOYA_SUPPORTED
26+
config SPI_FLASH_VENDOR_BOYA_SUPPORT_ENABLED
2727
bool
2828
default y
2929

30-
config SPI_FLASH_VENDOR_TH_SUPPORTED
30+
config SPI_FLASH_VENDOR_TH_SUPPORT_ENABLED
3131
bool
3232
default y

‎components/spi_flash/esp32c3/flash_vendor_caps.h‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
/*
2-
* SPDX-FileCopyrightText: 2023 Espressif Systems (Shanghai) CO LTD
2+
* SPDX-FileCopyrightText: 2023-2025 Espressif Systems (Shanghai) CO LTD
33
*
44
* SPDX-License-Identifier: Apache-2.0
55
*/
66
#pragma once
77

8-
#define SPI_FLASH_VENDOR_XMC_SUPPORTED (1)
9-
#define SPI_FLASH_VENDOR_GD_SUPPORTED (1)
10-
#define SPI_FLASH_VENDOR_ISSI_SUPPORTED (1)
11-
#define SPI_FLASH_VENDOR_MXIC_SUPPORTED (1)
12-
#define SPI_FLASH_VENDOR_WINBOND_SUPPORTED (1)
13-
#define SPI_FLASH_VENDOR_BOYA_SUPPORTED (1)
14-
#define SPI_FLASH_VENDOR_TH_SUPPORTED (1)
8+
#define SPI_FLASH_VENDOR_XMC_SUPPORT_ENABLED (1)
9+
#define SPI_FLASH_VENDOR_GD_SUPPORT_ENABLED (1)
10+
#define SPI_FLASH_VENDOR_ISSI_SUPPORT_ENABLED (1)
11+
#define SPI_FLASH_VENDOR_MXIC_SUPPORT_ENABLED (1)
12+
#define SPI_FLASH_VENDOR_WINBOND_SUPPORT_ENABLED (1)
13+
#define SPI_FLASH_VENDOR_BOYA_SUPPORT_ENABLED (1)
14+
#define SPI_FLASH_VENDOR_TH_SUPPORT_ENABLED (1)

‎components/spi_flash/esp32c5/Kconfig.soc_caps.in‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@
33
# using gen_soc_caps_kconfig.py, do not edit manually
44
#####################################################
55

6-
config SPI_FLASH_VENDOR_XMC_SUPPORTED
6+
config SPI_FLASH_VENDOR_XMC_SUPPORT_ENABLED
7+
bool
8+
default y
9+
10+
config SPI_FLASH_VENDOR_GD_SUPPORT_ENABLED
711
bool
812
default y

‎components/spi_flash/esp32c5/flash_vendor_caps.h‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,5 @@
55
*/
66
#pragma once
77

8-
#define SPI_FLASH_VENDOR_XMC_SUPPORTED (1)
8+
#define SPI_FLASH_VENDOR_XMC_SUPPORT_ENABLED (1)
9+
#define SPI_FLASH_VENDOR_GD_SUPPORT_ENABLED (1)

‎components/spi_flash/esp32c6/Kconfig.soc_caps.in‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@
33
# using gen_soc_caps_kconfig.py, do not edit manually
44
#####################################################
55

6-
config SPI_FLASH_VENDOR_XMC_SUPPORTED
6+
config SPI_FLASH_VENDOR_XMC_SUPPORT_ENABLED
7+
bool
8+
default y
9+
10+
config SPI_FLASH_VENDOR_GD_SUPPORT_ENABLED
711
bool
812
default y

0 commit comments

Comments
 (0)