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 <rohitkc@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

diff --git a/arch/arm/plat-omap/sram.c b/arch/arm/plat-omap/sram.c
index 04d70a1b0e3f5e8f9d9628ea6ed5fd9c00d326eb..0df156fdbd0959b5d3beee732ea22d4d7722efcf 100644 (file)
--- 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 5b8bd8dae8be7848c491d8aafbc759800a3767da..814b22625a7749bf23c45943bc08bdfdc5766852 100644 (file)
--- 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)