gem5: update to 239054f48439c18b93e1a70ff29dbcb0c4742cff

fs_bigLITTLE: no patches needed anymore, we now have the --root option.
This commit is contained in:
Ciro Santilli 六四事件 法轮功
2019-10-29 00:00:00 +00:00
parent 2cfb389c5a
commit 44227c7b6a
4 changed files with 7 additions and 24 deletions

View File

@@ -12161,15 +12161,7 @@ The out of build tree is required, because otherwise Buildroot would copy the ou
By default, we use `configs/example/fs.py` script.
The `--gem5-script biglittle` option enables the alternative `configs/example/arm/fs_bigLITTLE.py` script instead.
First apply:
....
patch -d "$(./getvar gem5_source_dir)" -p 1 < patches/manual/gem5-biglittle.patch
....
then:
The `--gem5-script biglittle` option enables the alternative `configs/example/arm/fs_bigLITTLE.py` script instead:
....
./run --arch aarch64 --emulator gem5 --gem5-script biglittle

View File

@@ -1,13 +0,0 @@
diff --git a/configs/example/arm/fs_bigLITTLE.py b/configs/example/arm/fs_bigLITTLE.py
index 7d66c03a6..d71e714fe 100644
--- a/configs/example/arm/fs_bigLITTLE.py
+++ b/configs/example/arm/fs_bigLITTLE.py
@@ -194,7 +194,7 @@ def build(options):
"norandmaps",
"loglevel=8",
"mem=%s" % default_mem_size,
- "root=/dev/vda1",
+ "root=/dev/vda",
"rw",
"init=%s" % options.kernel_init,
"vmalloc=768MB",

6
run
View File

@@ -526,7 +526,10 @@ Extra options to append at the end of the emulator command line.
'--machine-type', self.env['machine'], LF,
])
if self.env['baremetal'] is None:
cmd.extend(['--command-line', 'earlyprintk=pl011,0x1c090000 lpj=19988480 rw loglevel=8 mem={} root=/dev/sda {}'.format(memory, kernel_cli), LF])
cmd.extend([
'--command-line',
'earlyprintk=pl011,0x1c090000 lpj=19988480 rw loglevel=8 mem={} root=/dev/sda {}'.format(memory, kernel_cli), LF
])
dtb = None
if self.env['dtb'] is not None:
dtb = self.env['dtb']
@@ -574,6 +577,7 @@ Extra options to append at the end of the emulator command line.
'--disk', self.env['disk_image'], LF,
'--kernel', self.env['image'], LF,
'--little-cpus', str(self.env['cpus'] // 2), LF,
'--root', '/dev/vda', LF,
])
if self.env['dtb']:
cmd.extend([