From f767ba97dee81462d662ed9ac2bad051624d4091 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ciro=20Santilli=20=E5=85=AD=E5=9B=9B=E4=BA=8B=E4=BB=B6=20?= =?UTF-8?q?=E6=B3=95=E8=BD=AE=E5=8A=9F?= Date: Fri, 8 Jan 2021 00:00:01 +0000 Subject: [PATCH] gem5: also pass our custom kernel cli parameters to fs_bitLITTLE --- run | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/run b/run index 90e2fed..fe929da 100755 --- a/run +++ b/run @@ -591,6 +591,8 @@ Extra options to append at the end of the emulator command line. ]) cmd.extend(['--interp-dir', self.env['userland_library_dir'], LF]) else: + if self.env['is_arm']: + arm_kernel_cli = 'earlycon=pl011,0x1c090000 earlyprintk=pl011,0x1c090000 lpj=19988480 rw loglevel=8 mem={}'.format(memory) if self.env['gem5_script'] == 'fs': cmd.extend([ self.env['gem5_fs_file'], LF, @@ -611,7 +613,7 @@ Extra options to append at the end of the emulator command line. if self.env['kvm']: cmd.extend(['--cpu-type', 'X86KvmCPU', LF]) if not self.env['baremetal']: - cmd.extend(['--command-line', 'earlycon={} earlyprintk={} lpj=7999923 root=/dev/sda {}'.format(console, console, kernel_cli), LF]) + cmd.extend(['--command-line', 'earlycon={} earlyprintk={} lpj=7999923 root=/dev/sda {}'.format(arm_kernel_cli, console, console, kernel_cli), LF]) elif self.env['is_arm']: if self.env['kvm']: cmd.extend(['--cpu-type', 'ArmV8KvmCPU', LF]) @@ -627,7 +629,7 @@ Extra options to append at the end of the emulator command line. '--command-line', # TODO why is it mandatory to pass mem= here? Not true for QEMU. # Anything smaller than physical blows up as expected, but why can't it auto-detect the right value? - 'earlycon=pl011,0x1c090000 earlyprintk=pl011,0x1c090000 lpj=19988480 rw loglevel=8 mem={} root=/dev/sda {}'.format(memory, kernel_cli), LF + 'root=/dev/sda {} {}'.format(arm_kernel_cli, kernel_cli), LF ]) cmd.extend(['--param', 'system.workload.panic_on_panic = True', LF]) dtb = None @@ -674,8 +676,8 @@ Extra options to append at the end of the emulator command line. '--big-cpus', str((self.env['cpus'] + 1) // 2), LF, '--cpu-type', cpu_type, LF, '--kernel', self.env['image'], LF, + '--kernel-cmd', 'root=/dev/vda {} {}'.format(arm_kernel_cli, kernel_cli), LF, '--little-cpus', str(self.env['cpus'] // 2), LF, - '--root', '/dev/vda', LF, ]) if use_disk_image: cmd.extend(['--disk', self.env['disk_image'], LF])