Update builder for SPL framework.

This commit is contained in:
Valeriy Koval
2015-12-15 19:29:37 +02:00
parent 7ce780bcc6
commit 7e985219ad
2 changed files with 28 additions and 7 deletions

View File

@ -19,15 +19,15 @@
[env:disco_f407vg]
platform = ststm32
framework = cmsis,spl
framework = spl
board = disco_f407vg
[env:disco_l152rb]
platform = ststm32
framework = cmsis,spl
framework = spl
board = disco_l152rb
[env:disco_f303vc]
platform = ststm32
framework = cmsis,spl
framework = spl
board = disco_f303vc

View File

@ -34,13 +34,24 @@ env.Replace(
)
env.VariantDirWrap(
join("$BUILD_DIR", "FrameworkSPLInc"),
join("$BUILD_DIR", "FrameworkCMSIS"),
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(
CPPPATH=[
join("$BUILD_DIR", "FrameworkCMSIS"),
join("$BUILD_DIR", "FrameworkCMSISVariant"),
join("$BUILD_DIR", "FrameworkSPLInc"),
join("$BUILD_DIR", "FrameworkSPL")
]
@ -71,10 +82,20 @@ elif "STM32L1XX_MD" in extra_flags:
src_filter_patterns += ["-<stm32l1xx_flash_ramfunc.c>"]
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(
join("$BUILD_DIR", "FrameworkSPL"),
join("$PLATFORMFW_DIR", "${BOARD_OPTIONS['build']['core']}", "variants",
"${BOARD_OPTIONS['build']['variant']}", "src"),
join("$PLATFORMFW_DIR", "${BOARD_OPTIONS['build']['core']}",
"spl", "variants",
env.subst("${BOARD_OPTIONS['build']['variant']}")[0:7], "src"),
src_filter=" ".join(src_filter_patterns)
))