mirror
/
esp-idf
kopia lustrzana https://github.com/espressif/esp-idf
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Merge branch 'bugfix/restore_deleted_factory_offset' into 'master' 

partition_table: restore needed factory offset variable

See merge request idf/esp-idf!4601
pull/3236/head
Angus Gratton 2019-03-28 12:03:27 +08:00
rodzic f14d61966d 7e93d4986c
commit 1db51e18b9
1 zmienionych plików z 2 dodań i 1 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

3
components/partition_table/CMakeLists.txt
Wyświetl plik

@ -71,7 +71,8 @@ endif()
# If anti-rollback option is set then factory partition should not be in Partition Table. # If anti-rollback option is set then factory partition should not be in Partition Table.
# In this case, should be used the partition table with two ota app without the factory. # In this case, should be used the partition table with two ota app without the factory.
if(CONFIG_APP_ANTI_ROLLBACK AND FACTORY_OFFSET) partition_table_get_partition_info(factory_offset "--partition-type app --partition-subtype factory" "offset")
if(CONFIG_APP_ANTI_ROLLBACK AND factory_offset)
fail_at_build_time(check_table_contents fail_at_build_time(check_table_contents
"ERROR: Anti-rollback option is enabled. Partition table should consist of two ota app without factory partition.") "ERROR: Anti-rollback option is enabled. Partition table should consist of two ota app without factory partition.")
add_dependencies(bootloader check_table_contents) add_dependencies(bootloader check_table_contents)