Skip to content

fix function get_app_partition_offset() #252

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 8, 2025
Merged

fix function get_app_partition_offset() #252

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 12 additions & 30 deletions builder/frameworks/espidf.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1349,7 +1349,7 @@ def get_partition_info(pt_path, pt_offset, pt_params):
"offset",
]

if pt_params["name"] == "boot":
if pt_params.get("name") == "boot":
cmd.append("--partition-boot-default")
else:
cmd.extend(
Expand Down Expand Up @@ -1380,8 +1380,11 @@ def get_partition_info(pt_path, pt_offset, pt_params):

def get_app_partition_offset(pt_table, pt_offset):
# Get the default boot partition offset
app_params = get_partition_info(pt_table, pt_offset, {"name": "boot"})
return app_params.get("offset", "0x10000")
ota_app_params = get_partition_info(pt_table, pt_offset, {"type": "app", "subtype": "ota_0"})
if ota_app_params.get("offset"):
return ota_app_params["offset"]
factory_app_params = get_partition_info(pt_table, pt_offset, {"type": "app", "subtype": "factory"})
return factory_app_params.get("offset", "0x10000")


def preprocess_linker_file(src_ld_script, target_ld_script):
Expand Down Expand Up @@ -2234,33 +2237,12 @@ def _parse_size(value):
# Configure application partition offset
#

partitions_csv = env.subst("$PARTITIONS_TABLE_CSV")
result = []
next_offset = 0
bound = 0x10000
with open(partitions_csv) as fp:
for line in fp.readlines():
line = line.strip()
if not line or line.startswith("#"):
continue
tokens = [t.strip() for t in line.split(",")]
if len(tokens) < 5:
continue
partition = {
"name": tokens[0],
"type": tokens[1],
"subtype": tokens[2],
"offset": tokens[3] or next_offset,
"size": tokens[4],
"flags": tokens[5] if len(tokens) > 5 else None
}
result.append(partition)
next_offset = _parse_size(partition["offset"])
if (partition["subtype"] == "ota_0"):
bound = next_offset
next_offset = (next_offset + bound - 1) & ~(bound - 1)

env.Replace(ESP32_APP_OFFSET=str(hex(bound)))
app_offset = get_app_partition_offset(
env.subst("$PARTITIONS_TABLE_CSV"),
partition_table_offset
)

env.Replace(ESP32_APP_OFFSET=app_offset)

#
# Propagate application offset to debug configurations
Expand Down
Loading