Crash_Override/OVMS3-idf
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

partition_table,app_update: use config partition table offset

Browse source
This commit is contained in:
Renz Christian Bagaporo 2019-06-04 15:49:55 +08:00
parent 7f7a9272f0
commit 3836aa9ae6
3 changed files with 19 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
components/app_update/CMakeLists.txt
View file

@ -42,10 +42,16 @@ if(NOT BOOTLOADER_BUILD)
set(otatool_py ${python} ${COMPONENT_DIR}/otatool.py)
add_custom_target(read_otadata DEPENDS "${PARTITION_CSV_PATH}"
COMMAND ${otatool_py} --partition-table-file ${PARTITION_CSV_PATH} read_otadata)
COMMAND ${otatool_py}
--partition-table-file ${PARTITION_CSV_PATH}
--partition-table-offset ${PARTITION_TABLE_OFFSET}
read_otadata)
add_custom_target(erase_otadata DEPENDS "${PARTITION_CSV_PATH}"
COMMAND ${otatool_py} --partition-table-file ${PARTITION_CSV_PATH} erase_otadata)
COMMAND ${otatool_py}
--partition-table-file ${PARTITION_CSV_PATH}
--partition-table-offset ${PARTITION_TABLE_OFFSET}
erase_otadata)
esptool_py_flash_project_args(otadata ${otadata_offset} "${blank_otadata_file}" FLASH_IN_PROJECT)
endif()

8
components/app_update/Makefile.projbuild
View file

@ -29,10 +29,14 @@ blank_ota_data: $(BLANK_OTA_DATA_FILE)
ESPTOOL_ALL_FLASH_ARGS += $(OTA_DATA_OFFSET) $(BLANK_OTA_DATA_FILE)
erase_otadata: $(PARTITION_TABLE_CSV_PATH) partition_table_get_info | check_python_dependencies
$(OTATOOL_PY) --partition-table-file $(PARTITION_TABLE_CSV_PATH) erase_otadata
$(OTATOOL_PY) --partition-table-file $(PARTITION_TABLE_CSV_PATH) \
--partition-table-offset $(PARTITION_TABLE_OFFSET) \
erase_otadata
read_otadata: $(PARTITION_TABLE_CSV_PATH) partition_table_get_info | check_python_dependencies
$(OTATOOL_PY) --partition-table-file $(PARTITION_TABLE_CSV_PATH) read_otadata
$(OTATOOL_PY) --partition-table-file $(PARTITION_TABLE_CSV_PATH) \
--partition-table-offset $(partition_table_offset) \
read_otadata
erase_ota: erase_otadata
@echo "WARNING: erase_ota is deprecated. Use erase_otadata instead."

5
components/partition_table/Makefile.projbuild
View file

@ -64,14 +64,19 @@ all_binaries: $(PARTITION_TABLE_BIN) partition_table_get_info check_table_conten
partition_table_get_info: $(PARTITION_TABLE_BIN)
$(eval PHY_DATA_OFFSET:=$(shell $(GET_PART_INFO) --partition-table-file $(PARTITION_TABLE_BIN) \
--partition-table-offset $(PARTITION_TABLE_OFFSET) \
get_partition_info --partition-type data --partition-subtype phy --info offset))
$(eval APP_OFFSET:=$(shell $(GET_PART_INFO) --partition-table-file $(PARTITION_TABLE_BIN) \
--partition-table-offset $(PARTITION_TABLE_OFFSET) \
get_partition_info --partition-boot-default --info offset))
$(eval OTA_DATA_OFFSET:=$(shell $(GET_PART_INFO) --partition-table-file $(PARTITION_TABLE_BIN) \
--partition-table-offset $(PARTITION_TABLE_OFFSET) \
get_partition_info --partition-type data --partition-subtype ota --info offset))
$(eval OTA_DATA_SIZE:=$(shell $(GET_PART_INFO) --partition-table-file $(PARTITION_TABLE_BIN) \
--partition-table-offset $(PARTITION_TABLE_OFFSET) \
get_partition_info --partition-type data --partition-subtype ota --info size))
$(eval FACTORY_OFFSET:=$(shell $(GET_PART_INFO) --partition-table-file $(PARTITION_TABLE_BIN) \
--partition-table-offset $(PARTITION_TABLE_OFFSET) \
get_partition_info --partition-type app --partition-subtype factory --info offset))
export APP_OFFSET