Deleted Added
sdiff udiff text old ( 8706:b1838faf3bcc ) new ( 8713:2f1a3e335255 )
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

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

51 self.image.child.image_file = ci
52
53class MemBus(Bus):
54 badaddr_responder = BadAddr()
55 default = Self.badaddr_responder.pio
56
57
58def makeLinuxAlphaSystem(mem_mode, mdesc = None):
59 class BaseTsunami(Tsunami):
60 ethernet = NSGigE(pci_bus=0, pci_dev=1, pci_func=0)
61 ide = IdeController(disks=[Parent.disk0, Parent.disk2],
62 pci_func=0, pci_dev=0, pci_bus=0)
63
64 self = LinuxAlphaSystem()
65 if not mdesc:
66 # generic system
67 mdesc = SysConfig()
68 self.readfile = mdesc.script()
69 self.iobus = Bus(bus_id=0)
70 self.membus = MemBus(bus_id=1)
71 self.bridge = Bridge(delay='50ns', nack_delay='4ns')
72 self.physmem = PhysicalMemory(range = AddrRange(mdesc.mem()))
73 self.bridge.side_a = self.iobus.port
74 self.bridge.side_b = self.membus.port
75 self.physmem.port = self.membus.port
76 self.disk0 = CowIdeDisk(driveID='master')
77 self.disk2 = CowIdeDisk(driveID='master')
78 self.disk0.childImage(mdesc.disk())
79 self.disk2.childImage(disk('linux-bigswap2.img'))
80 self.tsunami = BaseTsunami()
81 self.tsunami.attachIO(self.iobus)
82 self.tsunami.ide.pio = self.iobus.port

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

141 self.kernel = binary('vmlinux')
142 self.pal = binary('ts_osfpal')
143 self.console = binary('console')
144 self.boot_osflags = 'root=/dev/hda1 console=ttyS0'
145
146 return self
147
148def makeSparcSystem(mem_mode, mdesc = None):
149 class CowMmDisk(MmDisk):
150 image = CowDiskImage(child=RawDiskImage(read_only=True),
151 read_only=False)
152
153 def childImage(self, ci):
154 self.image.child.image_file = ci
155
156 self = SparcSystem()

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

161 self.iobus = Bus(bus_id=0)
162 self.membus = MemBus(bus_id=1)
163 self.bridge = Bridge(delay='50ns', nack_delay='4ns')
164 self.t1000 = T1000()
165 self.t1000.attachOnChipIO(self.membus)
166 self.t1000.attachIO(self.iobus)
167 self.physmem = PhysicalMemory(range = AddrRange(Addr('1MB'), size = '64MB'), zero = True)
168 self.physmem2 = PhysicalMemory(range = AddrRange(Addr('2GB'), size ='256MB'), zero = True)
169 self.bridge.side_a = self.iobus.port
170 self.bridge.side_b = self.membus.port
171 self.physmem.port = self.membus.port
172 self.physmem2.port = self.membus.port
173 self.rom.port = self.membus.port
174 self.nvram.port = self.membus.port
175 self.hypervisor_desc.port = self.membus.port
176 self.partition_desc.port = self.membus.port
177 self.intrctrl = IntrControl()
178 self.disk0 = CowMmDisk()
179 self.disk0.childImage(disk('disk.s10hw2'))
180 self.disk0.pio = self.iobus.port
181 self.reset_bin = binary('reset_new.bin')
182 self.hypervisor_bin = binary('q_new.bin')
183 self.openboot_bin = binary('openboot_new.bin')
184 self.nvram_bin = binary('nvram1')
185 self.hypervisor_desc_bin = binary('1up-hv.bin')
186 self.partition_desc_bin = binary('1up-md.bin')
187
188 self.system_port = self.membus.port

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

201 # generic system
202 mdesc = SysConfig()
203
204 self.readfile = mdesc.script()
205 self.iobus = Bus(bus_id=0)
206 self.membus = MemBus(bus_id=1)
207 self.membus.badaddr_responder.warn_access = "warn"
208 self.bridge = Bridge(delay='50ns', nack_delay='4ns')
209 self.bridge.side_a = self.iobus.port
210 self.bridge.side_b = self.membus.port
211
212 self.mem_mode = mem_mode
213
214 if machine_type == "RealView_PBX":
215 self.realview = RealViewPBX()
216 elif machine_type == "RealView_EB":
217 self.realview = RealViewEB()
218 elif machine_type == "VExpress_ELT":

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

256 self.gic_cpu_addr = self.realview.gic.cpu_addr
257 self.flags_addr = self.realview.realview_io.pio_addr + 0x30
258
259 if mdesc.disk().lower().count('android'):
260 boot_flags += " init=/init "
261 self.boot_osflags = boot_flags
262
263 self.physmem.port = self.membus.port
264 self.realview.attachOnChipIO(self.membus)
265 self.realview.attachIO(self.iobus)
266 self.intrctrl = IntrControl()
267 self.terminal = Terminal()
268 self.vncserver = VncServer()
269
270 self.system_port = self.membus.port
271
272 return self

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

282 if not mdesc:
283 # generic system
284 mdesc = SysConfig()
285 self.readfile = mdesc.script()
286 self.iobus = Bus(bus_id=0)
287 self.membus = MemBus(bus_id=1)
288 self.bridge = Bridge(delay='50ns', nack_delay='4ns')
289 self.physmem = PhysicalMemory(range = AddrRange('1GB'))
290 self.bridge.side_a = self.iobus.port
291 self.bridge.side_b = self.membus.port
292 self.physmem.port = self.membus.port
293 self.disk0 = CowIdeDisk(driveID='master')
294 self.disk2 = CowIdeDisk(driveID='master')
295 self.disk0.childImage(mdesc.disk())
296 self.disk2.childImage(disk('linux-bigswap2.img'))
297 self.malta = BaseMalta()
298 self.malta.attachIO(self.iobus)
299 self.malta.ide.pio = self.iobus.port

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

311
312 return self
313
314def x86IOAddress(port):
315 IO_address_space_base = 0x8000000000000000
316 return IO_address_space_base + port
317
318def connectX86ClassicSystem(x86_sys):
319 x86_sys.membus = MemBus(bus_id=1)
320 x86_sys.physmem.port = x86_sys.membus.port
321
322 # North Bridge
323 x86_sys.iobus = Bus(bus_id=0)
324 x86_sys.bridge = Bridge(delay='50ns', nack_delay='4ns')
325 x86_sys.bridge.side_a = x86_sys.iobus.port
326 x86_sys.bridge.side_b = x86_sys.membus.port
327
328 # connect the io bus
329 x86_sys.pc.attachIO(x86_sys.iobus)
330
331 x86_sys.system_port = x86_sys.membus.port
332
333def connectX86RubySystem(x86_sys):
334 # North Bridge
335 x86_sys.piobus = Bus(bus_id=0)

--- 244 unchanged lines hidden ---