Deleted Added
sdiff udiff text old ( 8713:2f1a3e335255 ) new ( 8714:cd48e2802644 )
full compact
1# Copyright (c) 2010-2012 ARM Limited
2# All rights reserved.
3#
4# The license below extends only to copyright in the software and shall
5# not be construed as granting a license to any other intellectual
6# property including but not limited to intellectual property relating
7# to a hardware implementation of the functionality of the software
8# licensed hereunder. You may use the software subject to the license

--- 70 unchanged lines hidden (view full) ---

79 self.physmem.port = self.membus.port
80 self.disk0 = CowIdeDisk(driveID='master')
81 self.disk2 = CowIdeDisk(driveID='master')
82 self.disk0.childImage(mdesc.disk())
83 self.disk2.childImage(disk('linux-bigswap2.img'))
84 self.tsunami = BaseTsunami()
85 self.tsunami.attachIO(self.iobus)
86 self.tsunami.ide.pio = self.iobus.port
87 self.tsunami.ide.config = self.iobus.port
88 self.tsunami.ide.dma = self.iobus.port
89 self.tsunami.ethernet.pio = self.iobus.port
90 self.tsunami.ethernet.config = self.iobus.port
91 self.tsunami.ethernet.dma = self.iobus.port
92 self.simple_disk = SimpleDisk(disk=RawDiskImage(image_file = mdesc.disk(),
93 read_only = True))
94 self.intrctrl = IntrControl()
95 self.mem_mode = mem_mode
96 self.terminal = Terminal()
97 self.kernel = binary('vmlinux')
98 self.pal = binary('ts_osfpal')
99 self.console = binary('console')

--- 28 unchanged lines hidden (view full) ---

128
129 self.disk0 = CowIdeDisk(driveID='master')
130 self.disk2 = CowIdeDisk(driveID='master')
131 self.disk0.childImage(mdesc.disk())
132 self.disk2.childImage(disk('linux-bigswap2.img'))
133 self.tsunami = BaseTsunami()
134 self.tsunami.attachIO(self.piobus)
135 self.tsunami.ide.pio = self.piobus.port
136 self.tsunami.ide.config = self.piobus.port
137 self.tsunami.ide.dma = self.piobus.port
138 self.tsunami.ethernet.pio = self.piobus.port
139 self.tsunami.ethernet.config = self.piobus.port
140 self.tsunami.ethernet.dma = self.piobus.port
141
142 #
143 # Store the dma devices for later connection to dma ruby ports.
144 # Append an underscore to dma_devices to avoid the SimObjectVector check.
145 #
146 self._dma_devices = [self.tsunami.ide, self.tsunami.ethernet]
147
148 self.simple_disk = SimpleDisk(disk=RawDiskImage(image_file = mdesc.disk(),

--- 178 unchanged lines hidden (view full) ---

327 self.physmem.port = self.membus.port
328 self.disk0 = CowIdeDisk(driveID='master')
329 self.disk2 = CowIdeDisk(driveID='master')
330 self.disk0.childImage(mdesc.disk())
331 self.disk2.childImage(disk('linux-bigswap2.img'))
332 self.malta = BaseMalta()
333 self.malta.attachIO(self.iobus)
334 self.malta.ide.pio = self.iobus.port
335 self.malta.ide.config = self.iobus.port
336 self.malta.ide.dma = self.iobus.port
337 self.malta.ethernet.pio = self.iobus.port
338 self.malta.ethernet.config = self.iobus.port
339 self.malta.ethernet.dma = self.iobus.port
340 self.simple_disk = SimpleDisk(disk=RawDiskImage(image_file = mdesc.disk(),
341 read_only = True))
342 self.intrctrl = IntrControl()
343 self.mem_mode = mem_mode
344 self.terminal = Terminal()
345 self.kernel = binary('mips/vmlinux')
346 self.console = binary('mips/console')
347 self.boot_osflags = 'root=/dev/hda1 console=ttyS0'

--- 299 unchanged lines hidden ---