diff --git a/build-crosstool-ng b/build-crosstool-ng index d074727f..5a061c24 100755 --- a/build-crosstool-ng +++ b/build-crosstool-ng @@ -38,7 +38,7 @@ def main(args, extra_args=None): assert common.run_cmd( [ 'make', - '-j', str(nproc) + '-j', str(nproc), ], ) == 0 @@ -66,7 +66,7 @@ def main(args, extra_args=None): [ common.crosstool_ng_executable, 'build', - '-j', str(nproc) + 'CT_JOBS={}'.format(str(nproc)), ], out_file=os.path.join(common.crosstool_ng_build_dir, 'lkmc.log'), delete_env=['LD_LIBRARY_PATH'], diff --git a/run b/run index 018bb14b..d141a329 100755 --- a/run +++ b/run @@ -176,7 +176,7 @@ def main(args, extra_args=None): # Anything smaller than physical blows up as expected, but why can't it auto-detect the right value? cmd += [ '--command-line', 'earlyprintk=pl011,0x1c090000 console=ttyAMA0 lpj=19988480 rw loglevel=8 mem={} root=/dev/sda {}'.format(memory, kernel_cli), - '--dtb-file', os.path.join(common.gem5_system_dir, 'arm', 'dt', 'armv{}_gem5_v1_{}cpu.dtb'.format(common.armv, args.cpus)), + '--dtb-filename', os.path.join(common.gem5_system_dir, 'arm', 'dt', 'armv{}_gem5_v1_{}cpu.dtb'.format(common.armv, args.cpus)), '--machine-type', common.machine, ] if not args.baremetal is None: