| FSConfig.py (13606:2ad4449e6cb4) | FSConfig.py (13636:3b55e4bae1d8) |
|---|---|
| 1# Copyright (c) 2010-2012, 2015-2019 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 --- 249 unchanged lines hidden (view full) --- 258 self.realview.cf_ctrl.disks = [self.cf0] 259 else: 260 self.pci_ide = IdeController(disks=[self.cf0]) 261 pci_devices.append(self.pci_ide) 262 263 self.mem_ranges = [] 264 size_remain = long(Addr(mdesc.mem())) 265 for region in self.realview._mem_regions: | 1# Copyright (c) 2010-2012, 2015-2019 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 --- 249 unchanged lines hidden (view full) --- 258 self.realview.cf_ctrl.disks = [self.cf0] 259 else: 260 self.pci_ide = IdeController(disks=[self.cf0]) 261 pci_devices.append(self.pci_ide) 262 263 self.mem_ranges = [] 264 size_remain = long(Addr(mdesc.mem())) 265 for region in self.realview._mem_regions: |
| 266 if size_remain > long(region[1]): 267 self.mem_ranges.append(AddrRange(region[0], size=region[1])) 268 size_remain = size_remain - long(region[1]) | 266 if size_remain > long(region.size()): 267 self.mem_ranges.append(region) 268 size_remain = size_remain - long(region.size()) |
| 269 else: | 269 else: |
| 270 self.mem_ranges.append(AddrRange(region[0], size=size_remain)) | 270 self.mem_ranges.append(AddrRange(region.start, size=size_remain)) |
| 271 size_remain = 0 272 break 273 warn("Memory size specified spans more than one region. Creating" \ 274 " another memory controller for that range.") 275 276 if size_remain > 0: 277 fatal("The currently selected ARM platforms doesn't support" \ 278 " the amount of DRAM you've selected. Please try" \ --- 440 unchanged lines hidden --- | 271 size_remain = 0 272 break 273 warn("Memory size specified spans more than one region. Creating" \ 274 " another memory controller for that range.") 275 276 if size_remain > 0: 277 fatal("The currently selected ARM platforms doesn't support" \ 278 " the amount of DRAM you've selected. Please try" \ --- 440 unchanged lines hidden --- |