diff options
Diffstat (limited to 'src/arch/arm/ArmSystem.py')
-rw-r--r-- | src/arch/arm/ArmSystem.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/arch/arm/ArmSystem.py b/src/arch/arm/ArmSystem.py index 4fa9fd858..b42f219ef 100644 --- a/src/arch/arm/ArmSystem.py +++ b/src/arch/arm/ArmSystem.py @@ -1,4 +1,4 @@ -# Copyright (c) 2009, 2012-2013, 2015 ARM Limited +# Copyright (c) 2009, 2012-2013, 2015-2017 ARM Limited # All rights reserved. # # The license below extends only to copyright in the software and shall @@ -52,7 +52,6 @@ class ArmMachineType(Enum): class ArmSystem(System): type = 'ArmSystem' cxx_header = "arch/arm/system.hh" - load_addr_mask = 0xffffffff multi_proc = Param.Bool(True, "Multiprocessor system?") boot_loader = VectorParam.String([], "File that contains the boot loader code. Zero or more files may be " @@ -83,7 +82,6 @@ class ArmSystem(System): class GenericArmSystem(ArmSystem): type = 'GenericArmSystem' cxx_header = "arch/arm/system.hh" - load_addr_mask = 0x0fffffff machine_type = Param.ArmMachineType('DTOnly', "Machine id from http://www.arm.linux.org.uk/developer/machines/") atags_addr = Param.Addr("Address where default atags structure should " \ @@ -108,6 +106,10 @@ class LinuxArmSystem(GenericArmSystem): """Dump dmesg from the simulated kernel to standard out""" pass + # Have Linux systems for ARM auto-calc their load_addr_mask for proper + # kernel relocation. + load_addr_mask = 0x0 + class FreebsdArmSystem(GenericArmSystem): type = 'FreebsdArmSystem' cxx_header = "arch/arm/freebsd/system.hh" |