[gem5-dev] Change in gem5/gem5[develop]: configs: Update starter_fs.py for latest Arm FS binaries.
Richard Cooper has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/30814 )
Change subject: configs: Update starter_fs.py for latest Arm FS binaries.
..
configs: Update starter_fs.py for latest Arm FS binaries.
Updated the default kernel and root device names to match the latest
Arm full-system binaries available for download on the gem5 website.
Also added a command line option to allow the root device to be
specified as an optional command line argument.
Change-Id: I27f90ffaf0f4b35c5dcc4c22ac2fbd34f8a040a4
Reviewed-by: Giacomo Travaglini
Reviewed-by: Andreas Sandberg
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/30814
Maintainer: Andreas Sandberg
Tested-by: kokoro
---
M configs/example/arm/starter_fs.py
1 file changed, 9 insertions(+), 5 deletions(-)
Approvals:
Andreas Sandberg: Looks good to me, approved; Looks good to me, approved
kokoro: Regressions pass
diff --git a/configs/example/arm/starter_fs.py
b/configs/example/arm/starter_fs.py
index 3033890..8dee137 100644
--- a/configs/example/arm/starter_fs.py
+++ b/configs/example/arm/starter_fs.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2016-2017 ARM Limited
+# Copyright (c) 2016-2017, 2020 ARM Limited
# All rights reserved.
#
# The license below extends only to copyright in the software and shall
@@ -58,9 +58,9 @@
import devices
-default_dist_version = '20170616'
-default_kernel = 'vmlinux.vexpress_gem5_v1_64.' + default_dist_version
+default_kernel = 'vmlinux.arm64'
default_disk = 'linaro-minimal-aarch64.img'
+default_root_device = '/dev/vda1'
# Pre-defined CPU configurations. Each tuple must be ordered as :
(cpu_class,
@@ -112,7 +112,7 @@
# Add the PCI devices we need for this system. The base system
# doesn't have any PCI devices by default since they are assumed
-# to be added by the configurastion scripts needin them.
+# to be added by the configuration scripts needing them.
system.pci_devices = [
# Create a VirtIO block device for the system's boot
# disk. Attach the disk image using gem5's Copy-on-Write
@@ -165,7 +165,7 @@
# memory layout.
"norandmaps",
# Tell Linux where to find the root disk image.
-"root=/dev/vda",
+"root=%s" % args.root_device,
# Mount the root disk read-write by default.
"rw",
# Tell Linux about the amount of physical memory present.
@@ -206,6 +206,10 @@
parser.add_argument("--disk-image", type=str,
default=default_disk,
help="Disk to instantiate")
+parser.add_argument("--root-device", type=str,
+default=default_root_device,
+help="OS device name for root partition (default:
{})"
+ .format(default_root_device))
parser.add_argument("--script", type=str, default="",
help = "Linux bootscript")
parser.add_argument("--cpu", type=str, choices=list(cpu_types.keys()),
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/30814
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: develop
Gerrit-Change-Id: I27f90ffaf0f4b35c5dcc4c22ac2fbd34f8a040a4
Gerrit-Change-Number: 30814
Gerrit-PatchSet: 2
Gerrit-Owner: Richard Cooper
Gerrit-Reviewer: Andreas Sandberg
Gerrit-Reviewer: Giacomo Travaglini
Gerrit-Reviewer: Richard Cooper
Gerrit-Reviewer: kokoro
Gerrit-MessageType: merged
___
gem5-dev mailing list -- gem5-dev@gem5.org
To unsubscribe send an email to gem5-dev-le...@gem5.org
%(web_page_url)slistinfo%(cgiext)s/%(_internal_name)s
[gem5-dev] Change in gem5/gem5[develop]: configs: Update starter_fs.py for latest Arm FS binaries.
Hello Andreas Sandberg, Giacomo Travaglini,
I'd like you to do a code review. Please visit
https://gem5-review.googlesource.com/c/public/gem5/+/30814
to review the following change.
Change subject: configs: Update starter_fs.py for latest Arm FS binaries.
..
configs: Update starter_fs.py for latest Arm FS binaries.
Updated the default kernel and root device names to match the latest
Arm full-system binaries available for download on the gem5 website.
Also added a command line option to allow the root device to be
specified as an optional command line argument.
Change-Id: I27f90ffaf0f4b35c5dcc4c22ac2fbd34f8a040a4
Reviewed-by: Giacomo Travaglini
Reviewed-by: Andreas Sandberg
---
M configs/example/arm/starter_fs.py
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/configs/example/arm/starter_fs.py
b/configs/example/arm/starter_fs.py
index 3033890..8dee137 100644
--- a/configs/example/arm/starter_fs.py
+++ b/configs/example/arm/starter_fs.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2016-2017 ARM Limited
+# Copyright (c) 2016-2017, 2020 ARM Limited
# All rights reserved.
#
# The license below extends only to copyright in the software and shall
@@ -58,9 +58,9 @@
import devices
-default_dist_version = '20170616'
-default_kernel = 'vmlinux.vexpress_gem5_v1_64.' + default_dist_version
+default_kernel = 'vmlinux.arm64'
default_disk = 'linaro-minimal-aarch64.img'
+default_root_device = '/dev/vda1'
# Pre-defined CPU configurations. Each tuple must be ordered as :
(cpu_class,
@@ -112,7 +112,7 @@
# Add the PCI devices we need for this system. The base system
# doesn't have any PCI devices by default since they are assumed
-# to be added by the configurastion scripts needin them.
+# to be added by the configuration scripts needing them.
system.pci_devices = [
# Create a VirtIO block device for the system's boot
# disk. Attach the disk image using gem5's Copy-on-Write
@@ -165,7 +165,7 @@
# memory layout.
"norandmaps",
# Tell Linux where to find the root disk image.
-"root=/dev/vda",
+"root=%s" % args.root_device,
# Mount the root disk read-write by default.
"rw",
# Tell Linux about the amount of physical memory present.
@@ -206,6 +206,10 @@
parser.add_argument("--disk-image", type=str,
default=default_disk,
help="Disk to instantiate")
+parser.add_argument("--root-device", type=str,
+default=default_root_device,
+help="OS device name for root partition (default:
{})"
+ .format(default_root_device))
parser.add_argument("--script", type=str, default="",
help = "Linux bootscript")
parser.add_argument("--cpu", type=str, choices=list(cpu_types.keys()),
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/30814
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: develop
Gerrit-Change-Id: I27f90ffaf0f4b35c5dcc4c22ac2fbd34f8a040a4
Gerrit-Change-Number: 30814
Gerrit-PatchSet: 1
Gerrit-Owner: Richard Cooper
Gerrit-Reviewer: Andreas Sandberg
Gerrit-Reviewer: Giacomo Travaglini
Gerrit-MessageType: newchange
___
gem5-dev mailing list -- gem5-dev@gem5.org
To unsubscribe send an email to gem5-dev-le...@gem5.org
%(web_page_url)slistinfo%(cgiext)s/%(_internal_name)s
