Skip to content

Commit

Permalink
Merge branch 'release/v2.1.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
@valeros
valeros committed Dec 2, 2020
2 parents 86db0c0 + f32e3ec commit c266d51
Show file tree
Hide file tree
Showing 4 changed files with 172 additions and 19 deletions.
135 changes: 128 additions & 7 deletions builder/frameworks/espidf.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -499,7 +499,9 @@ def generate_project_ld_script(sdk_config, ignore_targets=None):
"env_file": os.path.join("$BUILD_DIR", "config.env"),
"libraries_list": libraries_list,
"objdump": os.path.join(
TOOLCHAIN_DIR, "bin", env.subst("$CC").replace("-gcc", "-objdump"),
TOOLCHAIN_DIR,
"bin",
env.subst("$CC").replace("-gcc", "-objdump"),
),
}

Expand Down Expand Up @@ -803,19 +805,90 @@ def find_default_component(target_configs):
return ""


def create_verion_file():
def create_version_file():
version_file = os.path.join(FRAMEWORK_DIR, "version.txt")
if not os.path.isfile(version_file):
with open(version_file, "w") as fp:
fp.write(platform.get_package_version("framework-espidf"))


#
def generate_empty_partition_image(binary_path, image_size):
empty_partition = env.Command(
binary_path,
None,
env.VerboseAction(
'"$PYTHONEXE" "%s" %s $TARGET'
% (
os.path.join(
FRAMEWORK_DIR,
"components",
"partition_table",
"gen_empty_partition.py",
),
image_size,
),
"Generating an empty partition $TARGET",
),
)

env.Depends("$BUILD_DIR/$PROGNAME$PROGSUFFIX", empty_partition)


def get_partition_info(pt_path, pt_offset, pt_params):
assert os.path.isfile(pt_path)
cmd = [
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",
"--info",
"size",
"offset",
]

if pt_params["name"] == "boot":
cmd.append("--partition-boot-default")
else:
cmd.extend(
[
"--partition-type",
pt_params["type"],
"--partition-subtype",
pt_params["subtype"],
]
)

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"])
)
sys.stderr.write(result["out"] + "\n")
sys.stderr.write(result["err"] + "\n")
env.Exit(1)

size = offset = 0
if result["out"].strip():
size, offset = result["out"].strip().split(" ", 1)

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


# ESP-IDF package doesn't contain .git folder, instead package version is specified
# in a special file "version.h" in the root folder of the package
#

create_verion_file()
create_version_file()

#
# Generate final linker script
Expand Down Expand Up @@ -845,6 +918,7 @@ def create_verion_file():

fwpartitions_dir = os.path.join(FRAMEWORK_DIR, "components", "partition_table")
partitions_csv = board.get("build.partitions", "partitions_singleapp.csv")

env.Replace(
PARTITIONS_TABLE_CSV=os.path.abspath(
os.path.join(fwpartitions_dir, partitions_csv)
Expand Down Expand Up @@ -913,6 +987,7 @@ def create_verion_file():
[
"-DIDF_TARGET=" + idf_variant,
"-DEXTRA_COMPONENT_DIRS:PATH=" + ";".join(extra_components),
"-DPYTHON=" + env.subst("$PYTHONEXE"),
]
+ click.parser.split_arg_string(board.get("build.cmake_extra_args", "")),
)
Expand Down Expand Up @@ -1057,6 +1132,7 @@ def _skip_prj_source_files(node):
)
)

partition_table_offset = sdk_config.get("PARTITION_TABLE_OFFSET", 0x8000)
project_flags.update(link_args)
env.MergeFlags(project_flags)
env.Prepend(
Expand All @@ -1065,8 +1141,14 @@ def _skip_prj_source_files(node):
LINKFLAGS=extra_flags,
LIBS=libs,
FLASH_EXTRA_IMAGES=[
("0x1000", os.path.join("$BUILD_DIR", "bootloader.bin")),
("0x8000", os.path.join("$BUILD_DIR", "partitions.bin")),
(
board.get("upload.bootloader_offset", "0x1000"),
os.path.join("$BUILD_DIR", "bootloader.bin"),
),
(
board.get("upload.partition_table_offset", hex(partition_table_offset)),
os.path.join("$BUILD_DIR", "partitions.bin"),
),
],
)

Expand All @@ -1087,3 +1169,42 @@ def _skip_prj_source_files(node):
ulp_dir = os.path.join(env.subst("$PROJECT_DIR"), "ulp")
if os.path.isdir(ulp_dir) and os.listdir(ulp_dir):
env.SConscript("ulp.py", exports="env project_config idf_variant")

#
# Process OTA partition and image
#

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

if ota_partition_params["size"] and ota_partition_params["offset"]:
# Generate an empty image if OTA is enabled in partition table
ota_partition_image = os.path.join("$BUILD_DIR", "ota_data_initial.bin")
generate_empty_partition_image(ota_partition_image, ota_partition_params["size"])

env.Append(
FLASH_EXTRA_IMAGES=[
(
board.get(
"upload.ota_partition_offset", ota_partition_params["offset"]
),
ota_partition_image,
)
]
)

#
# Configure application partition offset
#

env.Replace(
ESP32_APP_OFFSET=get_app_partition_offset(
env.subst("$PARTITIONS_TABLE_CSV"), partition_table_offset
)
)

# Propagate application offset to debug configurations
env["IDE_EXTRA_DATA"].update({"application_offset": env.subst("$ESP32_APP_OFFSET")})
9 changes: 5 additions & 4 deletions builder/main.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,7 @@ def __fetch_spiffs_size(target, source, env):
MKSPIFFSTOOL="mkspiffs_${PIOPLATFORM}_" + ("espidf" if "espidf" in env.subst(
"$PIOFRAMEWORK") else "${PIOFRAMEWORK}"),
ESP32_SPIFFS_IMAGE_NAME=env.get("ESP32_SPIFFS_IMAGE_NAME", "spiffs"),
ESP32_APP_OFFSET="0x10000",

PROGSUFFIX=".elf"
)
Expand Down Expand Up @@ -310,7 +311,7 @@ def __fetch_spiffs_size(target, source, env):
"--flash_freq", "${__get_board_f_flash(__env__)}",
"--flash_size", "detect"
],
UPLOADCMD='"$PYTHONEXE" "$UPLOADER" $UPLOADERFLAGS 0x10000 $SOURCE'
UPLOADCMD='"$PYTHONEXE" "$UPLOADER" $UPLOADERFLAGS $ESP32_APP_OFFSET $SOURCE'
)
for image in env.get("FLASH_EXTRA_IMAGES", []):
env.Append(UPLOADERFLAGS=[image[0], env.subst(image[1])])
Expand Down Expand Up @@ -371,13 +372,13 @@ def __fetch_spiffs_size(target, source, env):
debug_tools.get(upload_protocol).get("server").get("arguments", []))
openocd_args.extend([
"-c",
"program_esp32 {{$SOURCE}} %s verify" %
board.get("upload.offset_address", "0x10000")
"program_esp {{$SOURCE}} %s verify" %
board.get("upload.offset_address", "$ESP32_APP_OFFSET")
])
for image in env.get("FLASH_EXTRA_IMAGES", []):
openocd_args.extend([
"-c",
'program_esp32 {{%s}} %s verify' %
'program_esp {{%s}} %s verify' %
(_to_unix_slashes(image[1]), image[0])
])
openocd_args.extend(["-c", "reset run; shutdown"])
Expand Down
10 changes: 5 additions & 5 deletions platform.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"type": "git",
"url": "https://github.com/platformio/platform-espressif32.git"
},
"version": "2.0.0",
"version": "2.1.0",
"frameworks": {
"arduino": {
"package": "framework-arduinoespressif32",
Expand Down Expand Up @@ -79,7 +79,7 @@
"framework-arduino-mbcwb": {
"type": "framework",
"optional": true,
"owner": "platformio",
"owner": "meteca",
"version": ">=2.1.1"
},
"framework-espidf": {
Expand All @@ -103,18 +103,18 @@
"tool-esptoolpy": {
"type": "uploader",
"owner": "platformio",
"version": "~1.20600.0"
"version": "~1.30000.0"
},
"tool-mbctool": {
"optional": true,
"owner": "platformio",
"owner": "meteca",
"version": ">=2.0.0"
},
"tool-openocd-esp32": {
"type": "debugger",
"optional": true,
"owner": "platformio",
"version": "~1.1000.20181026"
"version": "~2.1000.0"
},
"tool-mkspiffs": {
"type": "uploader",
Expand Down
37 changes: 34 additions & 3 deletions platform.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,10 @@
# See the License for the specific language governing permissions and
# limitations under the License.

from os.path import isdir
import copy
import os

from platformio import fs
from platformio.managers.platform import PlatformBase
from platformio.util import get_systype

Expand All @@ -32,7 +34,7 @@ def configure_default_packages(self, variables, targets):
self.packages['tool-mkspiffs']['optional'] = False
if variables.get("upload_protocol"):
self.packages['tool-openocd-esp32']['optional'] = False
if isdir("ulp"):
if os.path.isdir("ulp"):
self.packages['toolchain-esp32ulp']['optional'] = False
if "espidf" in frameworks:
for p in self.packages:
Expand Down Expand Up @@ -122,7 +124,8 @@ def _add_dynamic_options(self, board):
server_args = [
"-s", "$PACKAGE_DIR/share/openocd/scripts",
"-f", "interface/%s.cfg" % openocd_interface,
"-f", "board/%s" % debug.get("openocd_board")
"-f", "board/%s" % debug.get("openocd_board"),
"-c", "adapter_khz %d" % debug.get("adapter_speed", 20000)
]

debug['tools'][link] = {
Expand Down Expand Up @@ -152,3 +155,31 @@ def _add_dynamic_options(self, board):

board.manifest['debug'] = debug
return board

def configure_debug_options(self, initial_debug_options, ide_data):
ide_extra_data = ide_data.get("extra", {})
flash_images = ide_extra_data.get("flash_images", [])
ignore_conds = [
initial_debug_options["load_cmds"] != ["load"],
not flash_images,
not all([os.path.isfile(item["path"]) for item in flash_images]),
]
if any(ignore_conds):
return initial_debug_options

debug_options = copy.deepcopy(initial_debug_options)
load_cmds = [
'monitor program_esp "{{{path}}}" {offset} verify'.format(
path=fs.to_unix_path(item["path"]), offset=item["offset"]
)
for item in flash_images
]
load_cmds.append(
'monitor program_esp "{%s.bin}" %s verify'
% (
fs.to_unix_path(ide_data["prog_path"][:-4]),
ide_extra_data.get("application_offset", "0x10000"),
)
)
debug_options["load_cmds"] = load_cmds
return debug_options

0 comments on commit c266d51

Please sign in to comment.