Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f4117ac9 authored by Russell King's avatar Russell King
Browse files

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: default avatarNicolas Pitre <nicolas.pitre@linaro.org>
Acked-by: default avatarViresh Kumar <viresh.kumar@st.com>
Acked-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Acked-by: default avatarMagnus Damm <damm@opensource.se>
Acked-by: default avatarTony Lindgren <tony@atomide.com>
Acked-by: default avatarJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Acked-by: default avatarWan ZongShun <mcuos.com@gmail.com>
Acked-by: default avatarKukjin Kim <kgene.kim@samsung.com>
Acked-by: default avatarEric Miao <eric.y.miao@gmail.com>
Acked-by: default avatarJiandong Zheng <jdzheng@broadcom.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 6fc31d54

arch/arm/include/asm/memory.h

+2 −0
Original line number Diff line number Diff line
@@ -24,6 +24,8 @@ 
 */

#define UL(x) _AC(x, UL)



#define PHYS_OFFSET	PLAT_PHYS_OFFSET



#ifdef CONFIG_MMU



/*

arch/arm/kernel/tcm.c

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
#include <linux/string.h> /* memcpy */

#include <asm/cputype.h>

#include <asm/mach/map.h>

#include <mach/memory.h>

#include <asm/memory.h>

#include "tcm.h"



static struct gen_pool *tcm_pool;

arch/arm/mach-aaec2000/include/mach/memory.h

+1 −1
Original line number Diff line number Diff line
@@ -12,6 +12,6 @@ 
#define __ASM_ARCH_MEMORY_H





#define PHYS_OFFSET	UL(0xf0000000)

#define PLAT_PHYS_OFFSET	UL(0xf0000000)



#endif /* __ASM_ARCH_MEMORY_H */

arch/arm/mach-at91/include/mach/memory.h

+1 −1
Original line number Diff line number Diff line
@@ -23,6 +23,6 @@ 


#include <mach/hardware.h>



#define PHYS_OFFSET	(AT91_SDRAM_BASE)

#define PLAT_PHYS_OFFSET	(AT91_SDRAM_BASE)



#endif

arch/arm/mach-bcmring/include/mach/hardware.h

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ 
 *  *_SIZE  is the size of the region

 *  *_BASE  is the virtual address

 */

#define RAM_START               PHYS_OFFSET

#define RAM_START               PLAT_PHYS_OFFSET



#define RAM_SIZE                (CFG_GLOBAL_RAM_SIZE-CFG_GLOBAL_RAM_SIZE_RESERVED)

#define RAM_BASE                PAGE_OFFSET