Changeset 741b2fb1 in mainline


Ignore:
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:
2 edited

Legend:

Unmodified
Added
Removed
  • contrib/gem5/build-from-scratch.sh

    r8b420fa r741b2fb1  
    107107)
    108108
    109 echo "==== Creating phony disk image ===="
    110 
    111 (
    112     mkdir -p disks;
    113     touch disks/disk.s10hw2
    114 )
    115 
    116109echo "==== Copying configs ===="
    117110
  • contrib/gem5/disk-image.patch

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