From 428d5f6ac26b9a76ee07a7835b96b12b8c84bc7c 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: Wed, 15 Jan 2020 00:00:00 +0000 Subject: [PATCH] gem5: update to Fix build to match new bootloader setup --- build-gem5 | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/build-gem5 b/build-gem5 index e52ecd0..cdc64be 100755 --- a/build-gem5 +++ b/build-gem5 @@ -86,7 +86,8 @@ https://github.com/cirosantilli/linux-kernel-module-cheat-regression#gem5-unit-t ) # Bootloader 32. - bootloader32_dir = os.path.join(gem5_system_source_dir, 'arm', 'simple_bootloader') + arm_bootloader_dir = os.path.join(gem5_system_source_dir, 'arm', 'bootloader') + bootloader32_dir = os.path.join(arm_bootloader_dir, 'arm') # TODO use the buildroot cross compiler here, and remove the dependencies from configure. self.sh.run_cmd([ 'make', LF, @@ -94,14 +95,14 @@ https://github.com/cirosantilli/linux-kernel-module-cheat-regression#gem5-unit-t 'CROSS_COMPILE=arm-linux-gnueabihf-', LF, ]) # bootloader - self.sh.cp(os.path.join(bootloader32_dir, 'boot_emm.arm'), binaries_dir) + self.sh.cp(os.path.join(bootloader32_dir, 'boot.arm'), binaries_dir) # Bootloader 64. - bootloader64_dir = os.path.join(gem5_system_source_dir, 'arm', 'aarch64_bootloader') + bootloader64_dir = os.path.join(arm_bootloader_dir, 'arm64') # TODO cross_compile is ignored because the make does not use CC... self.sh.run_cmd(['make', '-C', bootloader64_dir, LF]) - self.sh.cp(os.path.join(bootloader64_dir, 'boot_emm.arm64'), binaries_dir) - self.sh.cp(os.path.join(bootloader64_dir, 'boot_emm_v2.arm64'), binaries_dir) + self.sh.cp(os.path.join(bootloader64_dir, 'boot.arm64'), binaries_dir) + self.sh.cp(os.path.join(bootloader64_dir, 'boot_v2.arm64'), binaries_dir) term_source_dir = os.path.join(self.env['gem5_source_dir'], 'util/term') m5term_build = os.path.join(term_source_dir, 'm5term') self.sh.run_cmd(['make', '-C', term_source_dir, LF])