From 4bed9d32b42228bf3a44f38bccbb9e1d9931b1ae Mon Sep 17 00:00:00 2001 From: wangjianyu3 Date: Sun, 17 May 2026 00:19:13 +0800 Subject: [PATCH] boards/esp32p4: Remove unnecessary CONFIG_ESPRESSIF_MERGE_BINS ESP32-P4 uses simple boot mode without a separate bootloader, so merging binaries into a single 16MB file is unnecessary. Removing this option allows 'make flash' to write only the actual firmware (~380KB) instead of a padded 16MB image, reducing flash time from ~55s to ~4.5s. Assisted-by: GitHubCopilot:claude-4.7-opus Signed-off-by: wangjianyu3 --- .../esp32p4/esp32p4-function-ev-board/configs/ethernet/defconfig | 1 - .../esp32p4/esp32p4-function-ev-board/configs/i2schar/defconfig | 1 - .../esp32p4/esp32p4-function-ev-board/configs/spislv/defconfig | 1 - 3 files changed, 3 deletions(-) diff --git a/boards/risc-v/esp32p4/esp32p4-function-ev-board/configs/ethernet/defconfig b/boards/risc-v/esp32p4/esp32p4-function-ev-board/configs/ethernet/defconfig index c9e1307c3b090..2ab3110ae92fc 100644 --- a/boards/risc-v/esp32p4/esp32p4-function-ev-board/configs/ethernet/defconfig +++ b/boards/risc-v/esp32p4/esp32p4-function-ev-board/configs/ethernet/defconfig @@ -24,7 +24,6 @@ CONFIG_BOARD_LOOPSPERMSEC=15000 CONFIG_BUILTIN=y CONFIG_ESPRESSIF_EMAC=y CONFIG_ESPRESSIF_ETH_DMA_BUFFER_SIZE=512 -CONFIG_ESPRESSIF_MERGE_BINS=y CONFIG_ESPRESSIF_SPIFLASH=y CONFIG_ESPRESSIF_SPIFLASH_SMARTFS=y CONFIG_ESPRESSIF_SPIRAM=y diff --git a/boards/risc-v/esp32p4/esp32p4-function-ev-board/configs/i2schar/defconfig b/boards/risc-v/esp32p4/esp32p4-function-ev-board/configs/i2schar/defconfig index c0e85bcdb69ec..8d80da2c5932b 100644 --- a/boards/risc-v/esp32p4/esp32p4-function-ev-board/configs/i2schar/defconfig +++ b/boards/risc-v/esp32p4/esp32p4-function-ev-board/configs/i2schar/defconfig @@ -30,7 +30,6 @@ CONFIG_ESPRESSIF_I2S0_DINPIN=10 CONFIG_ESPRESSIF_I2S0_DOUTPIN=10 CONFIG_ESPRESSIF_I2S0_MCLK=y CONFIG_ESPRESSIF_I2S0_MCLKPIN=21 -CONFIG_ESPRESSIF_MERGE_BINS=y CONFIG_EXAMPLES_I2SCHAR=y CONFIG_EXAMPLES_I2SCHAR_BUFSIZE=1024 CONFIG_EXAMPLES_I2SCHAR_RX=y diff --git a/boards/risc-v/esp32p4/esp32p4-function-ev-board/configs/spislv/defconfig b/boards/risc-v/esp32p4/esp32p4-function-ev-board/configs/spislv/defconfig index f27c7e8f9284d..b491523586dee 100644 --- a/boards/risc-v/esp32p4/esp32p4-function-ev-board/configs/spislv/defconfig +++ b/boards/risc-v/esp32p4/esp32p4-function-ev-board/configs/spislv/defconfig @@ -22,7 +22,6 @@ CONFIG_BOARDCTL_RESET=y CONFIG_BOARD_LOOPSPERMSEC=15000 CONFIG_BUILTIN=y CONFIG_ESPRESSIF_DMA=y -CONFIG_ESPRESSIF_MERGE_BINS=y CONFIG_ESPRESSIF_SPI2=y CONFIG_ESPRESSIF_SPI2_CSPIN=22 CONFIG_ESPRESSIF_SPI2_SLAVE=y