sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

espressif: Remove outdated config about IDF bootloader

Browse Source 
For newer devices, IDF bootloader is not supported because the
devices are able to boot directly into NuttX or use MCUBoot to
enable OTA and security features.
This commit is contained in:
Tiago Medicci Serrano 2024-06-05 13:34:24 -03:00 committed by Xiang Xiao
parent 480ad6b631
commit 6c3eeb7d5c
3 changed files with 0 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
arch/risc-v/src/common/espressif/Bootloader.mk
View File

@ -35,11 +35,6 @@ MCUBOOT_SRCDIR = $(BOOTLOADER_SRCDIR)/mcuboot
MCUBOOT_ESPDIR = $(MCUBOOT_SRCDIR)/boot/espressif MCUBOOT_ESPDIR = $(MCUBOOT_SRCDIR)/boot/espressif
MCUBOOT_URL = https://github.com/mcu-tools/mcuboot MCUBOOT_URL = https://github.com/mcu-tools/mcuboot
# IDFboot
BLBIN_VERSION = latest
BLBIN_URL = https://github.com/espressif/esp-nuttx-bootloader/releases/download/$(BLBIN_VERSION)
# Helpers for creating the configuration file # Helpers for creating the configuration file
cfg_en = echo "$(1)=$(if $(CONFIG_ESPRESSIF_BOOTLOADER_MCUBOOT),1,y)"; cfg_en = echo "$(1)=$(if $(CONFIG_ESPRESSIF_BOOTLOADER_MCUBOOT),1,y)";
@ -78,12 +73,6 @@ ifeq ($(CONFIG_ESPRESSIF_BOOTLOADER_MCUBOOT),y)
$(if $(CONFIG_UART0_SERIAL_CONSOLE),$(call cfg_val,CONFIG_ESP_CONSOLE_UART_NUM,0)) \ $(if $(CONFIG_UART0_SERIAL_CONSOLE),$(call cfg_val,CONFIG_ESP_CONSOLE_UART_NUM,0)) \
$(if $(CONFIG_UART1_SERIAL_CONSOLE),$(call cfg_val,CONFIG_ESP_CONSOLE_UART_NUM,1)) \ $(if $(CONFIG_UART1_SERIAL_CONSOLE),$(call cfg_val,CONFIG_ESP_CONSOLE_UART_NUM,1)) \
} >> $(BOOTLOADER_CONFIG) } >> $(BOOTLOADER_CONFIG)
else
$(Q) { \
$(call cfg_en,CONFIG_PARTITION_TABLE_CUSTOM) \
$(call cfg_val,CONFIG_PARTITION_TABLE_CUSTOM_FILENAME,\"partitions.csv\") \
$(call cfg_val,CONFIG_PARTITION_TABLE_OFFSET,$(CONFIG_ESPRESSIF_PARTITION_TABLE_OFFSET)) \
} >> $(BOOTLOADER_CONFIG)
endif endif
ifeq ($(CONFIG_ESPRESSIF_SIMPLE_BOOT),y) ifeq ($(CONFIG_ESPRESSIF_SIMPLE_BOOT),y)
@ -114,17 +103,5 @@ bootloader: $(BOOTLOADER_CONFIG) $(BOOTLOADER_BIN)
clean_bootloader: clean_bootloader:
$(call DELDIR,$(BOOTLOADER_SRCDIR)) $(call DELDIR,$(BOOTLOADER_SRCDIR))
$(call DELFILE,$(BOOTLOADER_BIN)) $(call DELFILE,$(BOOTLOADER_BIN))
else
bootloader:
$(Q) echo "Downloading Bootloader binaries"
$(call DOWNLOAD,$(BLBIN_URL),bootloader-$(CHIP_SERIES).bin,$(TOPDIR)/bootloader-$(CHIP_SERIES).bin)
$(call DOWNLOAD,$(BLBIN_URL),partition-table-$(CHIP_SERIES).bin,$(TOPDIR)/partition-table-$(CHIP_SERIES).bin)
clean_bootloader:
$(call DELFILE,$(TOPDIR)/bootloader-$(CHIP_SERIES).bin)
$(call DELFILE,$(TOPDIR)/partition-table-$(CHIP_SERIES).bin)
endif endif
endif endif

5
arch/risc-v/src/common/espressif/Kconfig
View File

@ -200,11 +200,6 @@ config ESPRESSIF_APP_MCUBOOT_HEADER_SIZE
default 32 default 32
depends on ESPRESSIF_BOOTLOADER_MCUBOOT depends on ESPRESSIF_BOOTLOADER_MCUBOOT
config ESPRESSIF_PARTITION_TABLE_OFFSET
hex "Partition Table offset"
default 0x8000
depends on !ESPRESSIF_BOOTLOADER_MCUBOOT && !ESPRESSIF_SIMPLE_BOOT
config ESPRESSIF_HAVE_OTA_PARTITION config ESPRESSIF_HAVE_OTA_PARTITION
bool bool
default n default n

18
tools/espressif/Config.mk
View File

@ -72,16 +72,6 @@ ifdef ESPTOOL_BINDIR
BOOTLOADER := $(ESPTOOL_BINDIR)/mcuboot-$(CHIP_SERIES).bin BOOTLOADER := $(ESPTOOL_BINDIR)/mcuboot-$(CHIP_SERIES).bin
FLASH_BL := $(BL_OFFSET) $(BOOTLOADER) FLASH_BL := $(BL_OFFSET) $(BOOTLOADER)
ESPTOOL_BINS := $(FLASH_BL) ESPTOOL_BINS := $(FLASH_BL)
else ifeq ($(CONFIG_ESPRESSIF_SIMPLE_BOOT),y)
else
BL_OFFSET := 0x0
PT_OFFSET := $(CONFIG_ESPRESSIF_PARTITION_TABLE_OFFSET)
BOOTLOADER := $(ESPTOOL_BINDIR)/bootloader-$(CHIP_SERIES).bin
PARTITION_TABLE := $(ESPTOOL_BINDIR)/partition-table-$(CHIP_SERIES).bin
FLASH_BL := $(BL_OFFSET) $(BOOTLOADER)
FLASH_PT := $(PT_OFFSET) $(PARTITION_TABLE)
ESPTOOL_BINS := $(FLASH_BL) $(FLASH_PT)
endif endif
endif endif
@ -105,18 +95,10 @@ else ifeq ($(CONFIG_ESPRESSIF_SIMPLE_BOOT),y)
APP_IMAGE := nuttx.bin APP_IMAGE := nuttx.bin
FLASH_APP := $(APP_OFFSET) $(APP_IMAGE) FLASH_APP := $(APP_OFFSET) $(APP_IMAGE)
ESPTOOL_BINDIR := . ESPTOOL_BINDIR := .
else
APP_OFFSET := 0x10000
APP_IMAGE := nuttx.bin
FLASH_APP := $(APP_OFFSET) $(APP_IMAGE)
endif endif
ESPTOOL_BINS += $(FLASH_APP) ESPTOOL_BINS += $(FLASH_APP)
ifeq ($(CONFIG_BUILD_PROTECTED),y)
ESPTOOL_BINS += $(CONFIG_ESPRESSIF_USER_IMAGE_OFFSET) nuttx_user.bin
endif
# MERGEBIN -- Merge raw binary files into a single file # MERGEBIN -- Merge raw binary files into a single file
define MERGEBIN define MERGEBIN