[src/trunk]: src/sys/arch/hpcarm The capacity of RAM is decided according to ...

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

details:   https://anonhg.NetBSD.org/src/rev/98edee4ab2e8
branches:  trunk
changeset: 754250:98edee4ab2e8
user:      nonaka <nonaka%NetBSD.org@localhost>
date:      Sat Apr 24 21:52:34 2010 +0000

description:
The capacity of RAM is decided according to the model.

diffstat:

 sys/arch/hpcarm/conf/WZERO3                 |   8 ++------
 sys/arch/hpcarm/hpcarm/pxa2x0_hpc_machdep.c |  14 ++++++++++++--
 2 files changed, 14 insertions(+), 8 deletions(-)

diffs (57 lines):

diff -r 3d7342cc3fed -r 98edee4ab2e8 sys/arch/hpcarm/conf/WZERO3
--- a/sys/arch/hpcarm/conf/WZERO3       Sat Apr 24 21:51:56 2010 +0000
+++ b/sys/arch/hpcarm/conf/WZERO3       Sat Apr 24 21:52:34 2010 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: WZERO3,v 1.1 2010/04/17 13:36:21 nonaka Exp $
+#      $NetBSD: WZERO3,v 1.2 2010/04/24 21:52:34 nonaka Exp $
 #
 #      WZERO3 -- Sharp Windows Mobile 5 based PDA
 #
@@ -7,11 +7,7 @@
 
 #options       INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident                 "GENERIC-$Revision: 1.1 $"
-
-# memory size
-options        DRAM_PAGES="16384"      # 4Ki * 16384page = 64MiB
-#options       DRAM_PAGES="32768"      # 4Ki * 32768page = 128MiB (WS011SH)
+#ident                 "GENERIC-$Revision: 1.2 $"
 
 # estimated number of users
 maxusers       32
diff -r 3d7342cc3fed -r 98edee4ab2e8 sys/arch/hpcarm/hpcarm/pxa2x0_hpc_machdep.c
--- a/sys/arch/hpcarm/hpcarm/pxa2x0_hpc_machdep.c       Sat Apr 24 21:51:56 2010 +0000
+++ b/sys/arch/hpcarm/hpcarm/pxa2x0_hpc_machdep.c       Sat Apr 24 21:52:34 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pxa2x0_hpc_machdep.c,v 1.1 2010/04/17 13:36:21 nonaka Exp $    */
+/*     $NetBSD: pxa2x0_hpc_machdep.c,v 1.2 2010/04/24 21:52:34 nonaka 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.1 2010/04/17 13:36:21 nonaka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pxa2x0_hpc_machdep.c,v 1.2 2010/04/24 21:52:34 nonaka Exp $");
 
 #include "opt_ddb.h"
 #include "opt_dram_pages.h"
@@ -437,6 +437,16 @@
        bootconfig.dram[0].pages = DRAM_PAGES;
        bootconfig.dramblocks = 1;
 
+       if (platid_match(&platid, &platid_mask_MACH_SHARP_WZERO3_WS003SH)
+        || platid_match(&platid, &platid_mask_MACH_SHARP_WZERO3_WS004SH)
+        || platid_match(&platid, &platid_mask_MACH_SHARP_WZERO3_WS007SH)) {
+               bootconfig.dram[0].pages = 16384; /* 64MiB */
+       } else
+       if (platid_match(&platid, &platid_mask_MACH_SHARP_WZERO3_WS011SH)
+        || platid_match(&platid, &platid_mask_MACH_SHARP_WZERO3_WS020SH)) {
+               bootconfig.dram[0].pages = 32768; /* 128MiB */
+       }
+
        kerneldatasize = (uint32_t)&end - (uint32_t)KERNEL_TEXT_BASE;
        symbolsize = 0;
 #if NKSYMS || defined(DDB) || defined(MODULAR)