Skip to content

Respect per-project custom partition table configuration #1

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

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Respect per-project custom partition table configuration #1

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
28 changes: 12 additions & 16 deletions builder/frameworks/esp8266-rtos-sdk.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -467,7 +467,7 @@ def _scan_components_from_framework():
return components or _scan_components_from_framework()



def extract_linker_script_fragments(framework_components_dir, sdk_config):
# Hardware-specific components are excluded from search and added manually below
project_components = load_component_paths(
Expand Down Expand Up @@ -919,7 +919,7 @@ def generate_empty_partition_image(binary_path, image_size):
env.Depends("$BUILD_DIR/$PROGNAME$PROGSUFFIX", empty_partition)


def get_partition_info(pt_path, pt_offset, pt_params):
def get_partition_info(pt_path, pt_params):
if not os.path.isfile(pt_path):
sys.stderr.write(
"Missing partition table file `%s`\n" % os.path.basename(pt_path)
Expand All @@ -930,8 +930,6 @@ def get_partition_info(pt_path, pt_offset, pt_params):
env.subst("$PYTHONEXE"),
os.path.join(FRAMEWORK_DIR, "components", "partition_table", "parttool.py"),
"-q",
"--partition-table-offset",
hex(pt_offset),
"--partition-table-file",
pt_path,
"get_partition_info",
Expand All @@ -940,8 +938,13 @@ def get_partition_info(pt_path, pt_offset, pt_params):
"offset",
]

if pt_params["name"] == "boot":
cmd.append("--partition-boot-default")
if pt_params["name"]:
if pt_params["name"] == "*boot":
cmd.append("--partition-boot-default")
else:
cmd.extend([
"--partition-name", pt_params["name"]
])
else:
cmd.extend(
[
Expand All @@ -955,8 +958,8 @@ def get_partition_info(pt_path, pt_offset, pt_params):
result = exec_command(cmd)
if result["returncode"] != 0:
sys.stderr.write(
"Couldn't extract information for %s/%s from the partition table\n"
% (pt_params["type"], pt_params["subtype"])
"Couldn't extract information for {%s} from %s\n"
% (pt_params, pt_path)
)
sys.stderr.write(result["out"] + "\n")
sys.stderr.write(result["err"] + "\n")
Expand All @@ -969,12 +972,6 @@ def get_partition_info(pt_path, pt_offset, pt_params):
return {"size": size, "offset": offset}


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")


def install_python_deps():
def _get_installed_pip_packages():
result = {}
Expand Down Expand Up @@ -1276,7 +1273,7 @@ def _skip_prj_source_files(node):
env.Depends("$BUILD_DIR/$PROGNAME$PROGSUFFIX", partition_table)

# linker needs APP_OFFSE and APP_SIZE
app_params = get_partition_info(env.subst("$PARTITIONS_TABLE_CSV"), partition_table_offset, {"name": "boot"})
app_params = get_partition_info(env.subst("$PARTITIONS_TABLE_CSV"), {"name": "*boot"})
app_offset = app_params.get("offset")
app_size = app_params.get("size")
env.Replace(
Expand Down Expand Up @@ -1346,7 +1343,6 @@ def _skip_prj_source_files(node):

ota_partition_params = get_partition_info(
env.subst("$PARTITIONS_TABLE_CSV"),
partition_table_offset,
{"name": "ota", "type": "data", "subtype": "ota"},
)

Expand Down