You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by xi...@apache.org on 2024/05/09 17:44:08 UTC
(nuttx) branch master updated (c4017a4b22 -> 0ed714bba4)
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
from c4017a4b22 cmake/romfs: separate c flags to avoid compile fail
new bc4a020146 Revert "esp32s3: give ESP32S3_APP_FORMAT_LEGACY a prompt"
new 8dca62f8f9 esp32s3: Limit MTD partition size according to the flash size
new 1b5b9845f4 esp32s3-devkit/toywasm: use ARCH_CHIP_ESP32S3WROOM2_32M
new 0ed714bba4 esp32s3/adc: Update the bootloader configuration for ESP32-S3
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
arch/xtensa/src/esp32s3/Kconfig | 2 +-
boards/xtensa/esp32s3/esp32s3-box/Kconfig | 4 ++++
boards/xtensa/esp32s3/esp32s3-devkit/Kconfig | 4 ++++
boards/xtensa/esp32s3/esp32s3-devkit/configs/adc/defconfig | 1 -
boards/xtensa/esp32s3/esp32s3-devkit/configs/toywasm/defconfig | 3 +--
boards/xtensa/esp32s3/esp32s3-eye/Kconfig | 4 ++++
boards/xtensa/esp32s3/esp32s3-lcd-ev/Kconfig | 4 ++++
boards/xtensa/esp32s3/esp32s3-meadow/Kconfig | 4 ++++
8 files changed, 22 insertions(+), 4 deletions(-)
(nuttx) 02/04: esp32s3: Limit MTD partition size according to the flash size
Posted by xi...@apache.org.
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/nuttx.git
commit 8dca62f8f974a137263f3df64b1b96e9ad1f227d
Author: Tiago Medicci Serrano <ti...@espressif.com>
AuthorDate: Mon May 6 09:54:51 2024 -0300
esp32s3: Limit MTD partition size according to the flash size
Whenever a MTD partition is set, this change limits its size
according to the flash size, avoiding the MTD partition to be
greater than the actual flash size.
---
boards/xtensa/esp32s3/esp32s3-box/Kconfig | 4 ++++
boards/xtensa/esp32s3/esp32s3-devkit/Kconfig | 4 ++++
boards/xtensa/esp32s3/esp32s3-eye/Kconfig | 4 ++++
boards/xtensa/esp32s3/esp32s3-lcd-ev/Kconfig | 4 ++++
boards/xtensa/esp32s3/esp32s3-meadow/Kconfig | 4 ++++
5 files changed, 20 insertions(+)
diff --git a/boards/xtensa/esp32s3/esp32s3-box/Kconfig b/boards/xtensa/esp32s3/esp32s3-box/Kconfig
index 9d021c1718..b47e2effcc 100644
--- a/boards/xtensa/esp32s3/esp32s3-box/Kconfig
+++ b/boards/xtensa/esp32s3/esp32s3-box/Kconfig
@@ -27,6 +27,10 @@ config ESP32S3_STORAGE_MTD_OFFSET
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.
diff --git a/boards/xtensa/esp32s3/esp32s3-devkit/Kconfig b/boards/xtensa/esp32s3/esp32s3-devkit/Kconfig
index a16b296840..b468f0fa5a 100644
--- a/boards/xtensa/esp32s3/esp32s3-devkit/Kconfig
+++ b/boards/xtensa/esp32s3/esp32s3-devkit/Kconfig
@@ -27,6 +27,10 @@ config ESP32S3_STORAGE_MTD_OFFSET
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.
diff --git a/boards/xtensa/esp32s3/esp32s3-eye/Kconfig b/boards/xtensa/esp32s3/esp32s3-eye/Kconfig
index 51df4a13d5..175d4960b8 100644
--- a/boards/xtensa/esp32s3/esp32s3-eye/Kconfig
+++ b/boards/xtensa/esp32s3/esp32s3-eye/Kconfig
@@ -15,6 +15,10 @@ config ESP32S3_STORAGE_MTD_OFFSET
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.
diff --git a/boards/xtensa/esp32s3/esp32s3-lcd-ev/Kconfig b/boards/xtensa/esp32s3/esp32s3-lcd-ev/Kconfig
index 3d26b68551..bcfaffaf9c 100644
--- a/boards/xtensa/esp32s3/esp32s3-lcd-ev/Kconfig
+++ b/boards/xtensa/esp32s3/esp32s3-lcd-ev/Kconfig
@@ -16,6 +16,10 @@ config ESP32S3_STORAGE_MTD_OFFSET
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.
diff --git a/boards/xtensa/esp32s3/esp32s3-meadow/Kconfig b/boards/xtensa/esp32s3/esp32s3-meadow/Kconfig
index 3d5cc808aa..f4c4c26ade 100644
--- a/boards/xtensa/esp32s3/esp32s3-meadow/Kconfig
+++ b/boards/xtensa/esp32s3/esp32s3-meadow/Kconfig
@@ -15,6 +15,10 @@ config ESP32S3_STORAGE_MTD_OFFSET
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.
(nuttx) 01/04: Revert "esp32s3: give ESP32S3_APP_FORMAT_LEGACY a prompt"
Posted by xi...@apache.org.
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/nuttx.git
commit bc4a020146afb697d50f81db1187ba2e654ab51f
Author: Tiago Medicci Serrano <ti...@espressif.com>
AuthorDate: Mon May 6 09:57:21 2024 -0300
Revert "esp32s3: give ESP32S3_APP_FORMAT_LEGACY a prompt"
This reverts commit 2295fa818dd077a1e383b6a2360311d1d6e30acb.
---
arch/xtensa/src/esp32s3/Kconfig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/xtensa/src/esp32s3/Kconfig b/arch/xtensa/src/esp32s3/Kconfig
index 5c1a11d863..96b8ce78a8 100644
--- a/arch/xtensa/src/esp32s3/Kconfig
+++ b/arch/xtensa/src/esp32s3/Kconfig
@@ -2276,7 +2276,7 @@ config ESP32S3_APP_FORMAT_MCUBOOT
Enables the Espressif port of MCUboot to be used as 2nd stage bootloader.
config ESP32S3_APP_FORMAT_LEGACY
- bool "Enable legacy boot format"
+ bool
default y if BUILD_PROTECTED
---help---
This is the legacy application image format, as supported by the ESP-IDF
(nuttx) 03/04: esp32s3-devkit/toywasm: use ARCH_CHIP_ESP32S3WROOM2_32M
Posted by xi...@apache.org.
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/nuttx.git
commit 1b5b9845f4bbb0b8272bbfb75d4dcb93218ed3bd
Author: YAMAMOTO Takashi <ya...@midokura.com>
AuthorDate: Tue May 7 17:52:35 2024 +0900
esp32s3-devkit/toywasm: use ARCH_CHIP_ESP32S3WROOM2_32M
As documented in [1], this config is for a board with 32MB flash.
[1] Documentation/platforms/xtensa/esp32s3/boards/esp32s3-devkit/index.rst
---
boards/xtensa/esp32s3/esp32s3-devkit/configs/toywasm/defconfig | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/boards/xtensa/esp32s3/esp32s3-devkit/configs/toywasm/defconfig b/boards/xtensa/esp32s3/esp32s3-devkit/configs/toywasm/defconfig
index c456b6fe66..7c467ccac6 100644
--- a/boards/xtensa/esp32s3/esp32s3-devkit/configs/toywasm/defconfig
+++ b/boards/xtensa/esp32s3/esp32s3-devkit/configs/toywasm/defconfig
@@ -15,7 +15,7 @@ CONFIG_ARCH_BOARD_COMMON=y
CONFIG_ARCH_BOARD_ESP32S3_DEVKIT=y
CONFIG_ARCH_CHIP="esp32s3"
CONFIG_ARCH_CHIP_ESP32S3=y
-CONFIG_ARCH_CHIP_ESP32S3WROOM2=y
+CONFIG_ARCH_CHIP_ESP32S3WROOM2_32M=y
CONFIG_ARCH_INTERRUPTSTACK=2048
CONFIG_ARCH_STACKDUMP=y
CONFIG_ARCH_XTENSA=y
@@ -28,7 +28,6 @@ CONFIG_ESP32S3_RT_TIMER_TASK_STACK_SIZE=4096
CONFIG_ESP32S3_SPIFLASH=y
CONFIG_ESP32S3_SPIRAM=y
CONFIG_ESP32S3_SPIRAM_MODE_OCT=y
-CONFIG_ESP32S3_SPI_FLASH_USE_32BIT_ADDRESS=y
CONFIG_ESP32S3_STORAGE_MTD_SIZE=0x1e80000
CONFIG_ESP32S3_UART0=y
CONFIG_ESP32S3_WIFI=y
(nuttx) 04/04: esp32s3/adc: Update the bootloader configuration for ESP32-S3
Posted by xi...@apache.org.
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/nuttx.git
commit 0ed714bba4280f98f35cb0df1f9d668099604f97
Author: Tiago Medicci Serrano <ti...@espressif.com>
AuthorDate: Thu May 9 07:54:28 2024 -0300
esp32s3/adc: Update the bootloader configuration for ESP32-S3
Avoid using the legacy bootloader in case it isn't required. Use
the simple boot instead.
---
boards/xtensa/esp32s3/esp32s3-devkit/configs/adc/defconfig | 1 -
1 file changed, 1 deletion(-)
diff --git a/boards/xtensa/esp32s3/esp32s3-devkit/configs/adc/defconfig b/boards/xtensa/esp32s3/esp32s3-devkit/configs/adc/defconfig
index 178c899592..388a7fc6a5 100644
--- a/boards/xtensa/esp32s3/esp32s3-devkit/configs/adc/defconfig
+++ b/boards/xtensa/esp32s3/esp32s3-devkit/configs/adc/defconfig
@@ -26,7 +26,6 @@ CONFIG_ESP32S3_ADC1_CHANNEL0=y
CONFIG_ESP32S3_ADC1_CHANNEL1=y
CONFIG_ESP32S3_ADC1_CHANNEL2=y
CONFIG_ESP32S3_ADC=y
-CONFIG_ESP32S3_APP_FORMAT_LEGACY=y
CONFIG_ESP32S3_UART0=y
CONFIG_EXAMPLES_ADC=y
CONFIG_EXAMPLES_ADC_SWTRIG=y