This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch releases/10.2
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 25341e4622590281a218b6d6aeee964105e29574
Author: Gustavo Henrique Nihei <gustavo.ni...@espressif.com>
AuthorDate: Fri Oct 15 12:09:56 2021 -0300
xtensa/esp32: Provide SPI Flash parameters to MCUboot build
Also unify bootloader config creation to reduce duplication.
Signed-off-by: Gustavo Henrique Nihei <gustavo.ni...@espressif.com>
---
arch/xtensa/src/esp32/Bootloader.mk | 52 ++++++++++++++++++-------------------
1 file changed, 26 insertions(+), 26 deletions(-)
diff --git a/arch/xtensa/src/esp32/Bootloader.mk
b/arch/xtensa/src/esp32/Bootloader.mk
index 51db177..c264f89 100644
--- a/arch/xtensa/src/esp32/Bootloader.mk
+++ b/arch/xtensa/src/esp32/Bootloader.mk
@@ -26,17 +26,30 @@ BOOTLOADER_SRCDIR = $(CHIPDIR)/esp-nuttx-bootloader
BOOTLOADER_VERSION = main
BOOTLOADER_URL = https://github.com/espressif/esp-nuttx-bootloader
BOOTLOADER_OUTDIR = out
+BOOTLOADER_CONFIG = $(CHIPDIR)/bootloader.conf
$(BOOTLOADER_SRCDIR):
$(Q) git clone $(BOOTLOADER_URL) $(BOOTLOADER_SRCDIR) -b
$(BOOTLOADER_VERSION)
-ifeq ($(CONFIG_ESP32_APP_FORMAT_MCUBOOT),y)
-
-BOOTLOADER_CONFIG = $(CHIPDIR)/mcuboot.conf
-
$(BOOTLOADER_CONFIG): $(TOPDIR)/.config
$(Q) echo "Creating Bootloader configuration"
$(Q) {
\
+ [ "$(CONFIG_ESP32_FLASH_2M)" = "y" ] && echo
"CONFIG_ESPTOOLPY_FLASHSIZE_2MB=y"; \
+ [ "$(CONFIG_ESP32_FLASH_4M)" = "y" ] && echo
"CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y"; \
+ [ "$(CONFIG_ESP32_FLASH_8M)" = "y" ] && echo
"CONFIG_ESPTOOLPY_FLASHSIZE_8MB=y"; \
+ [ "$(CONFIG_ESP32_FLASH_16M)" = "y" ] && echo
"CONFIG_ESPTOOLPY_FLASHSIZE_16MB=y"; \
+ [ "$(CONFIG_ESP32_FLASH_MODE_DIO)" = "y" ] && echo
"CONFIG_ESPTOOLPY_FLASHMODE_DIO=y"; \
+ [ "$(CONFIG_ESP32_FLASH_MODE_DOUT)" = "y" ] && echo
"CONFIG_ESPTOOLPY_FLASHMODE_DOUT=y"; \
+ [ "$(CONFIG_ESP32_FLASH_MODE_QIO)" = "y" ] && echo
"CONFIG_ESPTOOLPY_FLASHMODE_QIO=y"; \
+ [ "$(CONFIG_ESP32_FLASH_MODE_QOUT)" = "y" ] && echo
"CONFIG_ESPTOOLPY_FLASHMODE_QOUT=y"; \
+ [ "$(CONFIG_ESP32_FLASH_FREQ_80M)" = "y" ] && echo
"CONFIG_ESPTOOLPY_FLASHFREQ_80M=y"; \
+ [ "$(CONFIG_ESP32_FLASH_FREQ_40M)" = "y" ] && echo
"CONFIG_ESPTOOLPY_FLASHFREQ_40M=y"; \
+ [ "$(CONFIG_ESP32_FLASH_FREQ_26M)" = "y" ] && echo
"CONFIG_ESPTOOLPY_FLASHFREQ_26M=y"; \
+ [ "$(CONFIG_ESP32_FLASH_FREQ_20M)" = "y" ] && echo
"CONFIG_ESPTOOLPY_FLASHFREQ_20M=y"; \
+ true;
\
+ } > $(BOOTLOADER_CONFIG)
+ifeq ($(CONFIG_ESP32_APP_FORMAT_MCUBOOT),y)
+ $(Q) {
\
echo "CONFIG_ESP_BOOTLOADER_SIZE=0xF000";
\
echo
"CONFIG_ESP_APPLICATION_PRIMARY_START_ADDRESS=$(CONFIG_ESP32_OTA_PRIMARY_SLOT_OFFSET)";
\
echo
"CONFIG_ESP_APPLICATION_SIZE=$(CONFIG_ESP32_OTA_SLOT_SIZE)";
\
@@ -44,7 +57,15 @@ $(BOOTLOADER_CONFIG): $(TOPDIR)/.config
echo "CONFIG_ESP_MCUBOOT_WDT_ENABLE=y";
\
echo
"CONFIG_ESP_SCRATCH_OFFSET=$(CONFIG_ESP32_OTA_SCRATCH_OFFSET)";
\
echo
"CONFIG_ESP_SCRATCH_SIZE=$(CONFIG_ESP32_OTA_SCRATCH_SIZE)";
\
- } > $(BOOTLOADER_CONFIG)
+ } >> $(BOOTLOADER_CONFIG)
+else ifeq ($(CONFIG_ESP32_APP_FORMAT_LEGACY),y)
+ $(Q) {
\
+ echo "CONFIG_PARTITION_TABLE_CUSTOM=y";
\
+ echo
"CONFIG_PARTITION_TABLE_CUSTOM_FILENAME=\"partitions.csv\"";
\
+ } >> $(BOOTLOADER_CONFIG)
+endif
+
+ifeq ($(CONFIG_ESP32_APP_FORMAT_MCUBOOT),y)
bootloader: $(BOOTLOADER_SRCDIR) $(BOOTLOADER_CONFIG)
$(Q) echo "Building Bootloader binaries"
@@ -58,27 +79,6 @@ clean_bootloader:
else ifeq ($(CONFIG_ESP32_APP_FORMAT_LEGACY),y)
-BOOTLOADER_CONFIG = $(CHIPDIR)/sdkconfig
-
-$(BOOTLOADER_CONFIG): $(TOPDIR)/.config
- $(Q) echo "Creating Bootloader configuration"
- $(Q) {
\
- [ "$(CONFIG_ESP32_FLASH_2M)" = "y" ] && echo
"CONFIG_ESPTOOLPY_FLASHSIZE_2MB=y"; \
- [ "$(CONFIG_ESP32_FLASH_4M)" = "y" ] && echo
"CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y"; \
- [ "$(CONFIG_ESP32_FLASH_8M)" = "y" ] && echo
"CONFIG_ESPTOOLPY_FLASHSIZE_8MB=y"; \
- [ "$(CONFIG_ESP32_FLASH_16M)" = "y" ] && echo
"CONFIG_ESPTOOLPY_FLASHSIZE_16MB=y"; \
- [ "$(CONFIG_ESP32_FLASH_MODE_DIO)" = "y" ] && echo
"CONFIG_ESPTOOLPY_FLASHMODE_DIO=y"; \
- [ "$(CONFIG_ESP32_FLASH_MODE_DOUT)" = "y" ] && echo
"CONFIG_ESPTOOLPY_FLASHMODE_DOUT=y"; \
- [ "$(CONFIG_ESP32_FLASH_MODE_QIO)" = "y" ] && echo
"CONFIG_ESPTOOLPY_FLASHMODE_QIO=y"; \
- [ "$(CONFIG_ESP32_FLASH_MODE_QOUT)" = "y" ] && echo
"CONFIG_ESPTOOLPY_FLASHMODE_QOUT=y"; \
- [ "$(CONFIG_ESP32_FLASH_FREQ_80M)" = "y" ] && echo
"CONFIG_ESPTOOLPY_FLASHFREQ_80M=y"; \
- [ "$(CONFIG_ESP32_FLASH_FREQ_40M)" = "y" ] && echo
"CONFIG_ESPTOOLPY_FLASHFREQ_40M=y"; \
- [ "$(CONFIG_ESP32_FLASH_FREQ_26M)" = "y" ] && echo
"CONFIG_ESPTOOLPY_FLASHFREQ_26M=y"; \
- [ "$(CONFIG_ESP32_FLASH_FREQ_20M)" = "y" ] && echo
"CONFIG_ESPTOOLPY_FLASHFREQ_20M=y"; \
- echo "CONFIG_PARTITION_TABLE_CUSTOM=y";
\
- echo
"CONFIG_PARTITION_TABLE_CUSTOM_FILENAME=\"partitions.csv\"";
\
- } > $(BOOTLOADER_CONFIG)
-
bootloader: $(BOOTLOADER_SRCDIR) $(BOOTLOADER_CONFIG)
$(Q) echo "Building Bootloader binaries"
$(Q) $(BOOTLOADER_SRCDIR)/build_idfboot.sh -c esp32 -s -f
$(BOOTLOADER_CONFIG)
