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

Move framework related things from main script to own build script

Browse Source
This commit is contained in:
Ivan Kravets
2017-01-24 23:25:18 +02:00
parent dabc54ab7b
commit 19c8bc49de
4 changed files with 26 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
builder/frameworks/arduino.py
+8
View File
@@ -99,6 +99,14 @@ env.Append(
"-T", "esp32.common.ld",
"-T", "esp32.rom.ld",
"-T", "esp32.peripherals.ld"
],
UPLOADERFLAGS=[
"0x1000", '"%s"' % join(FRAMEWORK_DIR, "tools",
"sdk", "bin", "bootloader.bin"),
"0x8000", '"%s"' % join(FRAMEWORK_DIR, "tools",
"sdk", "bin", "partitions_singleapp.bin"),
"0x10000"
]
)
builder/frameworks/espidf.py
+7
View File
@@ -77,6 +77,7 @@ def build_espidf_bootloader():
)
)
env.Prepend(
CPPPATH=[
join("$PROJECTSRC_DIR"),
@@ -128,6 +129,12 @@ env.Append(
"-T", "esp32.rom.ld",
"-T", "esp32.peripherals.ld"
],
UPLOADERFLAGS=[
"0x1000", join("$BUILD_DIR", "bootloader.bin"),
"0x4000", join("$BUILD_DIR", "partitions_table.bin"),
"0x10000"
]
)
#
builder/frameworks/simba.py
+10
View File
@@ -54,5 +54,15 @@ env.Replace(
PLATFORMFW_DIR=env.PioPlatform().get_package_dir("framework-simba")
)
env.Append(
UPLOADERFLAGS=[
"0x1000", join("$PLATFORMFW_DIR", "3pp", "esp32",
"bin", "bootloader.bin"),
"0x4000", join("$PLATFORMFW_DIR", "3pp", "esp32",
"bin", "partitions_singleapp.bin"),
"0x10000"
]
)
SConscript(
[env.subst(join("$PLATFORMFW_DIR", "make", "platformio.sconscript"))])
builder/main.py
+1 -38
View File
@@ -80,15 +80,6 @@ env.Replace(
"-Wl,--gc-sections"
],
#
# Packages
#
FRAMEWORK_ARDUINOESP32_DIR=platform.get_package_dir(
"framework-arduinoespressif32"),
ESPIDF_DIR=platform.get_package_dir("framework-espidf"),
FRAMEWORK_SIMBA_DIR=platform.get_package_dir("framework-simba"),
#
# Upload
#
@@ -112,36 +103,8 @@ env.Replace(
PROGSUFFIX=".elf"
)
if env.subst("$PIOFRAMEWORK") == "arduino":
env.Append(
UPLOADERFLAGS=[
"0x1000", '"%s"' % join("$FRAMEWORK_ARDUINOESP32_DIR", "tools",
"sdk", "bin", "bootloader.bin"),
"0x8000", '"%s"' % join("$FRAMEWORK_ARDUINOESP32_DIR", "tools",
"sdk", "bin", "partitions_singleapp.bin"),
"0x10000"
]
)
if env.subst("$PIOFRAMEWORK") == "espidf":
env.Append(
UPLOADERFLAGS=[
"0x1000", join("$BUILD_DIR", "bootloader.bin"),
"0x4000", join("$BUILD_DIR", "partitions_table.bin"),
"0x10000"
]
)
if env.subst("$PIOFRAMEWORK") == "simba":
env.Append(
UPLOADERFLAGS=[
"0x1000", join("$FRAMEWORK_SIMBA_DIR", "3pp", "esp32",
"bin", "bootloader.bin"),
"0x4000", join("$FRAMEWORK_SIMBA_DIR", "3pp", "esp32",
"bin", "partitions_singleapp.bin"),
"0x10000"
]
)
# Clone actual CCFLAGS to ASFLAGS
env.Append(
ASFLAGS=env.get("CCFLAGS", [])[:]
)