pioduino/platform-espressif32
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update builder for espidf framework

Browse Source
This commit is contained in:
Valeriy Koval
2017-02-19 21:23:04 +02:00
parent e474b635a8
commit 36c8eb4f85
2 changed files with 175 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
builder/frameworks/espidf.py
+160 -30
View File
@@ -20,8 +20,8 @@ Espressif IoT Development Framework for ESP32 MCU
https://github.com/espressif/esp-idf
"""
from os import listdir
from os.path import isdir, join
from os import listdir, walk
from os.path import basename, isdir, isfile, join
from SCons.Script import DefaultEnvironment
@@ -35,36 +35,122 @@ FRAMEWORK_VERSION = platform.get_package_version(
"framework-espidf")
def parse_mk(path):
result = {}
variable = None
multi = False
with open(path) as fp:
for line in fp.readlines():
line = line.strip()
if not line or line.startswith("#"):
continue
# remove inline comments
if " # " in line:
line = line[:line.index(" # ")]
if not multi and "=" in line:
variable, line = line.split("=", 1)
if variable.endswith((":", "+")):
variable = variable[:-1]
variable = variable.strip()
line = line.strip()
if not variable or not line:
continue
multi = line.endswith('\\')
if multi:
line = line[:-1].strip()
if variable not in result:
result[variable] = []
result[variable].extend([l.strip() for l in line.split()])
if not multi:
variable = None
return result
def build_component(path):
envsafe = env.Clone()
src_filter = "+<*> -<test> -<tests>"
if isfile(join(path, "component.mk")):
params = parse_mk(join(path, "component.mk"))
if params.get("COMPONENT_PRIV_INCLUDEDIRS"):
inc_dirs = params.get("COMPONENT_PRIV_INCLUDEDIRS")
envsafe.Prepend(
CPPPATH=[join(path, d) for d in inc_dirs])
if params.get("CFLAGS"):
envsafe.Append(CCFLAGS=params.get("CFLAGS"))
if params.get("COMPONENT_OBJS"):
src_filter = "-<*>"
for f in params.get("COMPONENT_OBJS"):
src_filter += " +<%s>" % f.replace(".o", ".c")
elif params.get("COMPONENT_SRCDIRS"):
src_filter = "-<*>"
src_dirs = params.get("COMPONENT_SRCDIRS")
if "." in src_dirs:
src_dirs.remove(".")
src_filter += " +<*.c*>"
for f in src_dirs:
src_filter += " +<%s/*.c*>" % f
return envsafe.BuildLibrary(
join("$BUILD_DIR", "%s" % basename(path)), path,
src_filter=src_filter
)
def build_espidf_bootloader():
envsafe = env.Clone()
envsafe.Replace(
CPPDEFINES=["ESP_PLATFORM", ("BOOTLOADER_BUILD", 1)],
CPPDEFINES=[
"ESP_PLATFORM",
"WITH_POSIX",
("BOOTLOADER_BUILD", 1),
("IDF_VER", '\\"%s\\"' %
platform.get_package_version("framework-espidf"))
],
LIBPATH=[
join(FRAMEWORK_DIR, "components", "esp32", "ld"),
join(FRAMEWORK_DIR, "components", "esp32", "lib"),
join(FRAMEWORK_DIR, "components", "bootloader", "src", "main")
],
LINKFLAGS=[
"-Os",
"-nostdlib",
"-Wl,-static",
"-u", "call_user_start_cpu0",
"-Wl,-static",
"-Wl,--gc-sections",
"-T", "esp32.bootloader.ld",
"-T", "esp32.rom.ld"
"-T", "esp32.rom.ld",
"-T", "esp32.bootloader.rom.ld"
]
),
envsafe.Append(CCFLAGS=["-fstrict-volatile-bitfields"])
envsafe.Append(
CPPPATH=[
join(FRAMEWORK_DIR, "components", "esp32")
]
)
envsafe.Replace(
LIBS=[
envsafe.BuildLibrary(
join("$BUILD_DIR", "bootloaderSupport"),
join(FRAMEWORK_DIR, "components", "bootloader_support")
),
envsafe.BuildLibrary(
join("$BUILD_DIR", "bootloaderLog"),
join(FRAMEWORK_DIR, "components", "log")
), "gcc"
),
envsafe.BuildLibrary(
join("$BUILD_DIR", "bootloaderSPIFlash"),
join(FRAMEWORK_DIR, "components", "spi_flash"),
src_filter="-<*> +<spi_flash_rom_patch.c>"
),
envsafe.BuildLibrary(
join("$BUILD_DIR", "bootloaderMicroEcc"),
join(FRAMEWORK_DIR, "components", "micro-ecc"),
src_filter="+<*> -<micro-ecc/test>"
),
"rtc", "gcc", "stdc++"
]
)
@@ -80,27 +166,53 @@ def build_espidf_bootloader():
env.Prepend(
CPPPATH=[
join("$PROJECTSRC_DIR"),
join(FRAMEWORK_DIR, "components", "nghttp", "include"),
join(FRAMEWORK_DIR, "components", "nghttp", "port", "include"),
join(FRAMEWORK_DIR, "components", "xtensa-debug-module", "include"),
join(FRAMEWORK_DIR, "components", "app_update", "include"),
join(FRAMEWORK_DIR, "components", "bootloader_support", "include"),
join(FRAMEWORK_DIR, "components",
"bootloader_support", "include_priv"),
join(FRAMEWORK_DIR, "components", "bt", "include"),
join(FRAMEWORK_DIR, "components", "coap", "port", "include"),
join(FRAMEWORK_DIR, "components", "coap", "port", "include", "coap"),
join(FRAMEWORK_DIR, "components", "coap", "libcoap", "include"),
join(FRAMEWORK_DIR, "components", "coap",
"libcoap", "include", "coap"),
join(FRAMEWORK_DIR, "components", "cxx", "include"),
join(FRAMEWORK_DIR, "components", "driver", "include"),
join(FRAMEWORK_DIR, "components", "driver", "include", "driver"),
join(FRAMEWORK_DIR, "components", "esp32", "include"),
join(FRAMEWORK_DIR, "components", "ethernet", "include"),
join(FRAMEWORK_DIR, "components", "expat", "include", "expat"),
join(FRAMEWORK_DIR, "components", "expat", "port", "include"),
join(FRAMEWORK_DIR, "components", "fatfs", "src"),
join(FRAMEWORK_DIR, "components", "freertos", "include"),
join(FRAMEWORK_DIR, "components", "freertos", "include", "freertos"),
join(FRAMEWORK_DIR, "components", "json", "include"),
join(FRAMEWORK_DIR, "components", "json", "port", "include"),
join(FRAMEWORK_DIR, "components", "log", "include"),
join(FRAMEWORK_DIR, "components", "newlib", "include"),
join(FRAMEWORK_DIR, "components", "nvs_flash", "include"),
join(FRAMEWORK_DIR, "components", "spi_flash", "include"),
join(FRAMEWORK_DIR, "components", "tcpip_adapter", "include"),
join(FRAMEWORK_DIR, "components", "lwip", "include", "lwip"),
join(FRAMEWORK_DIR, "components", "lwip", "include", "lwip", "port"),
join(FRAMEWORK_DIR, "components", "lwip", "include", "lwip", "posix"),
join(FRAMEWORK_DIR, "components", "expat", "include", "expat"),
join(FRAMEWORK_DIR, "components", "expat", "port", "include"),
join(FRAMEWORK_DIR, "components", "json", "include"),
join(FRAMEWORK_DIR, "components", "json", "port", "include"),
join(FRAMEWORK_DIR, "components", "lwip", "apps", "ping"),
join(FRAMEWORK_DIR, "components", "mbedtls", "port", "include"),
join(FRAMEWORK_DIR, "components", "mbedtls", "include"),
join(FRAMEWORK_DIR, "components", "mbedtls", "port", "include")
join(FRAMEWORK_DIR, "components", "mdns", "include"),
join(FRAMEWORK_DIR, "components", "micro-ecc", "micro-ecc"),
join(FRAMEWORK_DIR, "components", "newlib", "include"),
join(FRAMEWORK_DIR, "components", "newlib", "platform_include"),
join(FRAMEWORK_DIR, "components", "nghttp", "include"),
join(FRAMEWORK_DIR, "components", "nghttp", "port", "include"),
join(FRAMEWORK_DIR, "components", "nvs_flash", "include"),
join(FRAMEWORK_DIR, "components", "openssl", "include"),
join(FRAMEWORK_DIR, "components", "openssl", "include", "internal"),
join(FRAMEWORK_DIR, "components", "openssl", "include", "platform"),
join(FRAMEWORK_DIR, "components", "openssl", "include", "openssl"),
join(FRAMEWORK_DIR, "components", "sdmmc", "include"),
join(FRAMEWORK_DIR, "components", "spi_flash", "include"),
join(FRAMEWORK_DIR, "components", "tcpip_adapter", "include"),
join(FRAMEWORK_DIR, "components", "ulp", "include"),
join(FRAMEWORK_DIR, "components", "vfs", "include"),
join(FRAMEWORK_DIR, "components", "wpa_supplicant", "include"),
join(FRAMEWORK_DIR, "components", "wpa_supplicant", "port", "include")
],
LIBPATH=[
@@ -113,11 +225,18 @@ env.Prepend(
],
LIBS=[
"hal", "crypto", "core", "net80211", "phy", "rtc", "pp", "wpa",
"smartconfig", "btdm_app", "m", "c", "gcc"
"btdm_app", "hal", "coexist", "core", "net80211", "phy", "rtc", "pp",
"wpa", "wpa2", "wps", "smartconfig", "m", "c", "gcc", "stdc++"
]
)
for root, dirs, _ in walk(join(
FRAMEWORK_DIR, "components", "bt", "bluedroid")):
for d in dirs:
if (d == "include"):
env.Append(CPPPATH=[join(root, d)])
env.Append(
LIBSOURCE_DIRS=[
join(FRAMEWORK_DIR, "libraries")
@@ -131,7 +250,7 @@ env.Append(
UPLOADERFLAGS=[
"0x1000", join("$BUILD_DIR", "bootloader.bin"),
"0x4000", join("$BUILD_DIR", "partitions_table.bin"),
"0x8000", join("$BUILD_DIR", "partitions_table.bin"),
"0x10000"
]
)
@@ -177,16 +296,27 @@ env.Depends("$BUILD_DIR/$PROGNAME$PROGSUFFIX", env.ElfToBin(
libs = []
ignore_dirs = (
"bootloader", "esptool_py", "idf_test", "newlib", "partition_table")
"bootloader",
"bootloader_support",
"esptool_py",
"idf_test",
"partition_table",
"nghttp",
"spi_flash"
)
for d in listdir(join(FRAMEWORK_DIR, "components")):
if d in ignore_dirs:
continue
if isdir(join(FRAMEWORK_DIR, "components", d)):
libs.append(env.BuildLibrary(
join("$BUILD_DIR", "%s" % d),
join(FRAMEWORK_DIR, "components", d),
src_filter="+<*> -<test>"
))
component_dir = join(FRAMEWORK_DIR, "components", d)
if isdir(component_dir):
libs.append(build_component(component_dir))
libs.append(env.BuildLibrary(
join("$BUILD_DIR", "spi_flash"),
join(FRAMEWORK_DIR, "components", "spi_flash"),
src_filter="+<*> -<test>"
))
env.Prepend(LIBS=libs)
builder/main.py
+15 -3
View File
@@ -42,13 +42,21 @@ env.Replace(
ASFLAGS=["-x", "assembler-with-cpp"],
CFLAGS=["-std=gnu99"],
CFLAGS=[
"-std=gnu99",
"-Wno-old-style-declaration"
],
CCFLAGS=[
"%s" % "-Os" if env.subst("$PIOFRAMEWORK") == "arduino" else "-Og",
"-g3",
"-nostdlib",
"-Wpointer-arith",
"-Wall",
"-Werror=all",
"-Wno-error=deprecated-declarations",
"-Wextra",
"-Wno-unused-parameter",
"-Wno-sign-compare",
"-Wno-error=unused-function",
"-Wno-error=unused-but-set-variable",
"-Wno-error=unused-variable",
@@ -69,13 +77,17 @@ env.Replace(
"ESP_PLATFORM",
("F_CPU", "$BOARD_F_CPU"),
"HAVE_CONFIG_H",
("MBEDTLS_CONFIG_FILE", '\\"mbedtls/esp_config.h\\"')
("MBEDTLS_CONFIG_FILE", '\\"mbedtls/esp_config.h\\"'),
"WITH_POSIX",
("IDF_VER", '\\"%s\\"' %
platform.get_package_version("framework-espidf"))
],
LINKFLAGS=[
"-nostdlib",
"-Wl,-static",
"-u", "call_user_start_cpu0",
"-u", "__cxa_guard_dummy",
"-Wl,--undefined=uxTopUsedPriority",
"-Wl,--gc-sections"
],