Changeset 741b2fb1 in mainline

Timestamp:

2016-06-13T08:19:24Z (8 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

401840b

Parents:

8b420fa

Message:

gem5: A better way to make the —disk-image option take effect

Location:

contrib/gem5

Files:

• build-from-scratch.sh (modified) (1 diff)
• disk-image.patch (modified) (1 diff)

contrib/gem5/build-from-scratch.sh

@@ -107 +107 @@
 )
 
-echo "==== Creating phony disk image ===="
-
-(
-    mkdir -p disks;
-    touch disks/disk.s10hw2
-)
-
 echo "==== Copying configs ===="
 

contrib/gem5/disk-image.patch

@@ -1 @@
-diff -r d1f8610cdffd configs/example/fs.py
---- a/configs/example/fs.py     Fri Jan 15 11:30:13 2016 +0000
-+++ b/configs/example/fs.py     Sun Jan 17 19:11:50 2016 +0100
-@@ -123,6 +123,9 @@
-                                              voltage_domain =
-                                              test_sys.cpu_voltage_domain)
+diff -r a22c4bac7e15 configs/common/FSConfig.py
+--- a/configs/common/FSConfig.py        Sat May 07 14:43:06 2016 -0400
++++ b/configs/common/FSConfig.py        Sun Jun 12 22:35:43 2016 +0200
+@@ -169,7 +169,7 @@
+     self.partition_desc.port = self.membus.master
+     self.intrctrl = IntrControl()
+     self.disk0 = CowMmDisk()
+-    self.disk0.childImage(disk('disk.s10hw2'))
++    self.disk0.childImage(mdesc.disk())
+     self.disk0.pio = self.iobus.master
  
-+    if options.disk_image is not None:
-+        test_sys.disk0.childImage(disk(options.disk_image))
-+
-     if options.kernel is not None:
-         test_sys.kernel = binary(options.kernel)
- 
+     # The puart0 and hvuart are placed on the IO bus, so create ranges