From 64dbf624dbd3ed9de190211158650b9f43ee4878 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: Mon, 28 Jan 2019 00:00:00 +0000 Subject: [PATCH] gem5: update to 9048ef0ffbf21bedb803b785fb68f83e95c04db8 --generate-dtb was removed and is set by default now --- run | 5 +---- submodules/gem5 | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/run b/run index c7c33b7..cbd2030 100755 --- a/run +++ b/run @@ -374,10 +374,7 @@ Run QEMU with VNC instead of the default SDL. Connect to it with: dtb = self.env['dtb'] elif self.env['dp650']: dtb = os.path.join(self.env['gem5_system_dir'], 'arm', 'dt', 'armv{}_gem5_v1_{}{}cpu.dtb'.format(self.env['armv'], dp650_cmd, self.env['cpus'])) - if dtb is None: - if not self.env['baremetal']: - cmd.extend(['--generate-dtb', LF]) - else: + if dtb is not None: cmd.extend(['--dtb-filename', dtb, LF]) if self.env['baremetal'] is None: cmd.extend(['--param', 'system.panic_on_panic = True', LF ]) diff --git a/submodules/gem5 b/submodules/gem5 index 7fa4c94..9048ef0 160000 --- a/submodules/gem5 +++ b/submodules/gem5 @@ -1 +1 @@ -Subproject commit 7fa4c946386e7207ad5859e8ade0bbfc14000d91 +Subproject commit 9048ef0ffbf21bedb803b785fb68f83e95c04db8