Éder F. Zulian has uploaded this change for review. (
https://gem5-review.googlesource.com/4540
Change subject: config, arm: get kernel from cmdline if specified
......................................................................
config, arm: get kernel from cmdline if specified
Some boards have a default kernel file. If the kernel is provided by the
user
in the command line it will be used instead of the default one.
Change-Id: Ie897ec055b4617c16aaf8188c365a7f40a19134b
---
M configs/common/FSConfig.py
M configs/example/fs.py
2 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/configs/common/FSConfig.py b/configs/common/FSConfig.py
index c08353a..8cfa2a3 100644
--- a/configs/common/FSConfig.py
+++ b/configs/common/FSConfig.py
@@ -203,8 +203,9 @@
return self
def makeArmSystem(mem_mode, machine_type, num_cpus=1, mdesc=None,
- dtb_filename=None, bare_metal=False, cmdline=None,
- external_memory="", ruby=False, security=False):
+ dtb_filename=None, kernel=None, bare_metal=False,
+ cmdline=None, external_memory="", ruby=False,
+ security=False):
assert machine_type
default_dtbs = {
@@ -302,8 +303,9 @@
# EOT character on UART will end the simulation
self.realview.uart.end_on_eot = True
else:
- if machine_type in default_kernels:
- self.kernel = binary(default_kernels[machine_type])
+ if not kernel:
+ if machine_type in default_kernels:
+ self.kernel = binary(default_kernels[machine_type])
if dtb_filename:
self.dtb_filename = binary(dtb_filename)
diff --git a/configs/example/fs.py b/configs/example/fs.py
index 6507937..f7ea4c5 100644
--- a/configs/example/fs.py
+++ b/configs/example/fs.py
@@ -96,7 +96,8 @@
options.ruby, cmdline=cmdline)
elif buildEnv['TARGET_ISA'] == "arm":
test_sys = makeArmSystem(test_mem_mode, options.machine_type,
- options.num_cpus, bm[0],
options.dtb_filename,
+ options.num_cpus, bm[0],
+ options.dtb_filename, options.kernel,
bare_metal=options.bare_metal,
cmdline=cmdline,
external_memory=options.external_memory_system,
@@ -254,7 +255,8 @@
cmdline=cmdline)
elif buildEnv['TARGET_ISA'] == 'arm':
drive_sys = makeArmSystem(drive_mem_mode, options.machine_type, np,
- bm[1], options.dtb_filename,
cmdline=cmdline)
+ bm[1], options.dtb_filename,
options.kernel,
+ cmdline=cmdline)
# Create a top-level voltage domain
drive_sys.voltage_domain = VoltageDomain(voltage = options.sys_voltage)
--
To view, visit https://gem5-review.googlesource.com/4540
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie897ec055b4617c16aaf8188c365a7f40a19134b
Gerrit-Change-Number: 4540
Gerrit-PatchSet: 1
Gerrit-Owner: Éder F. Zulian <[email protected]>
_______________________________________________
gem5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/gem5-dev
