[src/trunk]: src/sys/arch/evbarm/smdk2xx0 move a few definitions to smdk2800v...

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

details:   https://anonhg.NetBSD.org/src/rev/6332ecdd9870
branches:  trunk
changeset: 574752:6332ecdd9870
user:      bsh <bsh%NetBSD.org@localhost>
date:      Fri Mar 11 14:28:52 2005 +0000

description:
move a few definitions to smdk2800var.h to share them between smdk2800_machdep.c and smdk2800_start.S

diffstat:

 sys/arch/evbarm/smdk2xx0/smdk2800_machdep.c |  22 +++----------
 sys/arch/evbarm/smdk2xx0/smdk2800_start.S   |  11 +++---
 sys/arch/evbarm/smdk2xx0/smdk2800var.h      |  47 +++++++++++++++++++++++++++++
 3 files changed, 57 insertions(+), 23 deletions(-)

diffs (133 lines):

diff -r 37b40b24d400 -r 6332ecdd9870 sys/arch/evbarm/smdk2xx0/smdk2800_machdep.c
--- a/sys/arch/evbarm/smdk2xx0/smdk2800_machdep.c       Fri Mar 11 13:28:25 2005 +0000
+++ b/sys/arch/evbarm/smdk2xx0/smdk2800_machdep.c       Fri Mar 11 14:28:52 2005 +0000
@@ -1,8 +1,8 @@
-/*     $NetBSD: smdk2800_machdep.c,v 1.19 2004/12/12 21:03:06 abs Exp $ */
+/*     $NetBSD: smdk2800_machdep.c,v 1.20 2005/03/11 14:28:52 bsh Exp $ */
 
 /*
- * Copyright (c) 2002 Fujitsu Component Limited
- * Copyright (c) 2002 Genetec Corporation
+ * Copyright (c) 2002, 2003, 2005 Fujitsu Component Limited
+ * Copyright (c) 2002, 2003, 2005 Genetec Corporation
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -106,7 +106,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: smdk2800_machdep.c,v 1.19 2004/12/12 21:03:06 abs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: smdk2800_machdep.c,v 1.20 2005/03/11 14:28:52 bsh Exp $");
 
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
@@ -149,22 +149,10 @@
 
 #include <arm/s3c2xx0/s3c2800reg.h>
 #include <arm/s3c2xx0/s3c2800var.h>
+#include <evbarm/smdk2xx0/smdk2800var.h>
 
 #include "ksyms.h"
 
-#ifndef        SDRAM_START
-#define        SDRAM_START     S3C2800_DBANK0_START
-#endif
-#ifndef        SDRAM_SIZE
-#define        SDRAM_SIZE      (32*1024*1024)
-#endif
-
-/*
- * Address to map I/O registers in early initialize stage.
- */
-#define        SMDK2800_IO_AREA_VBASE  0xfd000000
-#define SMDK2800_VBASE_FREE    0xfd200000
-
 /* 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 + 0x01000000)
diff -r 37b40b24d400 -r 6332ecdd9870 sys/arch/evbarm/smdk2xx0/smdk2800_start.S
--- a/sys/arch/evbarm/smdk2xx0/smdk2800_start.S Fri Mar 11 13:28:25 2005 +0000
+++ b/sys/arch/evbarm/smdk2xx0/smdk2800_start.S Fri Mar 11 14:28:52 2005 +0000
@@ -1,8 +1,8 @@
-/*     $NetBSD: smdk2800_start.S,v 1.4 2003/06/18 03:17:49 bsh Exp $ */
+/*     $NetBSD: smdk2800_start.S,v 1.5 2005/03/11 14:28:52 bsh Exp $ */
 
 /*
- * Copyright (c) 2002 Fujitsu Component Limited
- * Copyright (c) 2002 Genetec Corporation
+ * Copyright (c) 2002, 2005 Fujitsu Component Limited
+ * Copyright (c) 2002, 2005 Genetec Corporation
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -39,6 +39,8 @@
 
 #include <arm/s3c2xx0/s3c2800reg.h>    /* for S3C2800_DBANK0_START */
 
+#include <evbarm/smdk2xx0/smdk2800var.h>
+
 /*
  * Kernel start routine for Samsung SMDK2800.
  * This code is excuted at the very first after the kernel is loaded
@@ -46,9 +48,6 @@
  */
        .text
 
-#ifndef        SDRAM_START
-#define        SDRAM_START     S3C2800_DBANK0_START
-#endif
 #define KERNEL_TEXT_ADDR       (SDRAM_START+0x00200000)
 
        .global _C_LABEL(smdk2800_start)
diff -r 37b40b24d400 -r 6332ecdd9870 sys/arch/evbarm/smdk2xx0/smdk2800var.h
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/evbarm/smdk2xx0/smdk2800var.h    Fri Mar 11 14:28:52 2005 +0000
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2005  Genetec Corporation.  All rights reserved.
+ * Written by Hiroyuki Bessho for Genetec Corporation.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of Genetec Corporation may not be used to endorse or 
+ *    promote products derived from this software without specific prior
+ *    written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY GENETEC CORPORATION ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL GENETEC CORPORATION
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+
+#ifndef        _EVBARM_SMDK2XX0_SMDK2800VAR_H
+#define        _EVBARM_SMDK2XX0_SMDK2800VAR_H
+
+#ifndef        SDRAM_START
+#define        SDRAM_START     S3C2800_DBANK0_START
+#endif
+#ifndef        SDRAM_SIZE
+#define        SDRAM_SIZE      (32*1024*1024)
+#endif
+
+/*
+ * Address to map I/O registers in early initialize stage.
+ */
+#define        SMDK2800_IO_AREA_VBASE  0xfd000000
+#define SMDK2800_VBASE_FREE    0xfd200000
+
+#endif /* _EVBARM_SMDK2XX0_SMDK2800VAR_H */