summaryrefslogtreecommitdiff
path: root/src/arch/arm/linux
diff options
context:
space:
mode:
authorAli Saidi <Ali.Saidi@ARM.com>2012-03-01 17:26:31 -0600
committerAli Saidi <Ali.Saidi@ARM.com>2012-03-01 17:26:31 -0600
commit91b737ed48008ed295db22c857183f040a63234c (patch)
tree03e4be02cd6846b632045b520ad7d9a588974bc9 /src/arch/arm/linux
parent3876105bdb5589360c58389ffffff9786a93a2ff (diff)
downloadgem5-91b737ed48008ed295db22c857183f040a63234c.tar.xz
ARM: Add support for Versatile Express extended memory map
Also clean up how we create boot loader memory a bit.
Diffstat (limited to 'src/arch/arm/linux')
-rw-r--r--src/arch/arm/linux/system.cc4
-rw-r--r--src/arch/arm/linux/system.hh3
2 files changed, 2 insertions, 5 deletions
diff --git a/src/arch/arm/linux/system.cc b/src/arch/arm/linux/system.cc
index a2d0c156c..4e18a265d 100644
--- a/src/arch/arm/linux/system.cc
+++ b/src/arch/arm/linux/system.cc
@@ -114,7 +114,7 @@ LinuxArmSystem::initState()
DPRINTF(Loader, "Boot atags was %d bytes in total\n", size << 2);
DDUMP(Loader, boot_data, size << 2);
- physProxy.writeBlob(ParamsList, boot_data, size << 2);
+ physProxy.writeBlob(params()->atags_addr, boot_data, size << 2);
#ifndef NDEBUG
kernelPanicEvent = addKernelFuncEvent<BreakPCEvent>("panic");
@@ -154,7 +154,7 @@ LinuxArmSystem::initState()
for (int i = 0; i < threadContexts.size(); i++) {
threadContexts[i]->setIntReg(0, 0);
threadContexts[i]->setIntReg(1, params()->machine_type);
- threadContexts[i]->setIntReg(2, ParamsList);
+ threadContexts[i]->setIntReg(2, params()->atags_addr);
}
}
diff --git a/src/arch/arm/linux/system.hh b/src/arch/arm/linux/system.hh
index 54681096b..caf018cb9 100644
--- a/src/arch/arm/linux/system.hh
+++ b/src/arch/arm/linux/system.hh
@@ -52,9 +52,6 @@
class LinuxArmSystem : public ArmSystem
{
- protected:
- static const int ParamsList = 0x100;
-
public:
/** Boilerplate params code */
typedef LinuxArmSystemParams Params;