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

Merge branch 'bugfix/parttool_spaces' into 'master'

Browse source 
Remove trailing spaces from parttool.py output

See merge request idf/esp-idf!3317
This commit is contained in:
Ivan Grokhotkov 2018-09-20 11:58:40 +08:00
commit c09d4787ef
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
components/partition_table/Makefile.projbuild
View file

@ -65,8 +65,8 @@ all_binaries: $(PARTITION_TABLE_BIN) partition_table_get_info
partition_table_get_info: $(PARTITION_TABLE_BIN) partition_table_get_info: $(PARTITION_TABLE_BIN)
$(eval PHY_DATA_OFFSET:=$(shell $(GET_PART_INFO) --type data --subtype phy --offset $(PARTITION_TABLE_BIN))) $(eval PHY_DATA_OFFSET:=$(shell $(GET_PART_INFO) --type data --subtype phy --offset $(PARTITION_TABLE_BIN)))
$(eval APP_OFFSET:=$(shell $(GET_PART_INFO) --default-boot-partition --offset $(PARTITION_TABLE_BIN))) $(eval APP_OFFSET:=$(shell $(GET_PART_INFO) --default-boot-partition --offset $(PARTITION_TABLE_BIN)))
$(eval OTA_DATA_SIZE := $(shell $(GET_PART_INFO) --type data --subtype ota --size $(PARTITION_TABLE_BIN) || echo 0) ) $(eval OTA_DATA_SIZE := $(shell $(GET_PART_INFO) --type data --subtype ota --size $(PARTITION_TABLE_BIN) || echo 0))
$(eval OTA_DATA_OFFSET := $(shell $(GET_PART_INFO) --type data --subtype ota --offset $(PARTITION_TABLE_BIN)) ) $(eval OTA_DATA_OFFSET := $(shell $(GET_PART_INFO) --type data --subtype ota --offset $(PARTITION_TABLE_BIN)))
export APP_OFFSET export APP_OFFSET
export PHY_DATA_OFFSET export PHY_DATA_OFFSET

2
components/partition_table/parttool.py
View file

@ -107,7 +107,7 @@ def main():
return 1 # nothing found return 1 # nothing found
if args.offset: if args.offset:
print('0x%x ' % (found_partition.offset)) print('0x%x' % (found_partition.offset))
if args.size: if args.size:
print('0x%x' % (found_partition.size)) print('0x%x' % (found_partition.size))