pass disk image to baremetal if present

Why not? But this is mostly a cheap workaround for gem5 baremetal not
handling no disk images.
This commit is contained in:
Ciro Santilli 六四事件 法轮功
2020-04-03 01:00:00 +00:00
parent 253ba153c7
commit c0bc5cffed
2 changed files with 13 additions and 9 deletions

View File

@@ -1148,7 +1148,6 @@ Incompatible archs are skipped.
# Image
if env['baremetal'] is not None:
env['disk_image'] = None
env['image'] = self.resolve_baremetal_executable(env['baremetal'])
source_path_noext = os.path.splitext(join(
env['root_dir'],
@@ -1176,16 +1175,18 @@ Incompatible archs are skipped.
if env['emulator'] == 'gem5':
if not env['_args_given']['linux_exec']:
env['image'] = env['vmlinux']
if env['ramfs']:
env['disk_image'] = None
else:
env['disk_image'] = env['rootfs_raw_file']
else:
if not env['_args_given']['linux_exec']:
env['image'] = env['linux_image']
env['disk_image'] = env['qcow2_file']
if env['_args_given']['linux_exec']:
env['image'] = env['linux_exec']
if env['emulator'] == 'gem5':
if env['ramfs']:
env['disk_image'] = None
else:
env['disk_image'] = env['rootfs_raw_file']
else:
env['disk_image'] = env['qcow2_file']
# Android
if not env['_args_given']['android_base_dir']: