diff -r 818a1c7e8fd3 -r 90028c126acf configs/example/fs.py --- a/configs/example/fs.py Fri Jul 19 09:39:28 2013 +0100 +++ b/configs/example/fs.py Fri Jul 19 09:39:36 2013 +0100 @@ -174,8 +174,7 @@ # Create the appropriate memory controllers and connect them to the # memory bus -test_sys.mem_ctrls = [TestMemClass(range = r, conf_table_reported = True) - for r in test_sys.mem_ranges] +test_sys.mem_ctrls = [TestMemClass(range = r) for r in test_sys.mem_ranges] for i in xrange(len(test_sys.mem_ctrls)): test_sys.mem_ctrls[i].port = test_sys.membus.master @@ -225,7 +224,7 @@ # Create the appropriate memory controllers and connect them to the # memory bus - drive_sys.mem_ctrls = [DriveMemClass(range = r, conf_table_reported = True) + drive_sys.mem_ctrls = [DriveMemClass(range = r) for r in drive_sys.mem_ranges] for i in xrange(len(drive_sys.mem_ctrls)): drive_sys.mem_ctrls[i].port = drive_sys.membus.master diff -r 818a1c7e8fd3 -r 90028c126acf configs/example/ruby_fs.py --- a/configs/example/ruby_fs.py Fri Jul 19 09:39:28 2013 +0100 +++ b/configs/example/ruby_fs.py Fri Jul 19 09:39:36 2013 +0100 @@ -128,9 +128,7 @@ # Create the appropriate memory controllers and connect them to the # PIO bus -system.mem_ctrls = [TestMemClass(range = r, - conf_table_reported = True) - for r in system.mem_ranges] +system.mem_ctrls = [TestMemClass(range = r) for r in system.mem_ranges] for i in xrange(len(system.physmem)): system.mem_ctrls[i].port = system.piobus.master diff -r 818a1c7e8fd3 -r 90028c126acf src/dev/arm/RealView.py --- a/src/dev/arm/RealView.py Fri Jul 19 09:39:28 2013 +0100 +++ b/src/dev/arm/RealView.py Fri Jul 19 09:39:36 2013 +0100 @@ -159,8 +159,8 @@ max_mem_size = Param.Addr('256MB', "Maximum amount of RAM supported by platform") def setupBootLoader(self, mem_bus, cur_sys, loc): - self.nvmem = SimpleMemory(range = AddrRange(Addr('2GB'), - size = '64MB')) + self.nvmem = SimpleMemory(range = AddrRange('2GB', size = '64MB'), + conf_table_reported = False) self.nvmem.port = mem_bus.master cur_sys.boot_loader = loc('boot.arm') @@ -357,7 +357,8 @@ InterruptLine=2, InterruptPin=2) - vram = SimpleMemory(range = AddrRange(0x18000000, size='32MB')) + vram = SimpleMemory(range = AddrRange(0x18000000, size='32MB'), + conf_table_reported = False) rtc = PL031(pio_addr=0x1C170000, int_num=36) l2x0_fake = IsaFake(pio_addr=0x2C100000, pio_size=0xfff) @@ -372,7 +373,8 @@ mmc_fake = AmbaFake(pio_addr=0x1c050000) def setupBootLoader(self, mem_bus, cur_sys, loc): - self.nvmem = SimpleMemory(range = AddrRange(0, size = '64MB')) + self.nvmem = SimpleMemory(range = AddrRange('64MB'), + conf_table_reported = False) self.nvmem.port = mem_bus.master cur_sys.boot_loader = loc('boot_emm.arm') cur_sys.atags_addr = 0x80000100 diff -r 818a1c7e8fd3 -r 90028c126acf src/mem/AbstractMemory.py --- a/src/mem/AbstractMemory.py Fri Jul 19 09:39:28 2013 +0100 +++ b/src/mem/AbstractMemory.py Fri Jul 19 09:39:36 2013 +0100 @@ -46,7 +46,10 @@ type = 'AbstractMemory' abstract = True cxx_header = "mem/abstract_mem.hh" - range = Param.AddrRange(AddrRange('128MB'), "Address range") + + # A default memory size of 128 MB (starting at 0) is used to + # simplify the regressions + range = Param.AddrRange('128MB', "Address range (potentially interleaved)") null = Param.Bool(False, "Do not store data, always return zero") # All memories are passed to the global physical memory, and @@ -57,4 +60,4 @@ # Should the bootloader include this memory when passing # configuration information about the physical memory layout to # the kernel, e.g. using ATAG or ACPI - conf_table_reported = Param.Bool(False, "Report to configuration table") + conf_table_reported = Param.Bool(True, "Report to configuration table") diff -r 818a1c7e8fd3 -r 90028c126acf tests/configs/base_config.py --- a/tests/configs/base_config.py Fri Jul 19 09:39:28 2013 +0100 +++ b/tests/configs/base_config.py Fri Jul 19 09:39:36 2013 +0100 @@ -228,8 +228,7 @@ # create the memory controllers and connect them, stick with # the physmem name to avoid bumping all the reference stats - system.physmem = [self.mem_class(range = r, - conf_table_reported = True) + system.physmem = [self.mem_class(range = r) for r in system.mem_ranges] for i in xrange(len(system.physmem)): system.physmem[i].port = system.membus.master diff -r 818a1c7e8fd3 -r 90028c126acf tests/configs/pc-simple-timing-ruby.py --- a/tests/configs/pc-simple-timing-ruby.py Fri Jul 19 09:39:28 2013 +0100 +++ b/tests/configs/pc-simple-timing-ruby.py Fri Jul 19 09:39:36 2013 +0100 @@ -89,8 +89,7 @@ # Set access_phys_mem to True for ruby port system.ruby._cpu_ruby_ports[i].access_phys_mem = True -system.physmem = [DDR3_1600_x64(range = r, - conf_table_reported = True) +system.physmem = [DDR3_1600_x64(range = r) for r in system.mem_ranges] for i in xrange(len(system.physmem)): system.physmem[i].port = system.piobus.master diff -r 818a1c7e8fd3 -r 90028c126acf tests/configs/t1000-simple-atomic.py --- a/tests/configs/t1000-simple-atomic.py Fri Jul 19 09:39:28 2013 +0100 +++ b/tests/configs/t1000-simple-atomic.py Fri Jul 19 09:39:36 2013 +0100 @@ -42,8 +42,7 @@ # create the memory controllers and connect them, stick with # the physmem name to avoid bumping all the reference stats -system.physmem = [SimpleMemory(range = r, - conf_table_reported = True) +system.physmem = [SimpleMemory(range = r) for r in system.mem_ranges] for i in xrange(len(system.physmem)): system.physmem[i].port = system.membus.master