From: Choraria, Rohit Date: Fri, 16 Nov 2007 23:51:26 +0000 (-0800) Subject: ARM: OMAP: VMALLOC Size X-Git-Tag: v2.6.24-omap1~198 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=eb82773a3413d0248f5dd1e68c19bf0c99038543;p=linux-2.6-omap-h63xx.git ARM: OMAP: VMALLOC Size This patch increases the size of VMALLOC to accommodate the bigger DDR and NOR flashes being used now. Since SRAM is allocated at the end of VMALLOC area, moving the SRAM virtual address also. Signed-off-by: Rohit Choraria Signed-off-by: Tony Lindgren --- diff --git a/arch/arm/plat-omap/sram.c b/arch/arm/plat-omap/sram.c index 04d70a1b0e3..0df156fdbd0 100644 --- a/arch/arm/plat-omap/sram.c +++ b/arch/arm/plat-omap/sram.c @@ -32,11 +32,11 @@ #endif #define OMAP1_SRAM_PA 0x20000000 -#define OMAP1_SRAM_VA 0xd0000000 +#define OMAP1_SRAM_VA VMALLOC_END #define OMAP2_SRAM_PA 0x40200000 #define OMAP2_SRAM_PUB_PA 0x4020f800 -#define OMAP2_SRAM_VA 0xd0000000 -#define OMAP2_SRAM_PUB_VA 0xd0000800 +#define OMAP2_SRAM_VA VMALLOC_END +#define OMAP2_SRAM_PUB_VA (VMALLOC_END + 0x800) #if defined(CONFIG_ARCH_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX) #define SRAM_BOOTLOADER_SZ 0x00 diff --git a/include/asm-arm/arch-omap/vmalloc.h b/include/asm-arm/arch-omap/vmalloc.h index 5b8bd8dae8b..814b22625a7 100644 --- a/include/asm-arm/arch-omap/vmalloc.h +++ b/include/asm-arm/arch-omap/vmalloc.h @@ -17,5 +17,5 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#define VMALLOC_END (PAGE_OFFSET + 0x10000000) +#define VMALLOC_END (PAGE_OFFSET + 0x17000000)