summaryrefslogtreecommitdiffstats
path: root/scripts/lib/bsp/engine.py
diff options
context:
space:
mode:
authorTom Zanussi <tom.zanussi@intel.com>2012-08-07 16:11:14 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-08-25 14:47:05 +0100
commit738f77bd06a5d5c12b751796c934f6c84e0ecb37 (patch)
treef2bbefd2c3a45cf95c63475a281280ca62312bdd /scripts/lib/bsp/engine.py
parente352d263f3e263ee6a3e18a5f9e94c7a48133a43 (diff)
downloadpoky-738f77bd06a5d5c12b751796c934f6c84e0ecb37.tar.gz
yocto-bsp: generate default properties even if json specified
Users seem to want to specify incomplete property sets when using json input. Allow this by generating default properties before the user-specified properties are applied; the user will then get the defaults for any unspecified values, and avoid cryptic backtraces. (From meta-yocto rev: 3f0361f77cf64844da93ba4a76c42cd5befff5ad) Signed-off-by: Tom Zanussi <tom.zanussi@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/lib/bsp/engine.py')
-rw-r--r--scripts/lib/bsp/engine.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/lib/bsp/engine.py b/scripts/lib/bsp/engine.py
index 7a98f447c3..eb3efbf5c7 100644
--- a/scripts/lib/bsp/engine.py
+++ b/scripts/lib/bsp/engine.py
@@ -1235,10 +1235,10 @@ def yocto_bsp_create(machine, arch, scripts_path, bsp_output_dir, codedump, prop
1235 1235
1236 gen_program_header_lines(program_lines) 1236 gen_program_header_lines(program_lines)
1237 1237
1238 gen_initial_property_vals(input_lines, program_lines)
1239
1238 if properties: 1240 if properties:
1239 gen_supplied_property_vals(properties, program_lines) 1241 gen_supplied_property_vals(properties, program_lines)
1240 else:
1241 gen_initial_property_vals(input_lines, program_lines)
1242 1242
1243 gen_program_machine_lines(machine, program_lines) 1243 gen_program_machine_lines(machine, program_lines)
1244 1244