summaryrefslogtreecommitdiffstats
path: root/scripts/lib
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-21 11:35:22 +0100
commita76fc366ce0c4b8d3e1af0fb95ddb9194d77f53a (patch)
treea38f35a8868f5d01bf55421460530032e72b0a10 /scripts/lib
parent759237f721d92fcab6bf1b8d4d5406b5bc9ed17c (diff)
downloadpoky-a76fc366ce0c4b8d3e1af0fb95ddb9194d77f53a.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. Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
Diffstat (limited to 'scripts/lib')
-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 af90e91d18..9d16b19336 100644
--- a/scripts/lib/bsp/engine.py
+++ b/scripts/lib/bsp/engine.py
@@ -1245,10 +1245,10 @@ def yocto_bsp_create(machine, arch, scripts_path, bsp_output_dir, codedump, prop
1245 1245
1246 gen_program_header_lines(program_lines) 1246 gen_program_header_lines(program_lines)
1247 1247
1248 gen_initial_property_vals(input_lines, program_lines)
1249
1248 if properties: 1250 if properties:
1249 gen_supplied_property_vals(properties, program_lines) 1251 gen_supplied_property_vals(properties, program_lines)
1250 else:
1251 gen_initial_property_vals(input_lines, program_lines)
1252 1252
1253 gen_program_machine_lines(machine, program_lines) 1253 gen_program_machine_lines(machine, program_lines)
1254 1254