From 34b73dea1b144fcc5707d618acd950f7f1506806 Mon Sep 17 00:00:00 2001 From: Giacomo Travaglini Date: Mon, 4 Feb 2019 13:31:23 +0000 Subject: configs, arch-arm: Using AddrRange for Realview mem_regions Physical memory ranges are now saved in Realview objects as pairs of addresses (start address and size). This patch is substituting them with a single AddrRange object. Change-Id: I02d25d557c5c54d062f0dccef8ede45744d0ce6b Signed-off-by: Giacomo Travaglini Reviewed-by: Ciro Santilli Reviewed-on: https://gem5-review.googlesource.com/c/16206 Reviewed-by: Andreas Sandberg Maintainer: Andreas Sandberg --- src/dev/arm/RealView.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'src/dev/arm') diff --git a/src/dev/arm/RealView.py b/src/dev/arm/RealView.py index 60ae5aa89..d7ce9eba0 100644 --- a/src/dev/arm/RealView.py +++ b/src/dev/arm/RealView.py @@ -493,7 +493,7 @@ class RealView(Platform): type = 'RealView' cxx_header = "dev/arm/realview.hh" system = Param.System(Parent.any, "system") - _mem_regions = [(Addr(0), Addr('256MB'))] + _mem_regions = [ AddrRange(0, size='256MB') ] def _on_chip_devices(self): return [] @@ -703,7 +703,7 @@ class RealViewPBX(RealView): self.energy_ctrl.clk_domain = clkdomain class VExpress_EMM(RealView): - _mem_regions = [(Addr('2GB'), Addr('2GB'))] + _mem_regions = [ AddrRange('2GB', size='2GB') ] # Ranges based on excluding what is part of on-chip I/O (gic, # a9scu) @@ -837,8 +837,9 @@ class VExpress_EMM(RealView): class VExpress_EMM64(VExpress_EMM): # Three memory regions are specified totalling 512GB - _mem_regions = [(Addr('2GB'), Addr('2GB')), (Addr('34GB'), Addr('30GB')), - (Addr('512GB'), Addr('480GB'))] + _mem_regions = [ AddrRange('2GB', size='2GB'), + AddrRange('34GB', size='30GB'), + AddrRange('512GB', size='480GB') ] pci_host = GenericPciHost( conf_base=0x30000000, conf_size='256MB', conf_device_bits=12, pci_pio_base=0x2f000000) @@ -951,7 +952,7 @@ Interrupts: """ # Everything above 2GiB is memory - _mem_regions = [(Addr('2GB'), Addr('510GB'))] + _mem_regions = [ AddrRange('2GB', size='510GB') ] _off_chip_ranges = [ # CS1-CS5 -- cgit v1.2.3