From 49b2b1b896b9cc3ca8ca6dd164e2f46d6b094524 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: Thu, 8 Nov 2018 00:00:00 +0000 Subject: [PATCH] baremetal: remove panic_on_panic from gem5 Fixes error: tried to set or access non-existentobject parameter: panic_on_panic --- run | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/run b/run index f04930a..444eaee 100755 --- a/run +++ b/run @@ -190,9 +190,11 @@ def main(args, extra_args=None): '--command-line', 'earlyprintk=pl011,0x1c090000 lpj=19988480 rw loglevel=8 mem={} root=/dev/sda {}'.format(memory, kernel_cli), common.Newline, '--dtb-filename', os.path.join(common.gem5_system_dir, 'arm', 'dt', 'armv{}_gem5_v1_{}cpu.dtb'.format(common.armv, args.cpus)), common.Newline, '--machine-type', common.machine, common.Newline, - '--param', 'system.panic_on_panic = True', common.Newline, ]) - if not args.baremetal is None: + if args.baremetal is None: + cmd.extend([ + '--param', 'system.panic_on_panic = True', common.Newline]) + else: cmd.extend(['--bare-metal', common.Newline]) if args.arch == 'aarch64': # https://stackoverflow.com/questions/43682311/uart-communication-in-gem5-with-arm-bare-metal/50983650#50983650