3rd-party/linux-kernel-module-cheat
1
0
Fork 0
mirror of https://github.com/cirosantilli/linux-kernel-module-cheat.git synced 2026-01-22 17:55:57 +01:00
Code Issues Releases Wiki Activity

Don't pass dummy disk images to gem5

Browse Source 
After https://gem5.atlassian.net/browse/GEM5-337:

- gem5 baremetal can run without any disk images, just like QEMU
- gem5 X86 can run with a single disk image and no horrendous dummy vmlinux
  and second disk image
This commit is contained in:
Ciro Santilli 六四事件 法轮功
2020-02-14 00:00:00 +00:00
parent 17fba4a968
commit f2713e69f6
3 changed files with 14 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
common.py
View File

@@ -844,7 +844,6 @@ Incompatible archs are skipped.
# gem5
if not env['_args_given']['gem5_build_dir']:
env['gem5_build_dir'] = join(env['gem5_out_dir'], env['gem5_build_id'])
env['gem5_fake_iso'] = join(env['gem5_out_dir'], 'fake.iso')
env['gem5_m5term'] = join(env['gem5_build_dir'], 'm5term')
env['gem5_build_build_dir'] = join(env['gem5_build_dir'], 'build')
env['gem5_executable_dir'] = join(env['gem5_build_build_dir'], env['gem5_arch'])
@@ -1065,7 +1064,7 @@ Incompatible archs are skipped.
# Image
if env['baremetal'] is not None:
env['disk_image'] = env['gem5_fake_iso']
env['disk_image'] = None
env['image'] = self.resolve_baremetal_executable(env['baremetal'])
source_path_noext = os.path.splitext(join(
env['root_dir'],
@@ -1094,7 +1093,7 @@ Incompatible archs are skipped.
if not env['_args_given']['linux_exec']:
env['image'] = env['vmlinux']
if env['ramfs']:
env['disk_image'] = env['gem5_fake_iso']
env['disk_image'] = None
else:
env['disk_image'] = env['rootfs_raw_file']
else: