This is an automated email from the ASF dual-hosted git repository.
tmedicci pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
The following commit(s) were added to refs/heads/master by this push:
new e513cea6da boards/esp32s3: Merge common configurations
e513cea6da is described below
commit e513cea6daa4f9eef9d09d56dc780c23cd3d3539
Author: wangjianyu3 <wangjian...@xiaomi.com>
AuthorDate: Thu Mar 20 16:57:10 2025 +0800
boards/esp32s3: Merge common configurations
So that when adding new boards, duplicate content will not be copied.
Test:
1. Refreshing board configurations
./tools/refresh.sh --silent arch:xtensa
2. Check if there is anything missing
$ git diff HEAD . | grep "^[+-]" | sed 's/^[-+]*//' | sed 's/^ [ab]*//'
| grep -v "^$" | sort -u | wc -l
66
$ git diff HEAD . | grep "^[+-]" | sort -u | wc -l
132
Signed-off-by: wangjianyu3 <wangjian...@xiaomi.com>
---
boards/xtensa/esp32s3/common/Kconfig | 81 +++++++++++++++++++++++++++
boards/xtensa/esp32s3/esp32s3-box/Kconfig | 48 ----------------
boards/xtensa/esp32s3/esp32s3-devkit/Kconfig | 76 -------------------------
boards/xtensa/esp32s3/esp32s3-eye/Kconfig | 47 ----------------
boards/xtensa/esp32s3/esp32s3-korvo-2/Kconfig | 51 -----------------
boards/xtensa/esp32s3/esp32s3-lcd-ev/Kconfig | 52 -----------------
boards/xtensa/esp32s3/esp32s3-lhcbit/Kconfig | 76 -------------------------
boards/xtensa/esp32s3/esp32s3-meadow/Kconfig | 47 ----------------
8 files changed, 81 insertions(+), 397 deletions(-)
diff --git a/boards/xtensa/esp32s3/common/Kconfig
b/boards/xtensa/esp32s3/common/Kconfig
index 47c74d0432..6948cee207 100644
--- a/boards/xtensa/esp32s3/common/Kconfig
+++ b/boards/xtensa/esp32s3/common/Kconfig
@@ -29,3 +29,84 @@ config ESP32S3_SPEED_UP_ISR
If you run applications that need continue reading data from
PSRAM,
such as LCD display, please select this option.
+
+config ESP32S3_STORAGE_MTD_OFFSET
+ hex "Storage MTD base address in SPI Flash"
+ default 0x180000 if !ESP32S3_HAVE_OTA_PARTITION
+ default 0x250000 if ESP32S3_HAVE_OTA_PARTITION
+ depends on ESP32S3_MTD
+ ---help---
+ MTD base address in SPI Flash.
+
+config ESP32S3_STORAGE_MTD_SIZE
+ hex "Storage MTD size in SPI Flash"
+ default 0x100000
+ range 0x0 0x400000 if ESP32S3_FLASH_4M
+ range 0x0 0x800000 if ESP32S3_FLASH_8M
+ range 0x0 0x1000000 if ESP32S3_FLASH_16M
+ range 0x0 0x2000000 if ESP32S3_FLASH_32M
+ depends on ESP32S3_MTD
+ ---help---
+ MTD size in SPI Flash.
+
+choice ESP32S3_SPIFLASH_FS
+ prompt "Mount SPI Flash MTD on bring-up"
+ default ESP32S3_SPIFLASH_SMARTFS
+ depends on ESP32S3_MTD
+ optional
+ ---help---
+ Mount the SPI Flash MTD with the selected File System format on
board
+ bring-up.
+ If not selected, the MTD will be registered as a device node on
/dev.
+
+config ESP32S3_SPIFLASH_SMARTFS
+ bool "SmartFS"
+ select FS_SMARTFS
+ select MTD_SMART
+
+config ESP32S3_SPIFLASH_NXFFS
+ bool "NXFFS"
+ select FS_NXFFS
+
+config ESP32S3_SPIFLASH_SPIFFS
+ bool "SPIFFS"
+ select FS_SPIFFS
+
+config ESP32S3_SPIFLASH_LITTLEFS
+ bool "LittleFS"
+ select FS_LITTLEFS
+
+endchoice # ESP32S3_SPIFLASH_FS
+
+if PM
+
+config PM_ALARM_SEC
+ int "PM_STANDBY delay (seconds)"
+ default 15
+ ---help---
+ Number of seconds to wait in PM_STANDBY before going to
PM_STANDBY mode.
+
+config PM_ALARM_NSEC
+ int "PM_STANDBY delay (nanoseconds)"
+ default 0
+ ---help---
+ Number of additional nanoseconds to wait in PM_STANDBY before
going to PM_STANDBY mode.
+
+config PM_SLEEP_WAKEUP_SEC
+ int "PM_SLEEP delay (seconds)"
+ default 20
+ ---help---
+ Number of seconds to wait in PM_SLEEP.
+
+config PM_SLEEP_WAKEUP_NSEC
+ int "PM_SLEEP delay (nanoseconds)"
+ default 0
+ ---help---
+ Number of additional nanoseconds to wait in PM_SLEEP.
+
+endif # PM
+
+config ESP32S3_BOARD_I2C
+ bool
+ default y if ESP32S3_I2C0 || ESP32S3_I2C1
+
diff --git a/boards/xtensa/esp32s3/esp32s3-box/Kconfig
b/boards/xtensa/esp32s3/esp32s3-box/Kconfig
index b47e2effcc..db94b6cd91 100644
--- a/boards/xtensa/esp32s3/esp32s3-box/Kconfig
+++ b/boards/xtensa/esp32s3/esp32s3-box/Kconfig
@@ -16,54 +16,6 @@ config ESP32_S3_BOX_3
bool "ESP32-S3-BOX-3"
endchoice
-config ESP32S3_STORAGE_MTD_OFFSET
- hex "Storage MTD base address in SPI Flash"
- default 0x180000 if !ESP32S3_HAVE_OTA_PARTITION
- default 0x250000 if ESP32S3_HAVE_OTA_PARTITION
- depends on ESP32S3_MTD
- ---help---
- MTD base address in SPI Flash.
-
-config ESP32S3_STORAGE_MTD_SIZE
- hex "Storage MTD size in SPI Flash"
- default 0x100000
- range 0x0 0x400000 if ESP32S3_FLASH_4M
- range 0x0 0x800000 if ESP32S3_FLASH_8M
- range 0x0 0x1000000 if ESP32S3_FLASH_16M
- range 0x0 0x2000000 if ESP32S3_FLASH_32M
- depends on ESP32S3_MTD
- ---help---
- MTD size in SPI Flash.
-
-choice ESP32S3_SPIFLASH_FS
- prompt "Mount SPI Flash MTD on bring-up"
- default ESP32S3_SPIFLASH_SMARTFS
- depends on ESP32S3_MTD
- optional
- ---help---
- Mount the SPI Flash MTD with the selected File System format on
board
- bring-up.
- If not selected, the MTD will be registered as a device node on
/dev.
-
-config ESP32S3_SPIFLASH_SMARTFS
- bool "SmartFS"
- select FS_SMARTFS
- select MTD_SMART
-
-config ESP32S3_SPIFLASH_NXFFS
- bool "NXFFS"
- select FS_NXFFS
-
-config ESP32S3_SPIFLASH_SPIFFS
- bool "SPIFFS"
- select FS_SPIFFS
-
-config ESP32S3_SPIFLASH_LITTLEFS
- bool "LittleFS"
- select FS_LITTLEFS
-
-endchoice # ESP32S3_SPIFLASH_FS
-
config ESP32S3_BOX_LCD
bool "Enable ESP32-S3 LCD"
default n
diff --git a/boards/xtensa/esp32s3/esp32s3-devkit/Kconfig
b/boards/xtensa/esp32s3/esp32s3-devkit/Kconfig
index 59a4479022..fdbb0347c6 100644
--- a/boards/xtensa/esp32s3/esp32s3-devkit/Kconfig
+++ b/boards/xtensa/esp32s3/esp32s3-devkit/Kconfig
@@ -16,80 +16,4 @@ config ESP32S3_DEVKITC_1_V11
bool "ESP32-S3-DevKitC-1 v1.1"
endchoice
-config ESP32S3_STORAGE_MTD_OFFSET
- hex "Storage MTD base address in SPI Flash"
- default 0x180000 if !ESP32S3_HAVE_OTA_PARTITION
- default 0x250000 if ESP32S3_HAVE_OTA_PARTITION
- depends on ESP32S3_MTD
- ---help---
- MTD base address in SPI Flash.
-
-config ESP32S3_STORAGE_MTD_SIZE
- hex "Storage MTD size in SPI Flash"
- default 0x100000
- range 0x0 0x400000 if ESP32S3_FLASH_4M
- range 0x0 0x800000 if ESP32S3_FLASH_8M
- range 0x0 0x1000000 if ESP32S3_FLASH_16M
- range 0x0 0x2000000 if ESP32S3_FLASH_32M
- depends on ESP32S3_MTD
- ---help---
- MTD size in SPI Flash.
-
-choice ESP32S3_SPIFLASH_FS
- prompt "Mount SPI Flash MTD on bring-up"
- default ESP32S3_SPIFLASH_SMARTFS
- depends on ESP32S3_MTD
- optional
- ---help---
- Mount the SPI Flash MTD with the selected File System format on
board
- bring-up.
- If not selected, the MTD will be registered as a device node on
/dev.
-
-config ESP32S3_SPIFLASH_SMARTFS
- bool "SmartFS"
- select FS_SMARTFS
- select MTD_SMART
-
-config ESP32S3_SPIFLASH_NXFFS
- bool "NXFFS"
- select FS_NXFFS
-
-config ESP32S3_SPIFLASH_SPIFFS
- bool "SPIFFS"
- select FS_SPIFFS
-
-config ESP32S3_SPIFLASH_LITTLEFS
- bool "LittleFS"
- select FS_LITTLEFS
-
-endchoice # ESP32S3_SPIFLASH_FS
-
-if PM
-
-config PM_ALARM_SEC
- int "PM_STANDBY delay (seconds)"
- default 15
- ---help---
- Number of seconds to wait in PM_STANDBY before going to
PM_STANDBY mode.
-
-config PM_ALARM_NSEC
- int "PM_STANDBY delay (nanoseconds)"
- default 0
- ---help---
- Number of additional nanoseconds to wait in PM_STANDBY before
going to PM_STANDBY mode.
-
-config PM_SLEEP_WAKEUP_SEC
- int "PM_SLEEP delay (seconds)"
- default 20
- ---help---
- Number of seconds to wait in PM_SLEEP.
-
-config PM_SLEEP_WAKEUP_NSEC
- int "PM_SLEEP delay (nanoseconds)"
- default 0
- ---help---
- Number of additional nanoseconds to wait in PM_SLEEP.
-
-endif # PM
-
endif # ARCH_BOARD_ESP32S3_DEVKIT
diff --git a/boards/xtensa/esp32s3/esp32s3-eye/Kconfig
b/boards/xtensa/esp32s3/esp32s3-eye/Kconfig
index 175d4960b8..fbd7c0268a 100644
--- a/boards/xtensa/esp32s3/esp32s3-eye/Kconfig
+++ b/boards/xtensa/esp32s3/esp32s3-eye/Kconfig
@@ -5,53 +5,6 @@
if ARCH_BOARD_ESP32S3_EYE
-config ESP32S3_STORAGE_MTD_OFFSET
- hex "Storage MTD base address in SPI Flash"
- default 0x180000
- depends on ESP32S3_MTD
- ---help---
- MTD base address in SPI Flash.
-
-config ESP32S3_STORAGE_MTD_SIZE
- hex "Storage MTD size in SPI Flash"
- default 0x100000
- range 0x0 0x400000 if ESP32S3_FLASH_4M
- range 0x0 0x800000 if ESP32S3_FLASH_8M
- range 0x0 0x1000000 if ESP32S3_FLASH_16M
- range 0x0 0x2000000 if ESP32S3_FLASH_32M
- depends on ESP32S3_MTD
- ---help---
- MTD size in SPI Flash.
-
-choice ESP32S3_SPIFLASH_FS
- prompt "Mount SPI Flash MTD on bring-up"
- default ESP32S3_SPIFLASH_SMARTFS
- depends on ESP32S3_MTD
- optional
- ---help---
- Mount the SPI Flash MTD with the selected File System format on
board
- bring-up.
- If not selected, the MTD will be registered as a device node on
/dev.
-
-config ESP32S3_SPIFLASH_SMARTFS
- bool "SmartFS"
- select FS_SMARTFS
- select MTD_SMART
-
-config ESP32S3_SPIFLASH_NXFFS
- bool "NXFFS"
- select FS_NXFFS
-
-config ESP32S3_SPIFLASH_SPIFFS
- bool "SPIFFS"
- select FS_SPIFFS
-
-config ESP32S3_SPIFLASH_LITTLEFS
- bool "LittleFS"
- select FS_LITTLEFS
-
-endchoice
-
config ESP32S3_EYE_LCD
bool "Enable ESP32-S3 LCD"
default n
diff --git a/boards/xtensa/esp32s3/esp32s3-korvo-2/Kconfig
b/boards/xtensa/esp32s3/esp32s3-korvo-2/Kconfig
index db090e5bfc..fd4a8ca02c 100644
--- a/boards/xtensa/esp32s3/esp32s3-korvo-2/Kconfig
+++ b/boards/xtensa/esp32s3/esp32s3-korvo-2/Kconfig
@@ -5,56 +5,5 @@
if ARCH_BOARD_ESP32S3_KORVO_2
-config ESP32S3_STORAGE_MTD_OFFSET
- hex "Storage MTD base address in SPI Flash"
- default 0x180000 if !ESP32S3_HAVE_OTA_PARTITION
- default 0x250000 if ESP32S3_HAVE_OTA_PARTITION
- depends on ESP32S3_MTD
- ---help---
- MTD base address in SPI Flash.
-
-config ESP32S3_STORAGE_MTD_SIZE
- hex "Storage MTD size in SPI Flash"
- default 0x100000
- range 0x0 0x800000 if ESP32S3_FLASH_8M
- range 0x0 0x1000000 if ESP32S3_FLASH_16M
- depends on ESP32S3_MTD
- ---help---
- MTD size in SPI Flash.
-
-choice ESP32S3_SPIFLASH_FS
- prompt "Mount SPI Flash MTD on bring-up"
- default ESP32S3_SPIFLASH_SMARTFS
- depends on ESP32S3_MTD
- optional
- ---help---
- Mount the SPI Flash MTD with the selected File System format on
board
- bring-up.
- If not selected, the MTD will be registered as a device node on
/dev.
-
-config ESP32S3_SPIFLASH_SMARTFS
- bool "SmartFS"
- select FS_SMARTFS
- select MTD_SMART
-
-config ESP32S3_SPIFLASH_NXFFS
- bool "NXFFS"
- select FS_NXFFS
-
-config ESP32S3_SPIFLASH_SPIFFS
- bool "SPIFFS"
- select FS_SPIFFS
-
-config ESP32S3_SPIFLASH_LITTLEFS
- bool "LittleFS"
- select FS_LITTLEFS
-
-endchoice # ESP32S3_SPIFLASH_FS
-
-config ESP32S3_BOARD_I2C
- bool
- default y if ESP32S3_I2C0 || ESP32S3_I2C1
-
-
endif # ARCH_BOARD_ESP32S3_KORVO_2
diff --git a/boards/xtensa/esp32s3/esp32s3-lcd-ev/Kconfig
b/boards/xtensa/esp32s3/esp32s3-lcd-ev/Kconfig
index bcfaffaf9c..883ea7721a 100644
--- a/boards/xtensa/esp32s3/esp32s3-lcd-ev/Kconfig
+++ b/boards/xtensa/esp32s3/esp32s3-lcd-ev/Kconfig
@@ -5,58 +5,6 @@
if ARCH_BOARD_ESP32S3_LCD_EV
-config ESP32S3_STORAGE_MTD_OFFSET
- hex "Storage MTD base address in SPI Flash"
- default 0x180000 if !ESP32S3_HAVE_OTA_PARTITION
- default 0x250000 if ESP32S3_HAVE_OTA_PARTITION
- depends on ESP32S3_MTD
- ---help---
- MTD base address in SPI Flash.
-
-config ESP32S3_STORAGE_MTD_SIZE
- hex "Storage MTD size in SPI Flash"
- default 0x100000
- range 0x0 0x400000 if ESP32S3_FLASH_4M
- range 0x0 0x800000 if ESP32S3_FLASH_8M
- range 0x0 0x1000000 if ESP32S3_FLASH_16M
- range 0x0 0x2000000 if ESP32S3_FLASH_32M
- depends on ESP32S3_MTD
- ---help---
- MTD size in SPI Flash.
-
-choice ESP32S3_SPIFLASH_FS
- prompt "Mount SPI Flash MTD on bring-up"
- default ESP32S3_SPIFLASH_SMARTFS
- depends on ESP32S3_MTD
- optional
- ---help---
- Mount the SPI Flash MTD with the selected File System format on
board
- bring-up.
- If not selected, the MTD will be registered as a device node on
/dev.
-
-config ESP32S3_SPIFLASH_SMARTFS
- bool "SmartFS"
- select FS_SMARTFS
- select MTD_SMART
-
-config ESP32S3_SPIFLASH_NXFFS
- bool "NXFFS"
- select FS_NXFFS
-
-config ESP32S3_SPIFLASH_SPIFFS
- bool "SPIFFS"
- select FS_SPIFFS
-
-config ESP32S3_SPIFLASH_LITTLEFS
- bool "LittleFS"
- select FS_LITTLEFS
-
-endchoice # ESP32S3_SPIFLASH_FS
-
-config ESP32S3_BOARD_I2C
- bool
- default y if ESP32S3_I2C0 || ESP32S3_I2C1
-
config ESP32S3_BOARD_IOEXPANDER
bool "Enable Board IO Expander"
default n
diff --git a/boards/xtensa/esp32s3/esp32s3-lhcbit/Kconfig
b/boards/xtensa/esp32s3/esp32s3-lhcbit/Kconfig
index ce94283119..99c7ddb853 100644
--- a/boards/xtensa/esp32s3/esp32s3-lhcbit/Kconfig
+++ b/boards/xtensa/esp32s3/esp32s3-lhcbit/Kconfig
@@ -5,80 +5,4 @@
if ARCH_BOARD_ESP32S3_LHCBIT
-config ESP32S3_STORAGE_MTD_OFFSET
- hex "Storage MTD base address in SPI Flash"
- default 0x180000 if !ESP32S3_HAVE_OTA_PARTITION
- default 0x250000 if ESP32S3_HAVE_OTA_PARTITION
- depends on ESP32S3_MTD
- ---help---
- MTD base address in SPI Flash.
-
-config ESP32S3_STORAGE_MTD_SIZE
- hex "Storage MTD size in SPI Flash"
- default 0x100000
- range 0x0 0x400000 if ESP32S3_FLASH_4M
- range 0x0 0x800000 if ESP32S3_FLASH_8M
- range 0x0 0x1000000 if ESP32S3_FLASH_16M
- range 0x0 0x2000000 if ESP32S3_FLASH_32M
- depends on ESP32S3_MTD
- ---help---
- MTD size in SPI Flash.
-
-choice ESP32S3_SPIFLASH_FS
- prompt "Mount SPI Flash MTD on bring-up"
- default ESP32S3_SPIFLASH_SMARTFS
- depends on ESP32S3_MTD
- optional
- ---help---
- Mount the SPI Flash MTD with the selected File System format on
board
- bring-up.
- If not selected, the MTD will be registered as a device node on
/dev.
-
-config ESP32S3_SPIFLASH_SMARTFS
- bool "SmartFS"
- select FS_SMARTFS
- select MTD_SMART
-
-config ESP32S3_SPIFLASH_NXFFS
- bool "NXFFS"
- select FS_NXFFS
-
-config ESP32S3_SPIFLASH_SPIFFS
- bool "SPIFFS"
- select FS_SPIFFS
-
-config ESP32S3_SPIFLASH_LITTLEFS
- bool "LittleFS"
- select FS_LITTLEFS
-
-endchoice # ESP32S3_SPIFLASH_FS
-
-if PM
-
-config PM_ALARM_SEC
- int "PM_STANDBY delay (seconds)"
- default 15
- ---help---
- Number of seconds to wait in PM_STANDBY before going to
PM_STANDBY mode.
-
-config PM_ALARM_NSEC
- int "PM_STANDBY delay (nanoseconds)"
- default 0
- ---help---
- Number of additional nanoseconds to wait in PM_STANDBY before
going to PM_STANDBY mode.
-
-config PM_SLEEP_WAKEUP_SEC
- int "PM_SLEEP delay (seconds)"
- default 20
- ---help---
- Number of seconds to wait in PM_SLEEP.
-
-config PM_SLEEP_WAKEUP_NSEC
- int "PM_SLEEP delay (nanoseconds)"
- default 0
- ---help---
- Number of additional nanoseconds to wait in PM_SLEEP.
-
-endif # PM
-
endif # ARCH_BOARD_ESP32S3_LHCBIT
diff --git a/boards/xtensa/esp32s3/esp32s3-meadow/Kconfig
b/boards/xtensa/esp32s3/esp32s3-meadow/Kconfig
index f4c4c26ade..3bb38d18dc 100644
--- a/boards/xtensa/esp32s3/esp32s3-meadow/Kconfig
+++ b/boards/xtensa/esp32s3/esp32s3-meadow/Kconfig
@@ -5,51 +5,4 @@
if ARCH_BOARD_ESP32S3_MEADOW
-config ESP32S3_STORAGE_MTD_OFFSET
- hex "Storage MTD base address in SPI Flash"
- default 0x180000
- depends on ESP32S3_MTD
- ---help---
- MTD base address in SPI Flash.
-
-config ESP32S3_STORAGE_MTD_SIZE
- hex "Storage MTD size in SPI Flash"
- default 0x100000
- range 0x0 0x400000 if ESP32S3_FLASH_4M
- range 0x0 0x800000 if ESP32S3_FLASH_8M
- range 0x0 0x1000000 if ESP32S3_FLASH_16M
- range 0x0 0x2000000 if ESP32S3_FLASH_32M
- depends on ESP32S3_MTD
- ---help---
- MTD size in SPI Flash.
-
-choice ESP32S3_SPIFLASH_FS
- prompt "Mount SPI Flash MTD on bring-up"
- default ESP32S3_SPIFLASH_SMARTFS
- depends on ESP32S3_MTD
- optional
- ---help---
- Mount the SPI Flash MTD with the selected File System format on
board
- bring-up.
- If not selected, the MTD will be registered as a device node on
/dev.
-
-config ESP32S3_SPIFLASH_SMARTFS
- bool "SmartFS"
- select FS_SMARTFS
- select MTD_SMART
-
-config ESP32S3_SPIFLASH_NXFFS
- bool "NXFFS"
- select FS_NXFFS
-
-config ESP32S3_SPIFLASH_SPIFFS
- bool "SPIFFS"
- select FS_SPIFFS
-
-config ESP32S3_SPIFLASH_LITTLEFS
- bool "LittleFS"
- select FS_LITTLEFS
-
-endchoice
-
endif # ARCH_BOARD_ESP32S3_MEADOW
