diff options
Diffstat (limited to 'src/dev')
| -rw-r--r-- | src/dev/alpha/backdoor.cc | 2 | ||||
| -rw-r--r-- | src/dev/arm/RealView.py | 14 | ||||
| -rw-r--r-- | src/dev/ide_disk.hh | 1 |
3 files changed, 9 insertions, 8 deletions
diff --git a/src/dev/alpha/backdoor.cc b/src/dev/alpha/backdoor.cc index 972778801..a3579847b 100644 --- a/src/dev/alpha/backdoor.cc +++ b/src/dev/alpha/backdoor.cc @@ -92,7 +92,7 @@ AlphaBackdoor::startup() alphaAccess->kernStart = system->getKernelStart(); alphaAccess->kernEnd = system->getKernelEnd(); alphaAccess->entryPoint = system->getKernelEntry(); - alphaAccess->mem_size = system->physmem->size(); + alphaAccess->mem_size = system->memSize(); alphaAccess->cpuClock = cpu->frequency() / 1000000; // In MHz Tsunami *tsunami = dynamic_cast<Tsunami *>(params()->platform); if (!tsunami) diff --git a/src/dev/arm/RealView.py b/src/dev/arm/RealView.py index 4753bf5bf..973a2cd52 100644 --- a/src/dev/arm/RealView.py +++ b/src/dev/arm/RealView.py @@ -49,7 +49,7 @@ from Ide import * from Platform import Platform from Terminal import Terminal from Uart import Uart -from PhysicalMemory import * +from SimpleMemory import SimpleMemory class AmbaDevice(BasicPioDevice): type = 'AmbaDevice' @@ -146,10 +146,11 @@ class RealView(Platform): max_mem_size = Param.Addr('256MB', "Maximum amount of RAM supported by platform") def setupBootLoader(self, mem_bus, cur_sys, loc): - self.nvmem = PhysicalMemory(range = AddrRange(Addr('2GB'), size = '64MB'), zero = True) + self.nvmem = SimpleMemory(range = AddrRange(Addr('2GB'), + size = '64MB'), + zero = True) self.nvmem.port = mem_bus.master cur_sys.boot_loader = loc('boot.arm') - cur_sys.boot_loader_mem = self.nvmem # Reference for memory map and interrupt number @@ -438,7 +439,8 @@ class VExpress_EMM(RealView): BAR0 = 0x1C1A0000, BAR0Size = '256B', BAR1 = 0x1C1A0100, BAR1Size = '4096B', BAR0LegacyIO = True, BAR1LegacyIO = True) - vram = PhysicalMemory(range = AddrRange(0x18000000, size='32MB'), zero = True) + vram = SimpleMemory(range = AddrRange(0x18000000, size='32MB'), + zero = True) rtc = PL031(pio_addr=0x1C170000, int_num=36) l2x0_fake = IsaFake(pio_addr=0x2C100000, pio_size=0xfff) @@ -453,10 +455,10 @@ class VExpress_EMM(RealView): mmc_fake = AmbaFake(pio_addr=0x1c050000) def setupBootLoader(self, mem_bus, cur_sys, loc): - self.nvmem = PhysicalMemory(range = AddrRange(0, size = '64MB'), zero = True) + self.nvmem = SimpleMemory(range = AddrRange(0, size = '64MB'), + zero = True) self.nvmem.port = mem_bus.master cur_sys.boot_loader = loc('boot_emm.arm') - cur_sys.boot_loader_mem = self.nvmem cur_sys.atags_addr = 0x80000100 # Attach I/O devices that are on chip and also set the appropriate diff --git a/src/dev/ide_disk.hh b/src/dev/ide_disk.hh index af42bd2c9..b29d13870 100644 --- a/src/dev/ide_disk.hh +++ b/src/dev/ide_disk.hh @@ -186,7 +186,6 @@ typedef enum DmaState { Dma_Transfer } DmaState_t; -class PhysicalMemory; class IdeController; /** |