| FSConfig.py (12564:2778478ca882) | FSConfig.py (12598:b80b2d9a251b) |
|---|---|
| 1# Copyright (c) 2010-2012, 2015-2017 ARM Limited | 1# Copyright (c) 2010-2012, 2015-2018 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 9# terms below provided that you ensure that this notice is replicated --- 311 unchanged lines hidden (view full) --- 321 'lpj=19988480 norandmaps rw loglevel=8 ' + \ 322 'mem=%(mem)s root=%(rootdev)s' 323 324 # When using external memory, gem5 writes the boot loader to nvmem 325 # and then SST will read from it, but SST can only get to nvmem from 326 # iobus, as gem5's membus is only used for initialization and 327 # SST doesn't use it. Attaching nvmem to iobus solves this issue. 328 # During initialization, system_port -> membus -> iobus -> nvmem. | 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 9# terms below provided that you ensure that this notice is replicated --- 311 unchanged lines hidden (view full) --- 321 'lpj=19988480 norandmaps rw loglevel=8 ' + \ 322 'mem=%(mem)s root=%(rootdev)s' 323 324 # When using external memory, gem5 writes the boot loader to nvmem 325 # and then SST will read from it, but SST can only get to nvmem from 326 # iobus, as gem5's membus is only used for initialization and 327 # SST doesn't use it. Attaching nvmem to iobus solves this issue. 328 # During initialization, system_port -> membus -> iobus -> nvmem. |
| 329 if external_memory or ruby: | 329 if external_memory: |
| 330 self.realview.setupBootLoader(self.iobus, self, binary) | 330 self.realview.setupBootLoader(self.iobus, self, binary) |
| 331 elif ruby: 332 self.realview.setupBootLoader(None, self, binary) |
|
| 331 else: 332 self.realview.setupBootLoader(self.membus, self, binary) 333 self.gic_cpu_addr = self.realview.gic.cpu_addr 334 self.flags_addr = self.realview.realview_io.pio_addr + 0x30 335 336 # This check is for users who have previously put 'android' in 337 # the disk image filename to tell the config scripts to 338 # prepare the kernel with android-specific boot options. That --- 42 unchanged lines hidden (view full) --- 381 self.bridge.ranges = [self.realview.nvmem.range] 382 383 self.realview.attachOnChipIO(self.iobus) 384 # Attach off-chip devices 385 self.realview.attachIO(self.iobus) 386 elif ruby: 387 self._dma_ports = [ ] 388 self.realview.attachOnChipIO(self.iobus, dma_ports=self._dma_ports) | 333 else: 334 self.realview.setupBootLoader(self.membus, self, binary) 335 self.gic_cpu_addr = self.realview.gic.cpu_addr 336 self.flags_addr = self.realview.realview_io.pio_addr + 0x30 337 338 # This check is for users who have previously put 'android' in 339 # the disk image filename to tell the config scripts to 340 # prepare the kernel with android-specific boot options. That --- 42 unchanged lines hidden (view full) --- 383 self.bridge.ranges = [self.realview.nvmem.range] 384 385 self.realview.attachOnChipIO(self.iobus) 386 # Attach off-chip devices 387 self.realview.attachIO(self.iobus) 388 elif ruby: 389 self._dma_ports = [ ] 390 self.realview.attachOnChipIO(self.iobus, dma_ports=self._dma_ports) |
| 389 # Force Ruby to treat the boot ROM as an IO device. 390 self.realview.nvmem.in_addr_map = False | |
| 391 self.realview.attachIO(self.iobus, dma_ports=self._dma_ports) 392 else: 393 self.realview.attachOnChipIO(self.membus, self.bridge) 394 # Attach off-chip devices 395 self.realview.attachIO(self.iobus) 396 397 for dev_id, dev in enumerate(pci_devices): 398 dev.pci_bus, dev.pci_dev, dev.pci_func = (0, dev_id + 1, 0) --- 342 unchanged lines hidden --- | 391 self.realview.attachIO(self.iobus, dma_ports=self._dma_ports) 392 else: 393 self.realview.attachOnChipIO(self.membus, self.bridge) 394 # Attach off-chip devices 395 self.realview.attachIO(self.iobus) 396 397 for dev_id, dev in enumerate(pci_devices): 398 dev.pci_bus, dev.pci_dev, dev.pci_func = (0, dev_id + 1, 0) --- 342 unchanged lines hidden --- |