Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-02-02 05:58:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

waf: allow env variable overrides in hwdef.dat

Browse Source 
this allows hwdef.dat to control files that are built and flags to the
build
This commit is contained in:
Andrew Tridgell 2018-03-01 16:51:17 +11:00
parent 5f353b5c85
commit 89430793dd
2 changed files with 31 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Tools/ardupilotwaf/boards.py
View File

@ -383,11 +383,6 @@ class skyviper_f412(chibios):
name = 'skyviper-f412' name = 'skyviper-f412'
def configure_env(self, cfg, env): def configure_env(self, cfg, env):
super(skyviper_f412, self).configure_env(cfg, env) super(skyviper_f412, self).configure_env(cfg, env)
env.DEFINES.update(
CONFIG_HAL_BOARD_SUBTYPE = 'HAL_BOARD_SUBTYPE_CHIBIOS_SKYVIPER_F412',
)
env.CHIBIOS_FATFS_FLAG = 'USE_FATFS=no'
env.DEFAULT_PARAMETERS = '../../Tools/Frame_params/SkyViper-F412/defaults.parm'
class skyviper_f412_rev1(skyviper_f412): class skyviper_f412_rev1(skyviper_f412):
name = 'skyviper-f412-rev1' name = 'skyviper-f412-rev1'

31
Tools/ardupilotwaf/chibios.py
View File

@ -12,6 +12,8 @@ import os
import shutil import shutil
import sys import sys
import re import re
import pickle
_dynamic_env_data = {} _dynamic_env_data = {}
def _load_dynamic_env_data(bld): def _load_dynamic_env_data(bld):
bldnode = bld.bldnode.make_node('modules/ChibiOS') bldnode = bld.bldnode.make_node('modules/ChibiOS')
@ -104,6 +106,31 @@ def chibios_firmware(self):
src=self.objcopy_target) src=self.objcopy_target)
_upload_task.set_run_after(generate_fw_task) _upload_task.set_run_after(generate_fw_task)
def load_env_vars(env):
'''optionally load extra environment variables from env.py in the build directory'''
print("Checking for env.py")
env_py = os.path.join(env.BUILDROOT, 'env.py')
if not os.path.exists(env_py):
print("No env.py found")
return
e = pickle.load(open(env_py, 'r'))
for k in e.keys():
v = e[k]
if k in env:
if isinstance(env[k], dict):
a = v.split('=')
env[k][a[0]] = '='.join(a[1:])
print("env updated %s=%s" % (k, v))
elif isinstance(env[k], list):
env[k].append(v)
print("env appended %s=%s" % (k, v))
else:
env[k] = v
print("env added %s=%s" % (k, v))
else:
env[k] = v
print("env set %s=%s" % (k, v))
def configure(cfg): def configure(cfg):
cfg.find_program('make', var='MAKE') cfg.find_program('make', var='MAKE')
#cfg.objcopy = cfg.find_program('%s-%s'%(cfg.env.TOOLCHAIN,'objcopy'), var='OBJCOPY', mandatory=True) #cfg.objcopy = cfg.find_program('%s-%s'%(cfg.env.TOOLCHAIN,'objcopy'), var='OBJCOPY', mandatory=True)
@ -163,7 +190,11 @@ def configure(cfg):
except Exception: except Exception:
print("Failed to generate hwdef.h") print("Failed to generate hwdef.h")
load_env_vars(cfg.env)
def build(bld): def build(bld):
load_env_vars(bld.env)
bld( bld(
# build hwdef.h and apj.prototype from hwdef.dat. This is needed after a waf clean # build hwdef.h and apj.prototype from hwdef.dat. This is needed after a waf clean
source=bld.path.ant_glob('libraries/AP_HAL_ChibiOS/hwdef/%s/hwdef.dat' % bld.env.get_flat('BOARD')), source=bld.path.ant_glob('libraries/AP_HAL_ChibiOS/hwdef/%s/hwdef.dat' % bld.env.get_flat('BOARD')),