This is an automated email from the ASF dual-hosted git repository. xiaoxiang pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit fb00ab32421873bbfa8edb34ab383d08334600fa Author: Gustavo Henrique Nihei <[email protected]> AuthorDate: Sun Oct 24 06:43:51 2021 -0300 xtensa/esp32: Rename MTD-related configs to become more intuitive Signed-off-by: Gustavo Henrique Nihei <[email protected]> --- arch/xtensa/src/esp32/Kconfig | 10 +++++----- boards/xtensa/esp32/common/src/esp32_board_spiflash.c | 4 ++-- boards/xtensa/esp32/esp32-devkitc/configs/autopm/defconfig | 2 +- boards/xtensa/esp32/esp32-devkitc/configs/blewifi/defconfig | 2 +- boards/xtensa/esp32/esp32-devkitc/configs/mqttc/defconfig | 2 +- boards/xtensa/esp32/esp32-devkitc/configs/sta_softap/defconfig | 2 +- boards/xtensa/esp32/esp32-devkitc/configs/wapi/defconfig | 2 +- boards/xtensa/esp32/esp32-devkitc/configs/wapi_smp/defconfig | 2 +- boards/xtensa/esp32/esp32-devkitc/configs/wifinsh/defconfig | 2 +- .../xtensa/esp32/esp32-ethernet-kit/configs/autopm/defconfig | 2 +- boards/xtensa/esp32/esp32-ethernet-kit/configs/wapi/defconfig | 2 +- boards/xtensa/esp32/esp32-wrover-kit/configs/autopm/defconfig | 2 +- boards/xtensa/esp32/esp32-wrover-kit/configs/wapi/defconfig | 2 +- 13 files changed, 18 insertions(+), 18 deletions(-) diff --git a/arch/xtensa/src/esp32/Kconfig b/arch/xtensa/src/esp32/Kconfig index 766e105..fdca65a 100644 --- a/arch/xtensa/src/esp32/Kconfig +++ b/arch/xtensa/src/esp32/Kconfig @@ -884,17 +884,17 @@ config ESP32_OTA_SCRATCH_DEVPATH endif -comment "General MTD configuration" +comment "General storage MTD configuration" -config ESP32_MTD_OFFSET - hex "MTD base address in SPI Flash" +config ESP32_STORAGE_MTD_OFFSET + hex "Storage MTD base address in SPI Flash" default 0x180000 if !ESP32_HAVE_OTA_PARTITION default 0x250000 if ESP32_HAVE_OTA_PARTITION ---help--- MTD base address in SPI Flash. -config ESP32_MTD_SIZE - hex "MTD size in SPI Flash" +config ESP32_STORAGE_MTD_SIZE + hex "Storage MTD size in SPI Flash" default 0x100000 ---help--- MTD size in SPI Flash. diff --git a/boards/xtensa/esp32/common/src/esp32_board_spiflash.c b/boards/xtensa/esp32/common/src/esp32_board_spiflash.c index 43cb8ea..c575fdd 100644 --- a/boards/xtensa/esp32/common/src/esp32_board_spiflash.c +++ b/boards/xtensa/esp32/common/src/esp32_board_spiflash.c @@ -413,8 +413,8 @@ static int init_storage_partition(void) int ret = OK; FAR struct mtd_dev_s *mtd; - mtd = esp32_spiflash_alloc_mtdpart(CONFIG_ESP32_MTD_OFFSET, - CONFIG_ESP32_MTD_SIZE); + mtd = esp32_spiflash_alloc_mtdpart(CONFIG_ESP32_STORAGE_MTD_OFFSET, + CONFIG_ESP32_STORAGE_MTD_SIZE); if (!mtd) { ferr("ERROR: Failed to alloc MTD partition of SPI Flash\n"); diff --git a/boards/xtensa/esp32/esp32-devkitc/configs/autopm/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/autopm/defconfig index 3e099e4..4985163 100644 --- a/boards/xtensa/esp32/esp32-devkitc/configs/autopm/defconfig +++ b/boards/xtensa/esp32/esp32-devkitc/configs/autopm/defconfig @@ -23,9 +23,9 @@ CONFIG_BUILTIN=y CONFIG_DRIVERS_IEEE80211=y CONFIG_DRIVERS_WIRELESS=y CONFIG_ESP32_AUTO_SLEEP=y -CONFIG_ESP32_MTD_SIZE=0x80000 CONFIG_ESP32_SPIFLASH=y CONFIG_ESP32_SPIFLASH_SPIFFS=y +CONFIG_ESP32_STORAGE_MTD_SIZE=0x80000 CONFIG_ESP32_UART0=y CONFIG_ESP32_WIFI_SAVE_PARAM=y CONFIG_ESP32_WIRELESS=y diff --git a/boards/xtensa/esp32/esp32-devkitc/configs/blewifi/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/blewifi/defconfig index 1d60b78..9696875 100644 --- a/boards/xtensa/esp32/esp32-devkitc/configs/blewifi/defconfig +++ b/boards/xtensa/esp32/esp32-devkitc/configs/blewifi/defconfig @@ -32,9 +32,9 @@ CONFIG_DRIVERS_BLUETOOTH=y CONFIG_DRIVERS_IEEE80211=y CONFIG_DRIVERS_WIRELESS=y CONFIG_ESP32_BLE=y -CONFIG_ESP32_MTD_SIZE=0x80000 CONFIG_ESP32_SPIFLASH=y CONFIG_ESP32_SPIFLASH_SPIFFS=y +CONFIG_ESP32_STORAGE_MTD_SIZE=0x80000 CONFIG_ESP32_UART0=y CONFIG_ESP32_WIFI_SAVE_PARAM=y CONFIG_FS_PROCFS=y diff --git a/boards/xtensa/esp32/esp32-devkitc/configs/mqttc/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/mqttc/defconfig index 33b52eb..8ee14a5 100644 --- a/boards/xtensa/esp32/esp32-devkitc/configs/mqttc/defconfig +++ b/boards/xtensa/esp32/esp32-devkitc/configs/mqttc/defconfig @@ -22,9 +22,9 @@ CONFIG_BOARD_LOOPSPERMSEC=16717 CONFIG_BUILTIN=y CONFIG_DRIVERS_IEEE80211=y CONFIG_DRIVERS_WIRELESS=y -CONFIG_ESP32_MTD_SIZE=0x80000 CONFIG_ESP32_SPIFLASH=y CONFIG_ESP32_SPIFLASH_SPIFFS=y +CONFIG_ESP32_STORAGE_MTD_SIZE=0x80000 CONFIG_ESP32_UART0=y CONFIG_ESP32_WIRELESS=y CONFIG_EXAMPLES_MQTTC=y diff --git a/boards/xtensa/esp32/esp32-devkitc/configs/sta_softap/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/sta_softap/defconfig index c09974b..943efd8 100644 --- a/boards/xtensa/esp32/esp32-devkitc/configs/sta_softap/defconfig +++ b/boards/xtensa/esp32/esp32-devkitc/configs/sta_softap/defconfig @@ -29,9 +29,9 @@ CONFIG_DEBUG_WIRELESS=y CONFIG_DEBUG_WIRELESS_ERROR=y CONFIG_DRIVERS_IEEE80211=y CONFIG_DRIVERS_WIRELESS=y -CONFIG_ESP32_MTD_SIZE=0x80000 CONFIG_ESP32_SPIFLASH=y CONFIG_ESP32_SPIFLASH_SPIFFS=y +CONFIG_ESP32_STORAGE_MTD_SIZE=0x80000 CONFIG_ESP32_UART0=y CONFIG_ESP32_WIFI_SAVE_PARAM=y CONFIG_ESP32_WIFI_STATION_SOFTAP_COEXISTENCE=y diff --git a/boards/xtensa/esp32/esp32-devkitc/configs/wapi/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/wapi/defconfig index 19a53dc..7ddee6e 100644 --- a/boards/xtensa/esp32/esp32-devkitc/configs/wapi/defconfig +++ b/boards/xtensa/esp32/esp32-devkitc/configs/wapi/defconfig @@ -39,9 +39,9 @@ CONFIG_DEFAULT_TASK_STACKSIZE=4096 CONFIG_DEV_URANDOM=y CONFIG_DRIVERS_IEEE80211=y CONFIG_DRIVERS_WIRELESS=y -CONFIG_ESP32_MTD_SIZE=0x80000 CONFIG_ESP32_SPIFLASH=y CONFIG_ESP32_SPIFLASH_SPIFFS=y +CONFIG_ESP32_STORAGE_MTD_SIZE=0x80000 CONFIG_ESP32_UART0=y CONFIG_ESP32_WIFI_SAVE_PARAM=y CONFIG_ESP32_WIRELESS=y diff --git a/boards/xtensa/esp32/esp32-devkitc/configs/wapi_smp/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/wapi_smp/defconfig index aa18ee6..f3a27bd 100644 --- a/boards/xtensa/esp32/esp32-devkitc/configs/wapi_smp/defconfig +++ b/boards/xtensa/esp32/esp32-devkitc/configs/wapi_smp/defconfig @@ -29,9 +29,9 @@ CONFIG_DEBUG_SYMBOLS=y CONFIG_DEV_URANDOM=y CONFIG_DRIVERS_IEEE80211=y CONFIG_DRIVERS_WIRELESS=y -CONFIG_ESP32_MTD_SIZE=0x80000 CONFIG_ESP32_SPIFLASH=y CONFIG_ESP32_SPIFLASH_SPIFFS=y +CONFIG_ESP32_STORAGE_MTD_SIZE=0x80000 CONFIG_ESP32_UART0=y CONFIG_ESP32_WIFI_SAVE_PARAM=y CONFIG_ESP32_WIRELESS=y diff --git a/boards/xtensa/esp32/esp32-devkitc/configs/wifinsh/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/wifinsh/defconfig index 5e545d8..6028acd 100644 --- a/boards/xtensa/esp32/esp32-devkitc/configs/wifinsh/defconfig +++ b/boards/xtensa/esp32/esp32-devkitc/configs/wifinsh/defconfig @@ -23,9 +23,9 @@ CONFIG_BUILTIN=y CONFIG_DEV_URANDOM=y CONFIG_DRIVERS_IEEE80211=y CONFIG_DRIVERS_WIRELESS=y -CONFIG_ESP32_MTD_SIZE=0x80000 CONFIG_ESP32_SPIFLASH=y CONFIG_ESP32_SPIFLASH_SPIFFS=y +CONFIG_ESP32_STORAGE_MTD_SIZE=0x80000 CONFIG_ESP32_UART0=y CONFIG_ESP32_WIFI_SAVE_PARAM=y CONFIG_ESP32_WIRELESS=y diff --git a/boards/xtensa/esp32/esp32-ethernet-kit/configs/autopm/defconfig b/boards/xtensa/esp32/esp32-ethernet-kit/configs/autopm/defconfig index ca12848..3c43080 100644 --- a/boards/xtensa/esp32/esp32-ethernet-kit/configs/autopm/defconfig +++ b/boards/xtensa/esp32/esp32-ethernet-kit/configs/autopm/defconfig @@ -22,9 +22,9 @@ CONFIG_BUILTIN=y CONFIG_DRIVERS_IEEE80211=y CONFIG_DRIVERS_WIRELESS=y CONFIG_ESP32_AUTO_SLEEP=y -CONFIG_ESP32_MTD_SIZE=0x80000 CONFIG_ESP32_SPIFLASH=y CONFIG_ESP32_SPIFLASH_SPIFFS=y +CONFIG_ESP32_STORAGE_MTD_SIZE=0x80000 CONFIG_ESP32_UART0=y CONFIG_ESP32_WIFI_SAVE_PARAM=y CONFIG_ESP32_WIRELESS=y diff --git a/boards/xtensa/esp32/esp32-ethernet-kit/configs/wapi/defconfig b/boards/xtensa/esp32/esp32-ethernet-kit/configs/wapi/defconfig index d045060..78f3edd 100644 --- a/boards/xtensa/esp32/esp32-ethernet-kit/configs/wapi/defconfig +++ b/boards/xtensa/esp32/esp32-ethernet-kit/configs/wapi/defconfig @@ -21,9 +21,9 @@ CONFIG_BOARD_LOOPSPERMSEC=16717 CONFIG_BUILTIN=y CONFIG_DRIVERS_IEEE80211=y CONFIG_DRIVERS_WIRELESS=y -CONFIG_ESP32_MTD_SIZE=0x80000 CONFIG_ESP32_SPIFLASH=y CONFIG_ESP32_SPIFLASH_SPIFFS=y +CONFIG_ESP32_STORAGE_MTD_SIZE=0x80000 CONFIG_ESP32_UART0=y CONFIG_ESP32_WIFI_SAVE_PARAM=y CONFIG_ESP32_WIRELESS=y diff --git a/boards/xtensa/esp32/esp32-wrover-kit/configs/autopm/defconfig b/boards/xtensa/esp32/esp32-wrover-kit/configs/autopm/defconfig index 3682917..82d066e 100644 --- a/boards/xtensa/esp32/esp32-wrover-kit/configs/autopm/defconfig +++ b/boards/xtensa/esp32/esp32-wrover-kit/configs/autopm/defconfig @@ -23,9 +23,9 @@ CONFIG_BUILTIN=y CONFIG_DRIVERS_IEEE80211=y CONFIG_DRIVERS_WIRELESS=y CONFIG_ESP32_AUTO_SLEEP=y -CONFIG_ESP32_MTD_SIZE=0x80000 CONFIG_ESP32_SPIFLASH=y CONFIG_ESP32_SPIFLASH_SPIFFS=y +CONFIG_ESP32_STORAGE_MTD_SIZE=0x80000 CONFIG_ESP32_UART0=y CONFIG_ESP32_WIFI_SAVE_PARAM=y CONFIG_ESP32_WIRELESS=y diff --git a/boards/xtensa/esp32/esp32-wrover-kit/configs/wapi/defconfig b/boards/xtensa/esp32/esp32-wrover-kit/configs/wapi/defconfig index a6964e2..13eb942 100644 --- a/boards/xtensa/esp32/esp32-wrover-kit/configs/wapi/defconfig +++ b/boards/xtensa/esp32/esp32-wrover-kit/configs/wapi/defconfig @@ -22,9 +22,9 @@ CONFIG_BOARD_LOOPSPERMSEC=16717 CONFIG_BUILTIN=y CONFIG_DRIVERS_IEEE80211=y CONFIG_DRIVERS_WIRELESS=y -CONFIG_ESP32_MTD_SIZE=0x80000 CONFIG_ESP32_SPIFLASH=y CONFIG_ESP32_SPIFLASH_SPIFFS=y +CONFIG_ESP32_STORAGE_MTD_SIZE=0x80000 CONFIG_ESP32_UART0=y CONFIG_ESP32_WIFI_SAVE_PARAM=y CONFIG_ESP32_WIRELESS=y
