use the same va entry point on all armv7 socs

Similiar changes were made in bitrig by Patrick Wildt.

As part of this change the physical load address for imx and sunxi have
changed.  Any u-boot settings that include it will need to be modified.

imx: 0x10800000 -> 0x10300000
sunxi: 0x40800000 -> 0x40300000

Tested by bmercer, canacar and myself.
ok bmercer@

1 files changed, 1 insertions, 41 deletions

diff --git a/sys/arch/armv7/omap/omap_machdep.c b/sys/arch/armv7/omap/omap_machdep.c
index f3bb79d78e5..ca67d37d138 100644
--- a/sys/arch/armv7/omap/omap_machdep.c
+++ b/sys/arch/armv7/omap/omap_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: omap_machdep.c,v 1.4 2015/05/15 15:35:43 jsg Exp $	*/
+/*	$OpenBSD: omap_machdep.c,v 1.5 2015/05/19 00:05:59 jsg Exp $	*/
 /*
  * Copyright (c) 2013 Sylvestre Gallon <ccna.syl@gmail.com>
  *
@@ -96,46 +96,6 @@ platform_board_name(void)
 }
 
 void
-platform_bootconfig_dram(BootConfig *bootconfig, psize_t *memstart, psize_t *memsize)
-{
-	uint32_t sdrc_mcfg_0, sdrc_mcfg_1, memsize0, memsize1;
-	int loop;
-
-	if (bootconfig->dramblocks == 0) {
-		sdrc_mcfg_0 = *(uint32_t *)0x6d000080;
-		sdrc_mcfg_1 = *(uint32_t *)0x6d0000b0;
-		memsize0 = (((sdrc_mcfg_0 >> 8))&0x3ff) * (2 * 1024 * 1024);
-		memsize1 = (((sdrc_mcfg_1 >> 8))&0x3ff) * (2 * 1024 * 1024);
-		*memsize = memsize0 + memsize1;
-
-		*memstart = SDRAM_START;
-		*memsize =  0x02000000; /* 32MB */
-		/* Fake bootconfig structure for the benefit of pmap.c */
-		/* XXX must make the memory description h/w independant */
-		bootconfig->dram[0].address = *memstart;
-		bootconfig->dram[0].pages = memsize0 / PAGE_SIZE;
-		bootconfig->dramblocks = 1;
-		if (memsize1 != 0) {
-			bootconfig->dram[1].address = bootconfig->dram[0].address
-			    + memsize0; /* XXX */
-			bootconfig->dram[1].pages = memsize1 / PAGE_SIZE;
-			bootconfig->dramblocks++; /* both banks populated */
-		}
-	} else {
-		/* doesn't deal with multiple segments, hopefully u-boot collaped them into one */
-		*memstart = bootconfig->dram[0].address;
-		*memsize = bootconfig->dram[0].pages * PAGE_SIZE;
-		printf("memory size derived from u-boot\n");
-		for (loop = 0; loop < bootconfig->dramblocks; loop++) {
-			printf("bootconf.mem[%d].address = %08x pages %d/0x%08x\n",
-			    loop, bootconfig->dram[0].address, bootconfig->dram[0].pages,
-			        bootconfig->dram[0].pages * PAGE_SIZE);
-		}
-	}
-
-}
-
-void
 platform_disable_l2_if_needed(void)
 {
 	switch (board_id) {