michaelh/zephyr
1
0
Fork 0
Code Releases Activity

scripts: runners: Drop loading symbols from generated_dts_board.conf

Browse source 
Now that DT symbols from generated_dts_board.conf are deprecated remove
loading symbols from it.

Signed-off-by: Kumar Gala <kumar.gala@linaro.org>
This commit is contained in:
Kumar Gala 2019-11-04 09:59:57 -06:00 • committed by Kumar Gala
commit 9da1d41a12
1 changed files with 2 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

10
scripts/west_commands/runners/core.py
View file

@ -121,8 +121,7 @@ class BuildConfiguration:
Configuration options can be read as if the object were a dict, Configuration options can be read as if the object were a dict,
either object['CONFIG_FOO'] or object.get('CONFIG_FOO'). either object['CONFIG_FOO'] or object.get('CONFIG_FOO').
Configuration values in .config and generated_dts_board.conf are Kconfig configuration values are available (parsed from .config).'''
available.'''
def __init__(self, build_dir): def __init__(self, build_dir):
self.build_dir = build_dir self.build_dir = build_dir
@ -139,12 +138,7 @@ class BuildConfiguration:
return self.options.get(option, *args) return self.options.get(option, *args)
def _init(self): def _init(self):
build_z = os.path.join(self.build_dir, 'zephyr') self._parse(os.path.join(self.build_dir, 'zephyr', '.config'))
generated = os.path.join(build_z, 'include', 'generated')
files = [os.path.join(build_z, '.config'),
os.path.join(generated, 'generated_dts_board.conf')]
for f in files:
self._parse(f)
def _parse(self, filename): def _parse(self, filename):
with open(filename, 'r') as f: with open(filename, 'r') as f: