forked from platformio/platformio-core
Update builder for SPL framework.
This commit is contained in:
@ -19,15 +19,15 @@
|
|||||||
|
|
||||||
[env:disco_f407vg]
|
[env:disco_f407vg]
|
||||||
platform = ststm32
|
platform = ststm32
|
||||||
framework = cmsis,spl
|
framework = spl
|
||||||
board = disco_f407vg
|
board = disco_f407vg
|
||||||
|
|
||||||
[env:disco_l152rb]
|
[env:disco_l152rb]
|
||||||
platform = ststm32
|
platform = ststm32
|
||||||
framework = cmsis,spl
|
framework = spl
|
||||||
board = disco_l152rb
|
board = disco_l152rb
|
||||||
|
|
||||||
[env:disco_f303vc]
|
[env:disco_f303vc]
|
||||||
platform = ststm32
|
platform = ststm32
|
||||||
framework = cmsis,spl
|
framework = spl
|
||||||
board = disco_f303vc
|
board = disco_f303vc
|
||||||
|
@ -34,13 +34,24 @@ env.Replace(
|
|||||||
)
|
)
|
||||||
|
|
||||||
env.VariantDirWrap(
|
env.VariantDirWrap(
|
||||||
join("$BUILD_DIR", "FrameworkSPLInc"),
|
join("$BUILD_DIR", "FrameworkCMSIS"),
|
||||||
join("$PLATFORMFW_DIR", "${BOARD_OPTIONS['build']['core']}",
|
join("$PLATFORMFW_DIR", "${BOARD_OPTIONS['build']['core']}",
|
||||||
"variants", "${BOARD_OPTIONS['build']['variant']}", "inc")
|
"cmsis", "cores", "${BOARD_OPTIONS['build']['core']}")
|
||||||
|
)
|
||||||
|
|
||||||
|
env.VariantDirWrap(
|
||||||
|
join("$BUILD_DIR", "FrameworkSPLInc"),
|
||||||
|
join(
|
||||||
|
"$PLATFORMFW_DIR", "${BOARD_OPTIONS['build']['core']}", "spl",
|
||||||
|
"variants", env.subst("${BOARD_OPTIONS['build']['variant']}")[0:7],
|
||||||
|
"inc"
|
||||||
|
)
|
||||||
)
|
)
|
||||||
|
|
||||||
env.Append(
|
env.Append(
|
||||||
CPPPATH=[
|
CPPPATH=[
|
||||||
|
join("$BUILD_DIR", "FrameworkCMSIS"),
|
||||||
|
join("$BUILD_DIR", "FrameworkCMSISVariant"),
|
||||||
join("$BUILD_DIR", "FrameworkSPLInc"),
|
join("$BUILD_DIR", "FrameworkSPLInc"),
|
||||||
join("$BUILD_DIR", "FrameworkSPL")
|
join("$BUILD_DIR", "FrameworkSPL")
|
||||||
]
|
]
|
||||||
@ -71,10 +82,20 @@ elif "STM32L1XX_MD" in extra_flags:
|
|||||||
src_filter_patterns += ["-<stm32l1xx_flash_ramfunc.c>"]
|
src_filter_patterns += ["-<stm32l1xx_flash_ramfunc.c>"]
|
||||||
|
|
||||||
libs = []
|
libs = []
|
||||||
|
|
||||||
|
libs.append(envsafe.BuildLibrary(
|
||||||
|
join("$BUILD_DIR", "FrameworkCMSISVariant"),
|
||||||
|
join(
|
||||||
|
"$PLATFORMFW_DIR", "${BOARD_OPTIONS['build']['core']}", "cmsis",
|
||||||
|
"variants", env.subst("${BOARD_OPTIONS['build']['variant']}")[0:7]
|
||||||
|
)
|
||||||
|
))
|
||||||
|
|
||||||
libs.append(envsafe.BuildLibrary(
|
libs.append(envsafe.BuildLibrary(
|
||||||
join("$BUILD_DIR", "FrameworkSPL"),
|
join("$BUILD_DIR", "FrameworkSPL"),
|
||||||
join("$PLATFORMFW_DIR", "${BOARD_OPTIONS['build']['core']}", "variants",
|
join("$PLATFORMFW_DIR", "${BOARD_OPTIONS['build']['core']}",
|
||||||
"${BOARD_OPTIONS['build']['variant']}", "src"),
|
"spl", "variants",
|
||||||
|
env.subst("${BOARD_OPTIONS['build']['variant']}")[0:7], "src"),
|
||||||
src_filter=" ".join(src_filter_patterns)
|
src_filter=" ".join(src_filter_patterns)
|
||||||
))
|
))
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user