Skip to content

Commit 07f65df

Browse files
committed
third_party/wscript: split conf/build functions
Otherwise some configurations were not applied correctly due to some env races. Signed-off-by: Gerard Marull-Paretas <gerard@teslabs.com>
1 parent 9e00c31 commit 07f65df

File tree

8 files changed

+33
-49
lines changed

8 files changed

+33
-49
lines changed

third_party/cmsis_core/wscript

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
1-
def configure(conf):
2-
pass
3-
4-
51
def build(bld):
62
bld(export_includes=['CMSIS/CMSIS/Core/Include'],
73
name='cmsis_core')

third_party/freertos/wscript

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
def configure(conf):
2-
pass
3-
41
def build(bld):
52
# FreeRTOS vendor code
63
use_timers = False

third_party/hal_sifli/wscript

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
def configure(conf):
2-
conf.env.append_unique('DEFINES', 'USE_HAL_DRIVER')
3-
conf.env.append_unique('DEFINES', 'SOC_BF0_HCPU')
4-
conf.env.append_unique('DEFINES', 'HAL_TICK_PER_SECOND=1024')
5-
conf.env.append_unique('DEFINES', 'HAL_NMI_HANLDER_OVERRIDED')
2+
if conf.env.MICRO_FAMILY.startswith('SF32'):
3+
conf.env.append_unique('DEFINES', 'USE_HAL_DRIVER')
4+
conf.env.append_unique('DEFINES', 'SOC_BF0_HCPU')
5+
conf.env.append_unique('DEFINES', 'HAL_TICK_PER_SECOND=1024')
6+
conf.env.append_unique('DEFINES', 'HAL_NMI_HANLDER_OVERRIDED')
7+
68
if conf.env.MICRO_FAMILY == 'SF32LB52':
79
conf.env.append_unique('DEFINES', 'SF32LB52X')
810

third_party/nanopb/wscript

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
1-
def configure(conf):
2-
pass
3-
4-
51
def build(bld):
62
nanopb_sources = [
73
'nanopb/pb_common.c',

third_party/qr_code_generator/wscript

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
1-
def configure(conf):
2-
pass
3-
4-
51
def build(bld):
62
sources = ['QR-Code-generator/c/qrcodegen.c']
73
includes = ['QR-Code-generator/c']

third_party/ti_bt_sp/wscript

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
import waftools.cc2564_service_pack_convert
22

33

4-
def configure(conf):
5-
pass
6-
74
def build(bld):
85
service_pack_bin_bld_node = bld.srcnode.get_bld().make_node(
96
'resources/common/raw/bt_patch.bin'

third_party/tinymt/wscript

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
def configure(conf):
2-
pass
3-
41
def build(bld):
52
tinymt_sources = [
63
'TinyMT/tinymt/tinymt32.c',

third_party/wscript

Lines changed: 27 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,34 @@
1-
def _recurse(ctx):
2-
ctx.recurse('cmsis_core')
3-
ctx.recurse('freertos')
4-
ctx.recurse('nanopb')
5-
ctx.recurse('tinymt')
6-
ctx.recurse('qr_code_generator')
7-
8-
if ctx.env.MICRO_FAMILY.startswith('STM32'):
9-
ctx.recurse('hal_stm32')
10-
elif ctx.env.MICRO_FAMILY.startswith('NRF'):
11-
ctx.recurse('hal_nordic')
12-
elif ctx.env.MICRO_FAMILY.startswith('SF32'):
13-
ctx.recurse('hal_sifli')
14-
15-
if ctx.env.bt_controller in ('cc2564x', 'nrf52', 'sf32lb52'):
16-
ctx.recurse('nimble')
17-
18-
if ctx.env.bt_controller == 'cc2564x':
19-
ctx.recurse('ti_bt_sp')
20-
21-
ctx.recurse('memfault')
22-
231
def options(opt):
242
opt.recurse('memfault')
253
opt.recurse('nimble')
264

5+
276
def configure(conf):
28-
_recurse(conf)
7+
conf.recurse('hal_nordic')
8+
conf.recurse('hal_sifli')
9+
conf.recurse('hal_stm32')
10+
conf.recurse('memfault')
11+
conf.recurse('nimble')
12+
2913

3014
def build(bld):
31-
_recurse(bld)
15+
bld.recurse('cmsis_core')
16+
bld.recurse('freertos')
17+
bld.recurse('nanopb')
18+
bld.recurse('tinymt')
19+
bld.recurse('qr_code_generator')
20+
21+
if bld.env.MICRO_FAMILY.startswith('STM32'):
22+
bld.recurse('hal_stm32')
23+
elif bld.env.MICRO_FAMILY.startswith('NRF'):
24+
bld.recurse('hal_nordic')
25+
elif bld.env.MICRO_FAMILY.startswith('SF32'):
26+
bld.recurse('hal_sifli')
27+
28+
if bld.env.bt_controller in ('cc2564x', 'nrf52', 'sf32lb52'):
29+
bld.recurse('nimble')
30+
31+
if bld.env.bt_controller == 'cc2564x':
32+
bld.recurse('ti_bt_sp')
33+
34+
bld.recurse('memfault')

0 commit comments

Comments
 (0)