[src/trunk]: src/sys/arch/hpcarm Eliminate all #ifdef HPCARM, and delete the ...

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

details:   https://anonhg.NetBSD.org/src/rev/ea7222482f9e
branches:  trunk
changeset: 525400:ea7222482f9e
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Wed Apr 10 20:17:23 2002 +0000

description:
Eliminate all #ifdef HPCARM, and delete the option.

diffstat:

 sys/arch/hpcarm/conf/IPAQ            |  3 +--
 sys/arch/hpcarm/conf/JORNADA720      |  5 ++---
 sys/arch/hpcarm/include/bootconfig.h |  7 +++----
 3 files changed, 6 insertions(+), 9 deletions(-)

diffs (70 lines):

diff -r 48ea14055d5a -r ea7222482f9e sys/arch/hpcarm/conf/IPAQ
--- a/sys/arch/hpcarm/conf/IPAQ Wed Apr 10 20:13:54 2002 +0000
+++ b/sys/arch/hpcarm/conf/IPAQ Wed Apr 10 20:17:23 2002 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: IPAQ,v 1.15 2002/04/02 05:30:41 lukem Exp $
+#      $NetBSD: IPAQ,v 1.16 2002/04/10 20:17:23 thorpej Exp $
 #
 #      iPAQ H3600 -- Windows-CE based PDA
 #
@@ -18,7 +18,6 @@
 options        CPU_SA1110      # Support the SA110 core
 
 # Architecture options
-options        HPCARM          # Windows-CE based
 options        SAIP            # We use SA1110 builtin peripherals
 options        SAEGPIO_BASE="0x49000000"
                                # we have Extended GPIO
diff -r 48ea14055d5a -r ea7222482f9e sys/arch/hpcarm/conf/JORNADA720
--- a/sys/arch/hpcarm/conf/JORNADA720   Wed Apr 10 20:13:54 2002 +0000
+++ b/sys/arch/hpcarm/conf/JORNADA720   Wed Apr 10 20:17:23 2002 +0000
@@ -1,11 +1,11 @@
-#      $NetBSD: JORNADA720,v 1.15 2002/04/02 05:30:41 lukem Exp $
+#      $NetBSD: JORNADA720,v 1.16 2002/04/10 20:17:23 thorpej Exp $
 #
 #      JORNADA -- Windows-CE based jornada 720
 #
 
 include        "arch/hpcarm/conf/std.hpcarm"
 
-#ident                 "GENERIC-$Revision: 1.15 $"
+#ident                 "GENERIC-$Revision: 1.16 $"
 
 # estimated number of users
 maxusers       32
@@ -21,7 +21,6 @@
 options        CPU_SA1110      # Support the SA110 core
 
 # Architecture options
-options        HPCARM          # Windows-CE based
 options        SAIP            # We use SA1110 builtin peripherals
 
 # FPA options
diff -r 48ea14055d5a -r ea7222482f9e sys/arch/hpcarm/include/bootconfig.h
--- a/sys/arch/hpcarm/include/bootconfig.h      Wed Apr 10 20:13:54 2002 +0000
+++ b/sys/arch/hpcarm/include/bootconfig.h      Wed Apr 10 20:17:23 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: bootconfig.h,v 1.1 2001/02/23 03:48:14 ichiro Exp $    */
+/*     $NetBSD: bootconfig.h,v 1.2 2002/04/10 20:17:24 thorpej Exp $   */
 
 /*
  * Copyright (c) 1994 Mark Brinicombe.
@@ -47,7 +47,7 @@
        u_int pages;
 } PhysMem;
 
-#if defined(_KERNEL) && defined(HPCARM)
+#ifdef _KERNEL
 
 #define DRAM_BLOCKS    1
 
@@ -58,8 +58,7 @@
 } BootConfig;
 
 extern BootConfig bootconfig;
-#endif  /* _KERNEL && HPCARM */
-#ifdef _KERNEL
+
 #define BOOTOPT_TYPE_BOOLEAN           0
 #define BOOTOPT_TYPE_STRING            1
 #define BOOTOPT_TYPE_INT               2