[src/netbsd-6]: src/sys/arch/hpcarm/hpcarm Pull up following revision(s) (req...

[riz <riz%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/af4b3786cff6
branches:  netbsd-6
changeset: 773900:af4b3786cff6
user:      riz <riz%NetBSD.org@localhost>
date:      Thu Mar 08 17:25:46 2012 +0000

description:
Pull up following revision(s) (requested by nonaka in ticket #94):
        sys/arch/hpcarm/hpcarm/pxa2x0_hpc_machdep.c: revision 1.14
increase kernel VM space.
fixed problem can't boot on WS011SH (probably other 128MB RAM model too).

diffstat:

 sys/arch/hpcarm/hpcarm/pxa2x0_hpc_machdep.c |  20 +++++++++++++-------
 1 files changed, 13 insertions(+), 7 deletions(-)

diffs (48 lines):

diff -r e3457dec3272 -r af4b3786cff6 sys/arch/hpcarm/hpcarm/pxa2x0_hpc_machdep.c
--- a/sys/arch/hpcarm/hpcarm/pxa2x0_hpc_machdep.c       Thu Mar 08 17:23:35 2012 +0000
+++ b/sys/arch/hpcarm/hpcarm/pxa2x0_hpc_machdep.c       Thu Mar 08 17:25:46 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pxa2x0_hpc_machdep.c,v 1.13 2011/07/19 15:37:39 dyoung Exp $   */
+/*     $NetBSD: pxa2x0_hpc_machdep.c,v 1.13.8.1 2012/03/08 17:25:46 riz Exp $  */
 
 /*
  * Copyright (c) 1994-1998 Mark Brinicombe.
@@ -40,7 +40,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pxa2x0_hpc_machdep.c,v 1.13 2011/07/19 15:37:39 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pxa2x0_hpc_machdep.c,v 1.13.8.1 2012/03/08 17:25:46 riz Exp $");
 
 #include "opt_ddb.h"
 #include "opt_dram_pages.h"
@@ -102,8 +102,15 @@
 
 /* Kernel text starts 2MB in from the bottom of the kernel address space. */
 #define        KERNEL_TEXT_BASE        (KERNEL_BASE + 0x00200000)
-#define        KERNEL_VM_BASE          (KERNEL_BASE + 0x00C00000)
-#define        KERNEL_VM_SIZE          0x05000000
+#ifndef        KERNEL_VM_BASE
+#define        KERNEL_VM_BASE          (KERNEL_BASE + 0x01000000)
+#endif
+
+/*
+ * The range 0xc1000000 - 0xccffffff is available for kernel VM space
+ * Core-logic registers and I/O mappings occupy 0xfd000000 - 0xffffffff
+ */
+#define        KERNEL_VM_SIZE          0x0c000000
 
 /*
  * Address to call from cpu_reset() to reset the machine.
@@ -148,9 +155,8 @@
 extern int pmap_debug_level;
 #endif /* PMAP_DEBUG */
 
-#define        KERNEL_PT_VMEM          0       /* Page table for mapping video memory */
-#define        KERNEL_PT_SYS           1       /* Page table for mapping proc0 zero page */
-#define        KERNEL_PT_KERNEL        2       /* Page table for mapping kernel */
+#define        KERNEL_PT_SYS           0       /* Page table for mapping proc0 zero page */
+#define        KERNEL_PT_KERNEL        1       /* Page table for mapping kernel */
 #define        KERNEL_PT_KERNEL_NUM    4
 #define        KERNEL_PT_VMDATA        (KERNEL_PT_KERNEL + KERNEL_PT_KERNEL_NUM)
                                        /* Page tables for mapping kernel VM */