diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-01-04 13:07:14 -0500 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-02-17 18:26:55 -0500 |
commit | f4117ac9e237b74afdf5e001d5ea26a4d15e9847 (patch) | |
tree | dce3ccceda23d4bf620ec3d025a14773c7c938a8 /arch/arm/mach-bcmring/include | |
parent | 6fc31d54443bdc25a8166be15e3920a7e39d195d (diff) |
ARM: P2V: separate PHYS_OFFSET from platform definitions
This uncouple PHYS_OFFSET from the platform definitions, thereby
facilitating run-time computation of the physical memory offset.
Acked-by: Nicolas Pitre <nicolas.pitre@linaro.org>
Acked-by: Viresh Kumar <viresh.kumar@st.com>
Acked-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Acked-by: Magnus Damm <damm@opensource.se>
Acked-by: Tony Lindgren <tony@atomide.com>
Acked-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Acked-by: Wan ZongShun <mcuos.com@gmail.com>
Acked-by: Kukjin Kim <kgene.kim@samsung.com>
Acked-by: Eric Miao <eric.y.miao@gmail.com>
Acked-by: Jiandong Zheng <jdzheng@broadcom.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-bcmring/include')
-rw-r--r-- | arch/arm/mach-bcmring/include/mach/hardware.h | 2 | ||||
-rw-r--r-- | arch/arm/mach-bcmring/include/mach/memory.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-bcmring/include/mach/hardware.h b/arch/arm/mach-bcmring/include/mach/hardware.h index 447eb340c611..8bf3564fba50 100644 --- a/arch/arm/mach-bcmring/include/mach/hardware.h +++ b/arch/arm/mach-bcmring/include/mach/hardware.h | |||
@@ -31,7 +31,7 @@ | |||
31 | * *_SIZE is the size of the region | 31 | * *_SIZE is the size of the region |
32 | * *_BASE is the virtual address | 32 | * *_BASE is the virtual address |
33 | */ | 33 | */ |
34 | #define RAM_START PHYS_OFFSET | 34 | #define RAM_START PLAT_PHYS_OFFSET |
35 | 35 | ||
36 | #define RAM_SIZE (CFG_GLOBAL_RAM_SIZE-CFG_GLOBAL_RAM_SIZE_RESERVED) | 36 | #define RAM_SIZE (CFG_GLOBAL_RAM_SIZE-CFG_GLOBAL_RAM_SIZE_RESERVED) |
37 | #define RAM_BASE PAGE_OFFSET | 37 | #define RAM_BASE PAGE_OFFSET |
diff --git a/arch/arm/mach-bcmring/include/mach/memory.h b/arch/arm/mach-bcmring/include/mach/memory.h index 114f942bb4f3..15162e4c75f9 100644 --- a/arch/arm/mach-bcmring/include/mach/memory.h +++ b/arch/arm/mach-bcmring/include/mach/memory.h | |||
@@ -23,7 +23,7 @@ | |||
23 | * files. Use virt_to_phys/phys_to_virt/__pa/__va instead. | 23 | * files. Use virt_to_phys/phys_to_virt/__pa/__va instead. |
24 | */ | 24 | */ |
25 | 25 | ||
26 | #define PHYS_OFFSET CFG_GLOBAL_RAM_BASE | 26 | #define PLAT_PHYS_OFFSET CFG_GLOBAL_RAM_BASE |
27 | 27 | ||
28 | /* | 28 | /* |
29 | * Maximum DMA memory allowed is 14M | 29 | * Maximum DMA memory allowed is 14M |