mirror of
				https://github.com/espressif/esp-idf.git
				synced 2025-11-04 06:11:06 +00:00 
			
		
		
		
	Fixes the issue that signed partition table was not generated when
CONFIG_SECURE_BOOT_BUILD_SIGNED_BINARIES was on, because
partition_table_bin depended on unsigned_partition_bin twice.
Regression from acb7a211.
Also use final_partition_bin variable in esptool_py_flash_target_image
arguments, to avoid issues in the future if final_partition_bin is
changed.
		
	
		
			
				
	
	
		
			107 lines
		
	
	
		
			4.7 KiB
		
	
	
	
		
			CMake
		
	
	
	
	
	
			
		
		
	
	
			107 lines
		
	
	
		
			4.7 KiB
		
	
	
	
		
			CMake
		
	
	
	
	
	
idf_component_register()
 | 
						|
 | 
						|
if(BOOTLOADER_BUILD)
 | 
						|
    return()
 | 
						|
endif()
 | 
						|
 | 
						|
set(partition_csv "${PARTITION_CSV_PATH}")
 | 
						|
 | 
						|
if(CONFIG_SECURE_BOOT_BUILD_SIGNED_BINARIES AND CONFIG_SECURE_SIGNED_APPS_ECDSA_SCHEME)
 | 
						|
    set(unsigned_partition_bin "partition-table-unsigned.bin")
 | 
						|
    set(final_partition_bin "partition-table.bin")
 | 
						|
    set(final_partition_target "sign_partition_table")
 | 
						|
else()
 | 
						|
    set(unsigned_partition_bin "partition-table.bin")
 | 
						|
    set(final_partition_bin "partition-table.bin")
 | 
						|
    set(final_partition_target "build_partition_table")
 | 
						|
endif()
 | 
						|
 | 
						|
if(NOT CONFIG_PARTITION_TABLE_MD5)
 | 
						|
    set(md5_opt --disable-md5sum)
 | 
						|
endif()
 | 
						|
 | 
						|
if(CONFIG_ESPTOOLPY_FLASHSIZE)
 | 
						|
    set(flashsize_opt --flash-size ${CONFIG_ESPTOOLPY_FLASHSIZE})
 | 
						|
endif()
 | 
						|
 | 
						|
if(CONFIG_SECURE_BOOT AND NOT CONFIG_SECURE_BOOT_ALLOW_SHORT_APP_PARTITION)
 | 
						|
    set(partition_secure_opt --secure)
 | 
						|
else()
 | 
						|
    set(partition_secure_opt "")
 | 
						|
endif()
 | 
						|
 | 
						|
idf_build_get_property(build_dir BUILD_DIR)
 | 
						|
idf_build_get_property(python PYTHON)
 | 
						|
 | 
						|
set(gen_partition_table "${python}" "${CMAKE_CURRENT_SOURCE_DIR}/gen_esp32part.py" "-q"
 | 
						|
                        "--offset" "${PARTITION_TABLE_OFFSET}" "${md5_opt}" "${flashsize_opt}"
 | 
						|
                        "${partition_secure_opt}" )
 | 
						|
 | 
						|
set(partition_table_display
 | 
						|
    COMMAND ${CMAKE_COMMAND} -E echo "Partition table binary generated. Contents:"
 | 
						|
    COMMAND ${CMAKE_COMMAND} -E echo "*******************************************************************************"
 | 
						|
    COMMAND ${gen_partition_table} "${build_dir}/partition_table/${unsigned_partition_bin}"
 | 
						|
    COMMAND ${CMAKE_COMMAND} -E echo "*******************************************************************************"
 | 
						|
)
 | 
						|
 | 
						|
add_custom_command(OUTPUT "${build_dir}/partition_table/${unsigned_partition_bin}"
 | 
						|
    COMMAND ${gen_partition_table} "${partition_csv}" "${build_dir}/partition_table/${unsigned_partition_bin}"
 | 
						|
    ${partition_table_display}
 | 
						|
    DEPENDS ${partition_csv} "${CMAKE_CURRENT_SOURCE_DIR}/gen_esp32part.py"
 | 
						|
    VERBATIM)
 | 
						|
 | 
						|
add_custom_target(partition_table_bin DEPENDS "${build_dir}/partition_table/${unsigned_partition_bin}"
 | 
						|
                                              "${build_dir}/partition_table/${final_partition_bin}")
 | 
						|
 | 
						|
if(EXISTS ${partition_csv})
 | 
						|
    add_custom_target(partition_table
 | 
						|
                        DEPENDS partition_table_bin
 | 
						|
                        ${partition_table_display}
 | 
						|
                        VERBATIM)
 | 
						|
else()
 | 
						|
    # If the partition input CSV is not found, create a phony partition_table target that
 | 
						|
    # fails the build. fail_at_build_time also touches CMakeCache.txt to cause a cmake run next time
 | 
						|
    # (to pick up a new CSV if one exists, etc.)
 | 
						|
    fail_at_build_time(partition_table
 | 
						|
        "Partition table CSV ${partition_csv} does not exist."
 | 
						|
        "Either change partition table in menuconfig or create this input file.")
 | 
						|
endif()
 | 
						|
 | 
						|
# Add signing steps
 | 
						|
if(CONFIG_SECURE_SIGNED_APPS_ECDSA_SCHEME)
 | 
						|
    if(CONFIG_SECURE_BOOT_BUILD_SIGNED_BINARIES)
 | 
						|
        add_custom_target(gen_unsigned_partition_bin ALL DEPENDS
 | 
						|
                        "${build_dir}/partition_table/${unsigned_partition_bin}")
 | 
						|
 | 
						|
        add_custom_command(OUTPUT "${build_dir}/partition_table/${final_partition_bin}"
 | 
						|
            COMMAND ${ESPSECUREPY} sign_data --version 1 --keyfile "${SECURE_BOOT_SIGNING_KEY}"
 | 
						|
            -o "${build_dir}/partition_table/${final_partition_bin}"
 | 
						|
            "${build_dir}/partition_table/${unsigned_partition_bin}"
 | 
						|
            DEPENDS "${build_dir}/partition_table/${unsigned_partition_bin}"
 | 
						|
            VERBATIM)
 | 
						|
    else()
 | 
						|
        string(REPLACE ";" " " espsecurepy "${ESPSECUREPY}")
 | 
						|
        add_custom_command(TARGET partition_table POST_BUILD
 | 
						|
            COMMAND ${CMAKE_COMMAND} -E echo
 | 
						|
                "Partition table built but not signed. Sign partition data before flashing:"
 | 
						|
            COMMAND ${CMAKE_COMMAND} -E echo
 | 
						|
                "\t${espsecurepy} sign_data --keyfile KEYFILE ${build_dir}/partition_table/${final_partition_bin}"
 | 
						|
            VERBATIM)
 | 
						|
    endif()
 | 
						|
elseif(CONFIG_SECURE_SIGNED_APPS_RSA_SCHEME)
 | 
						|
    add_custom_command(TARGET partition_table POST_BUILD
 | 
						|
    COMMAND ${CMAKE_COMMAND} -E echo "Partition table built:"
 | 
						|
    VERBATIM)
 | 
						|
endif()
 | 
						|
 | 
						|
idf_component_get_property(main_args esptool_py FLASH_ARGS)
 | 
						|
idf_component_get_property(sub_args esptool_py FLASH_SUB_ARGS)
 | 
						|
 | 
						|
if(CONFIG_APP_BUILD_GENERATE_BINARIES)
 | 
						|
    esptool_py_flash_target(partition_table-flash "${main_args}" "${sub_args}")
 | 
						|
    esptool_py_flash_target_image(partition_table-flash partition_table "${PARTITION_TABLE_OFFSET}"
 | 
						|
                                        "${build_dir}/partition_table/${final_partition_bin}")
 | 
						|
    esptool_py_flash_target_image(flash partition_table "${PARTITION_TABLE_OFFSET}"
 | 
						|
                                        "${build_dir}/partition_table/${final_partition_bin}")
 | 
						|
endif()
 |