mirror of
https://github.com/espressif/esp-idf.git
synced 2026-04-27 19:13:21 +00:00
Merge branch 'fix/mmu-page-size-always-pass' into 'master'
change(esptool_py): always pass --flash-mmu-page-size to elf2image Closes IDF-12220 See merge request espressif/esp-idf!47002
This commit is contained in:
@@ -427,12 +427,7 @@ function(__esptool_py_setup_esptool_py_args)
|
|||||||
|
|
||||||
if(NOT BOOTLOADER_BUILD)
|
if(NOT BOOTLOADER_BUILD)
|
||||||
list(APPEND esptool_elf2image_args --elf-sha256-offset 0xb0)
|
list(APPEND esptool_elf2image_args --elf-sha256-offset 0xb0)
|
||||||
# For chips that support configurable MMU page size feature
|
list(APPEND esptool_elf2image_args --flash-mmu-page-size ${MMU_PAGE_SIZE})
|
||||||
# If page size is configured to values other than the default "64KB" in menuconfig,
|
|
||||||
# then we need to pass the actual size to flash-mmu-page-size arg
|
|
||||||
if(NOT MMU_PAGE_SIZE STREQUAL "64KB")
|
|
||||||
list(APPEND esptool_elf2image_args --flash-mmu-page-size ${MMU_PAGE_SIZE})
|
|
||||||
endif()
|
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(NOT CONFIG_SECURE_BOOT_ALLOW_SHORT_APP_PARTITION AND NOT BOOTLOADER_BUILD)
|
if(NOT CONFIG_SECURE_BOOT_ALLOW_SHORT_APP_PARTITION AND NOT BOOTLOADER_BUILD)
|
||||||
|
|||||||
Reference in New Issue
Block a user