diff options
| author | Matt Hart <matthew.hart@linaro.org> | 2017-07-13 10:40:54 +0100 |
|---|---|---|
| committer | Guillaume Tucker <guillaume.tucker@collabora.com> | 2017-07-14 10:21:07 +0100 |
| commit | 24770c8f90febdaa045c4a12fe46ac98ff9f30da (patch) | |
| tree | f741c64dbcffdababc7b3caf3cf98f8081eb1ad8 /lava-v2-jobs-from-api.py | |
| parent | e2e32bfa3e38c6ed083f5f642c52e928f4373d22 (diff) | |
Stop booting 64 bit x86 on 32bit devices
Fixup some code flow that was making the dtb list bigger with every
plan on the command line. Makes the job create script run faster.
Diffstat (limited to 'lava-v2-jobs-from-api.py')
| -rwxr-xr-x | lava-v2-jobs-from-api.py | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/lava-v2-jobs-from-api.py b/lava-v2-jobs-from-api.py index e5b6a80..d92187f 100755 --- a/lava-v2-jobs-from-api.py +++ b/lava-v2-jobs-from-api.py @@ -97,6 +97,11 @@ def main(args): test_type = None plan_defconfigs = [] modules = build['modules'] + if build['kernel_image']: + if build['kernel_image'] == 'bzImage' and arch == 'x86': + build['dtb_dir_data'].extend(LEGACY_X86_PLATFORMS) + if arch in ['arm', 'arm64', 'x86'] and 'defconfig' in defconfig: + build['dtb_dir_data'].append('qemu') for plan in plans: if plan != 'boot': config = ConfigParser.ConfigParser() @@ -111,11 +116,6 @@ def main(args): print "Unable to load test configuration" exit(1) if build['kernel_image']: - # handle devices without a DTB, hacky :/ - if build['kernel_image'] == 'bzImage' and arch == 'x86': - build['dtb_dir_data'].extend(LEGACY_X86_PLATFORMS) - if arch in ['arm', 'arm64', 'x86'] and 'defconfig' in defconfig: - build['dtb_dir_data'].append('qemu') for dtb in build['dtb_dir_data']: # hack for arm64 dtbs in subfolders dtb_full = dtb @@ -156,6 +156,8 @@ def main(args): continue elif targets is not None and device_type not in targets: print "device_type %s is not in targets %s" % (device_type, targets) + elif arch == 'x86' and dtb == 'x86-32' and 'i386' not in arch_defconfig: + print "%s is not a 32-bit x86 build, skipping for 32-bit device %s" % (defconfig, device_type) else: for template in device['templates']: short_template_file = plan + '/' + str(template) |