CVS commit: src/sys/arch/hpcarm/hpcarm

2020-11-21 Thread Jason R Thorpe 
Module Name:src
Committed By:   thorpej
Date:   Sat Nov 21 21:27:09 UTC 2020

Modified Files:
src/sys/arch/hpcarm/hpcarm: softintr.c

Log Message:
Fix paste-o in last.


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/hpcarm/hpcarm/softintr.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/hpcarm/hpcarm/softintr.c
diff -u src/sys/arch/hpcarm/hpcarm/softintr.c:1.17 src/sys/arch/hpcarm/hpcarm/softintr.c:1.18
--- src/sys/arch/hpcarm/hpcarm/softintr.c:1.17	Sat Nov 21 21:25:33 2020
+++ src/sys/arch/hpcarm/hpcarm/softintr.c	Sat Nov 21 21:27:09 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: softintr.c,v 1.17 2020/11/21 21:25:33 thorpej Exp $	*/
+/*	$NetBSD: softintr.c,v 1.18 2020/11/21 21:27:09 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: softintr.c,v 1.17 2020/11/21 21:25:33 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: softintr.c,v 1.18 2020/11/21 21:27:09 thorpej Exp $");
 
 #include 
 #include 
@@ -94,7 +94,7 @@ softintr_free(void *arg)
 {
 	struct softintr_handler *sh = arg;
 
-	free(sh, sizeof(*sh));
+	kmem_free(sh, sizeof(*sh));
 }
 
 void

CVS commit: src/sys/arch/hpcarm/hpcarm

2020-08-28 Thread Nick Hudson 
Module Name:src
Committed By:   skrll
Date:   Fri Aug 28 12:41:17 UTC 2020

Modified Files:
src/sys/arch/hpcarm/hpcarm: locore.S

Log Message:
Fix typo in comment


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/hpcarm/hpcarm/locore.S

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/hpcarm/hpcarm/locore.S
diff -u src/sys/arch/hpcarm/hpcarm/locore.S:1.19 src/sys/arch/hpcarm/hpcarm/locore.S:1.20
--- src/sys/arch/hpcarm/hpcarm/locore.S:1.19	Sun Jul 14 09:29:21 2019
+++ src/sys/arch/hpcarm/hpcarm/locore.S	Fri Aug 28 12:41:17 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: locore.S,v 1.19 2019/07/14 09:29:21 skrll Exp $	*/
+/*	$NetBSD: locore.S,v 1.20 2020/08/28 12:41:17 skrll Exp $	*/
 
 /*
  * Copyright (C) 1994-1997 Mark Brinicombe
@@ -42,7 +42,7 @@
 #endif
 
 
-/* What size should this really be ? It is only used by init_arm() */
+/* What size should this really be ? It is only used by initarm() */
 #define INIT_ARM_STACK_SIZE	2048
 
 /*

CVS commit: src/sys/arch/hpcarm/hpcarm

2018-03-16 Thread Ryo Shimizu 
Module Name:src
Committed By:   ryo
Date:   Fri Mar 16 12:10:16 UTC 2018

Modified Files:
src/sys/arch/hpcarm/hpcarm: hpc_machdep.c

Log Message:
fix compile error with options BOOT_DUMP


To generate a diff of this commit:
cvs rdiff -u -r1.104 -r1.105 src/sys/arch/hpcarm/hpcarm/hpc_machdep.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/hpcarm/hpcarm/hpc_machdep.c
diff -u src/sys/arch/hpcarm/hpcarm/hpc_machdep.c:1.104 src/sys/arch/hpcarm/hpcarm/hpc_machdep.c:1.105
--- src/sys/arch/hpcarm/hpcarm/hpc_machdep.c:1.104	Sat Sep 13 18:09:50 2014
+++ src/sys/arch/hpcarm/hpcarm/hpc_machdep.c	Fri Mar 16 12:10:16 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: hpc_machdep.c,v 1.104 2014/09/13 18:09:50 matt Exp $	*/
+/*	$NetBSD: hpc_machdep.c,v 1.105 2018/03/16 12:10:16 ryo Exp $	*/
 
 /*
  * Copyright (c) 1994-1998 Mark Brinicombe.
@@ -40,7 +40,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: hpc_machdep.c,v 1.104 2014/09/13 18:09:50 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hpc_machdep.c,v 1.105 2018/03/16 12:10:16 ryo Exp $");
 
 #include "opt_cputypes.h"
 #include "opt_kloader.h"
@@ -303,7 +303,7 @@ initarm(int argc, char **argv, struct bo
 }
 
 #ifdef BOOT_DUMP
-static void
+void
 dumppages(char *start, int nbytes)
 {
 	char *p = start;

CVS commit: src/sys/arch/hpcarm/hpcarm

2014-09-13 Thread Matt Thomas 
Module Name:src
Committed By:   matt
Date:   Sat Sep 13 18:09:50 UTC 2014

Modified Files:
src/sys/arch/hpcarm/hpcarm: hpc_machdep.c pxa2x0_hpc_machdep.c
sa11x0_hpc_machdep.c

Log Message:
Use paddr_t for msgbufphys


To generate a diff of this commit:
cvs rdiff -u -r1.103 -r1.104 src/sys/arch/hpcarm/hpcarm/hpc_machdep.c
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/hpcarm/hpcarm/pxa2x0_hpc_machdep.c
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/hpcarm/hpcarm/sa11x0_hpc_machdep.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/hpcarm/hpcarm/hpc_machdep.c
diff -u src/sys/arch/hpcarm/hpcarm/hpc_machdep.c:1.103 src/sys/arch/hpcarm/hpcarm/hpc_machdep.c:1.104
--- src/sys/arch/hpcarm/hpcarm/hpc_machdep.c:1.103	Sun Mar  2 13:27:38 2014
+++ src/sys/arch/hpcarm/hpcarm/hpc_machdep.c	Sat Sep 13 18:09:50 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: hpc_machdep.c,v 1.103 2014/03/02 13:27:38 joerg Exp $	*/
+/*	$NetBSD: hpc_machdep.c,v 1.104 2014/09/13 18:09:50 matt Exp $	*/
 
 /*
  * Copyright (c) 1994-1998 Mark Brinicombe.
@@ -40,7 +40,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: hpc_machdep.c,v 1.103 2014/03/02 13:27:38 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hpc_machdep.c,v 1.104 2014/09/13 18:09:50 matt Exp $");
 
 #include "opt_cputypes.h"
 #include "opt_kloader.h"
@@ -92,7 +92,7 @@ int max_processes = 64;			/* Default num
 char *boot_args = NULL;
 char boot_file[16];
 
-vaddr_t msgbufphys;
+paddr_t msgbufphys;
 
 /* Prototypes */
 void dumpsys(void);

Index: src/sys/arch/hpcarm/hpcarm/pxa2x0_hpc_machdep.c
diff -u src/sys/arch/hpcarm/hpcarm/pxa2x0_hpc_machdep.c:1.21 src/sys/arch/hpcarm/hpcarm/pxa2x0_hpc_machdep.c:1.22
--- src/sys/arch/hpcarm/hpcarm/pxa2x0_hpc_machdep.c:1.21	Tue Mar 11 04:17:36 2014
+++ src/sys/arch/hpcarm/hpcarm/pxa2x0_hpc_machdep.c	Sat Sep 13 18:09:50 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: pxa2x0_hpc_machdep.c,v 1.21 2014/03/11 04:17:36 ozaki-r Exp $	*/
+/*	$NetBSD: pxa2x0_hpc_machdep.c,v 1.22 2014/09/13 18:09:50 matt Exp $	*/
 
 /*
  * Copyright (c) 1994-1998 Mark Brinicombe.
@@ -40,7 +40,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: pxa2x0_hpc_machdep.c,v 1.21 2014/03/11 04:17:36 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pxa2x0_hpc_machdep.c,v 1.22 2014/09/13 18:09:50 matt Exp $");
 
 #include "opt_ddb.h"
 #include "opt_dram_pages.h"
@@ -113,7 +113,7 @@ extern paddr_t physical_freestart;
 extern paddr_t physical_freeend;
 extern paddr_t physical_end;
 
-extern vaddr_t msgbufphys;
+extern paddr_t msgbufphys;
 
 extern int end;
 

Index: src/sys/arch/hpcarm/hpcarm/sa11x0_hpc_machdep.c
diff -u src/sys/arch/hpcarm/hpcarm/sa11x0_hpc_machdep.c:1.9 src/sys/arch/hpcarm/hpcarm/sa11x0_hpc_machdep.c:1.10
--- src/sys/arch/hpcarm/hpcarm/sa11x0_hpc_machdep.c:1.9	Mon Mar 10 14:51:15 2014
+++ src/sys/arch/hpcarm/hpcarm/sa11x0_hpc_machdep.c	Sat Sep 13 18:09:50 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: sa11x0_hpc_machdep.c,v 1.9 2014/03/10 14:51:15 skrll Exp $	*/
+/*	$NetBSD: sa11x0_hpc_machdep.c,v 1.10 2014/09/13 18:09:50 matt Exp $	*/
 
 /*
  * Copyright (c) 1994-1998 Mark Brinicombe.
@@ -40,7 +40,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: sa11x0_hpc_machdep.c,v 1.9 2014/03/10 14:51:15 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sa11x0_hpc_machdep.c,v 1.10 2014/09/13 18:09:50 matt Exp $");
 
 #include "opt_ddb.h"
 #include "opt_dram_pages.h"
@@ -105,7 +105,7 @@ extern paddr_t physical_freestart;
 extern paddr_t physical_freeend;
 extern paddr_t physical_end;
 
-extern vaddr_t msgbufphys;
+extern paddr_t msgbufphys;
 
 extern int end;

CVS commit: src/sys/arch/hpcarm/hpcarm

2014-03-10 Thread Ryota Ozaki 
Module Name:src
Committed By:   ozaki-r
Date:   Tue Mar 11 04:17:36 UTC 2014

Modified Files:
src/sys/arch/hpcarm/hpcarm: pxa2x0_hpc_machdep.c

Log Message:
Remove unused variable found by gcc 4.8


To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/hpcarm/hpcarm/pxa2x0_hpc_machdep.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/hpcarm/hpcarm/pxa2x0_hpc_machdep.c
diff -u src/sys/arch/hpcarm/hpcarm/pxa2x0_hpc_machdep.c:1.20 src/sys/arch/hpcarm/hpcarm/pxa2x0_hpc_machdep.c:1.21
--- src/sys/arch/hpcarm/hpcarm/pxa2x0_hpc_machdep.c:1.20	Mon Aug 26 15:31:06 2013
+++ src/sys/arch/hpcarm/hpcarm/pxa2x0_hpc_machdep.c	Tue Mar 11 04:17:36 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: pxa2x0_hpc_machdep.c,v 1.20 2013/08/26 15:31:06 matt Exp $	*/
+/*	$NetBSD: pxa2x0_hpc_machdep.c,v 1.21 2014/03/11 04:17:36 ozaki-r Exp $	*/
 
 /*
  * Copyright (c) 1994-1998 Mark Brinicombe.
@@ -40,7 +40,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: pxa2x0_hpc_machdep.c,v 1.20 2013/08/26 15:31:06 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pxa2x0_hpc_machdep.c,v 1.21 2014/03/11 04:17:36 ozaki-r Exp $");
 
 #include "opt_ddb.h"
 #include "opt_dram_pages.h"
@@ -252,7 +252,6 @@ init_pxa2x0(int argc, char **argv, struc
 	u_int kerneldatasize, symbolsize;
 	u_int l1pagetable;
 	vaddr_t freemempos;
-	vsize_t pt_size;
 	int loop;
 #if NKSYMS || defined(DDB) || defined(MODULAR)
 	Elf_Shdr *sh;
@@ -392,8 +391,6 @@ init_pxa2x0(int argc, char **argv, struc
 	 */
 	valloc_pages(systempage, 1);
 
-	pt_size = round_page(freemempos) - physical_start;
-
 	/* Allocate stacks for all modes */
 	valloc_pages(irqstack, IRQ_STACK_SIZE);
 	valloc_pages(abtstack, ABT_STACK_SIZE);

CVS commit: src/sys/arch/hpcarm/hpcarm

2014-03-10 Thread Nick Hudson 
Module Name:src
Committed By:   skrll
Date:   Mon Mar 10 14:51:15 UTC 2014

Modified Files:
src/sys/arch/hpcarm/hpcarm: sa11x0_hpc_machdep.c

Log Message:
Avoid unused variable warning by borrowing sa1_cache_clean_addr briefly


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/hpcarm/hpcarm/sa11x0_hpc_machdep.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/hpcarm/hpcarm/sa11x0_hpc_machdep.c
diff -u src/sys/arch/hpcarm/hpcarm/sa11x0_hpc_machdep.c:1.8 src/sys/arch/hpcarm/hpcarm/sa11x0_hpc_machdep.c:1.9
--- src/sys/arch/hpcarm/hpcarm/sa11x0_hpc_machdep.c:1.8	Sun Aug 18 22:26:51 2013
+++ src/sys/arch/hpcarm/hpcarm/sa11x0_hpc_machdep.c	Mon Mar 10 14:51:15 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: sa11x0_hpc_machdep.c,v 1.8 2013/08/18 22:26:51 matt Exp $	*/
+/*	$NetBSD: sa11x0_hpc_machdep.c,v 1.9 2014/03/10 14:51:15 skrll Exp $	*/
 
 /*
  * Copyright (c) 1994-1998 Mark Brinicombe.
@@ -40,7 +40,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: sa11x0_hpc_machdep.c,v 1.8 2013/08/18 22:26:51 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sa11x0_hpc_machdep.c,v 1.9 2014/03/10 14:51:15 skrll Exp $");
 
 #include "opt_ddb.h"
 #include "opt_dram_pages.h"
@@ -342,10 +342,8 @@ init_sa11x0(int argc, char **argv, struc
 		if (!(sa1_cc_base & (CPU_SA110_CACHE_CLEAN_SIZE - 1)))
 			break;
 	}
-	{
-		vaddr_t dummy;
-		alloc_pages(dummy, CPU_SA110_CACHE_CLEAN_SIZE / PAGE_SIZE - 1);
-	}
+	alloc_pages(sa1_cache_clean_addr, CPU_SA110_CACHE_CLEAN_SIZE / PAGE_SIZE - 1);
+
 	sa1_cache_clean_addr = sa1_cc_base;
 	sa1_cache_clean_size = CPU_SA110_CACHE_CLEAN_SIZE / 2;

CVS commit: src/sys/arch/hpcarm/hpcarm

2014-03-02 Thread Joerg Sonnenberger 
Module Name:src
Committed By:   joerg
Date:   Sun Mar  2 13:27:38 UTC 2014

Modified Files:
src/sys/arch/hpcarm/hpcarm: hpc_machdep.c kloader_machdep.c

Log Message:
Mark cpu_reset as dead and add an explicit __builtin_unreachable for a
terminal function call for clang's noreturn diagnostic.


To generate a diff of this commit:
cvs rdiff -u -r1.102 -r1.103 src/sys/arch/hpcarm/hpcarm/hpc_machdep.c
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/hpcarm/hpcarm/kloader_machdep.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/hpcarm/hpcarm/hpc_machdep.c
diff -u src/sys/arch/hpcarm/hpcarm/hpc_machdep.c:1.102 src/sys/arch/hpcarm/hpcarm/hpc_machdep.c:1.103
--- src/sys/arch/hpcarm/hpcarm/hpc_machdep.c:1.102	Sun Aug 18 22:26:51 2013
+++ src/sys/arch/hpcarm/hpcarm/hpc_machdep.c	Sun Mar  2 13:27:38 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: hpc_machdep.c,v 1.102 2013/08/18 22:26:51 matt Exp $	*/
+/*	$NetBSD: hpc_machdep.c,v 1.103 2014/03/02 13:27:38 joerg Exp $	*/
 
 /*
  * Copyright (c) 1994-1998 Mark Brinicombe.
@@ -40,7 +40,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: hpc_machdep.c,v 1.102 2013/08/18 22:26:51 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hpc_machdep.c,v 1.103 2014/03/02 13:27:38 joerg Exp $");
 
 #include "opt_cputypes.h"
 #include "opt_kloader.h"
@@ -101,7 +101,7 @@ void dumpsys(void);
 void (*__sleep_func)(void *);
 void *__sleep_ctx;
 
-void (*__cpu_reset)(void) = cpu_reset;
+void (*__cpu_reset)(void) __dead = cpu_reset;
 
 u_int initarm(int, char **, struct bootinfo *);
 #if defined(CPU_SA1100) || defined(CPU_SA1110)

Index: src/sys/arch/hpcarm/hpcarm/kloader_machdep.c
diff -u src/sys/arch/hpcarm/hpcarm/kloader_machdep.c:1.1 src/sys/arch/hpcarm/hpcarm/kloader_machdep.c:1.2
--- src/sys/arch/hpcarm/hpcarm/kloader_machdep.c:1.1	Sat Mar 31 14:02:54 2012
+++ src/sys/arch/hpcarm/hpcarm/kloader_machdep.c	Sun Mar  2 13:27:38 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: kloader_machdep.c,v 1.1 2012/03/31 14:02:54 nonaka Exp $	*/
+/*	$NetBSD: kloader_machdep.c,v 1.2 2014/03/02 13:27:38 joerg Exp $	*/
 
 /*-
  * Copyright (C) 2012 NONAKA Kimihiro 
@@ -26,7 +26,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: kloader_machdep.c,v 1.1 2012/03/31 14:02:54 nonaka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kloader_machdep.c,v 1.2 2014/03/02 13:27:38 joerg Exp $");
 
 #include "debug_kloader.h"
 #include "opt_cputypes.h"
@@ -67,7 +67,7 @@ kloader_reboot_setup(const char *filenam
 void
 kloader_hpcarm_reset(void)
 {
-	extern void (*__cpu_reset)(void);
+	extern void (*__cpu_reset)(void) __dead;
 
 	__cpu_reset();
 	/*NOTREACHED*/
@@ -83,6 +83,7 @@ kloader_hpcarm_jump(kloader_bootfunc_t f
 
 	/* jump to 2nd boot-loader */
 	(*func)(kbi, tag);
+	__builtin_unreachable();
 }
 
 /*

CVS commit: src/sys/arch/hpcarm/hpcarm

2014-03-02 Thread Joerg Sonnenberger 
Module Name:src
Committed By:   joerg
Date:   Sun Mar  2 13:26:30 UTC 2014

Modified Files:
src/sys/arch/hpcarm/hpcarm: locore.S

Log Message:
Be explicit about the double register use.


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/hpcarm/hpcarm/locore.S

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/hpcarm/hpcarm/locore.S
diff -u src/sys/arch/hpcarm/hpcarm/locore.S:1.17 src/sys/arch/hpcarm/hpcarm/locore.S:1.18
--- src/sys/arch/hpcarm/hpcarm/locore.S:1.17	Sat Mar  1 12:48:38 2014
+++ src/sys/arch/hpcarm/hpcarm/locore.S	Sun Mar  2 13:26:30 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: locore.S,v 1.17 2014/03/01 12:48:38 joerg Exp $	*/
+/*	$NetBSD: locore.S,v 1.18 2014/03/02 13:26:30 joerg Exp $	*/
 
 /*
  * Copyright (C) 1994-1997 Mark Brinicombe
@@ -263,9 +263,9 @@ ENTRY(dumpsys)
 add r2, r0, #(PCB_R8)
 stmia   r2, {r8-r13}
 #else
-strdr8, [r0, #(PCB_R8)]
-strdr10, [r0, #(PCB_R10)]
-strdr12, [r0, #(PCB_R12)]
+strdr8, r9, [r0, #(PCB_R8)]
+strdr10, r11, [r0, #(PCB_R10)]
+strdr12, r13, [r0, #(PCB_R12)]
 #endif
 
 	bl	_C_LABEL(dodumpsys)

CVS commit: src/sys/arch/hpcarm/hpcarm

2014-03-01 Thread Joerg Sonnenberger 
Module Name:src
Committed By:   joerg
Date:   Sat Mar  1 12:48:38 UTC 2014

Modified Files:
src/sys/arch/hpcarm/hpcarm: locore.S

Log Message:
Modernize asm syntax


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/hpcarm/hpcarm/locore.S

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/hpcarm/hpcarm/locore.S
diff -u src/sys/arch/hpcarm/hpcarm/locore.S:1.16 src/sys/arch/hpcarm/hpcarm/locore.S:1.17
--- src/sys/arch/hpcarm/hpcarm/locore.S:1.16	Sat Feb 22 19:16:06 2014
+++ src/sys/arch/hpcarm/hpcarm/locore.S	Sat Mar  1 12:48:38 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: locore.S,v 1.16 2014/02/22 19:16:06 matt Exp $	*/
+/*	$NetBSD: locore.S,v 1.17 2014/03/01 12:48:38 joerg Exp $	*/
 
 /*
  * Copyright (C) 1994-1997 Mark Brinicombe
@@ -63,7 +63,7 @@ ASENTRY_NP(start)
 
 	/* Disable PID virtual address mapping */
 	mov	r4, #0
-	mcr	15, 0, r4, c13, c0, 0
+	mcr	p15, 0, r4, c13, c0, 0
 
 #if defined(CPU_XSCALE_PXA250) || defined(CPU_XSCALE_PXA270)
 /*
@@ -211,8 +211,8 @@ ENTRY_NP(cpu_reset)
 	 * Hurl ourselves into the ROM
 	 */
 	mov	r0, #(CPU_CONTROL_32BP_ENABLE | CPU_CONTROL_32BD_ENABLE)
-	mcr 15, 0, r0, c1, c0, 0
-	mcr 15, 0, r0, c8, c7, 0
+	mcr p15, 0, r0, c1, c0, 0
+	mcr p15, 0, r0, c8, c7, 0
 	mov pc, r4
 
 	/*

CVS commit: src/sys/arch/hpcarm/hpcarm

2014-02-22 Thread Matt Thomas 
Module Name:src
Committed By:   matt
Date:   Sat Feb 22 19:16:06 UTC 2014

Modified Files:
src/sys/arch/hpcarm/hpcarm: locore.S

Log Message:
Trim include files


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/hpcarm/hpcarm/locore.S

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/hpcarm/hpcarm/locore.S
diff -u src/sys/arch/hpcarm/hpcarm/locore.S:1.15 src/sys/arch/hpcarm/hpcarm/locore.S:1.16
--- src/sys/arch/hpcarm/hpcarm/locore.S:1.15	Mon Dec  2 18:36:11 2013
+++ src/sys/arch/hpcarm/hpcarm/locore.S	Sat Feb 22 19:16:06 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: locore.S,v 1.15 2013/12/02 18:36:11 joerg Exp $	*/
+/*	$NetBSD: locore.S,v 1.16 2014/02/22 19:16:06 matt Exp $	*/
 
 /*
  * Copyright (C) 1994-1997 Mark Brinicombe
@@ -36,9 +36,7 @@
 #include 
 #include 
 #include 
-#include 
 #include 
-#include 
 #if defined(CPU_XSCALE_PXA250) || defined(CPU_XSCALE_PXA270)
 #include 
 #endif

CVS commit: src/sys/arch/hpcarm/hpcarm

2013-08-26 Thread Matt Thomas 
Module Name:src
Committed By:   matt
Date:   Mon Aug 26 15:31:45 UTC 2013

Modified Files:
src/sys/arch/hpcarm/hpcarm: locore.S

Log Message:
Don't include  and 
Use the values from getassym.h


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/hpcarm/hpcarm/locore.S

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/hpcarm/hpcarm/locore.S
diff -u src/sys/arch/hpcarm/hpcarm/locore.S:1.13 src/sys/arch/hpcarm/hpcarm/locore.S:1.14
--- src/sys/arch/hpcarm/hpcarm/locore.S:1.13	Sat Mar 31 14:02:54 2012
+++ src/sys/arch/hpcarm/hpcarm/locore.S	Mon Aug 26 15:31:44 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: locore.S,v 1.13 2012/03/31 14:02:54 nonaka Exp $	*/
+/*	$NetBSD: locore.S,v 1.14 2013/08/26 15:31:44 matt Exp $	*/
 
 /*
  * Copyright (C) 1994-1997 Mark Brinicombe
@@ -41,10 +41,9 @@
 #include 
 #if defined(CPU_XSCALE_PXA250) || defined(CPU_XSCALE_PXA270)
 #include 
-#include 
-#include  /* for PMAP_DOMAIN_KERNEL */
 #endif
 
+
 /* What size should this really be ? It is only used by init_arm() */
 #define INIT_ARM_STACK_SIZE	2048
 
@@ -138,11 +137,11 @@ ASENTRY_NP(start)
 
 .Lmmu_init_table:	
 	/* fill all table VA==PA */
-	MMU_INIT(0x, 0x, 1<<(32-L1_S_SHIFT), L1_TYPE_S|L1_S_AP(AP_KRW))
+	MMU_INIT(0x, 0x, 1<<(32-L1_S_SHIFT), L1_TYPE_S|L1_S_AP_KRW)
 	/* map SDRAM VA==PA, WT cacheable */
-	MMU_INIT(0xa000, 0xa000, 256, L1_TYPE_S|L1_S_C|L1_S_AP(AP_KRW))
+	MMU_INIT(0xa000, 0xa000, 256, L1_TYPE_S|L1_S_C|L1_S_AP_KRW)
 	/* map VA 0xc000..0xcfff to PA 0xa000..0xafff */
-	MMU_INIT(0xc000, 0xa000, 256, L1_TYPE_S|L1_S_C|L1_S_AP(AP_KRW))
+	MMU_INIT(0xc000, 0xa000, 256, L1_TYPE_S|L1_S_C|L1_S_AP_KRW)
 	.word	0,0,0	/* end of table */
 
 	.text

CVS commit: src/sys/arch/hpcarm/hpcarm

2013-08-26 Thread Matt Thomas 
Module Name:src
Committed By:   matt
Date:   Mon Aug 26 15:31:06 UTC 2013

Modified Files:
src/sys/arch/hpcarm/hpcarm: pxa2x0_hpc_machdep.c

Log Message:
Include 


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/hpcarm/hpcarm/pxa2x0_hpc_machdep.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/hpcarm/hpcarm/pxa2x0_hpc_machdep.c
diff -u src/sys/arch/hpcarm/hpcarm/pxa2x0_hpc_machdep.c:1.19 src/sys/arch/hpcarm/hpcarm/pxa2x0_hpc_machdep.c:1.20
--- src/sys/arch/hpcarm/hpcarm/pxa2x0_hpc_machdep.c:1.19	Sat Sep 22 00:33:41 2012
+++ src/sys/arch/hpcarm/hpcarm/pxa2x0_hpc_machdep.c	Mon Aug 26 15:31:06 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: pxa2x0_hpc_machdep.c,v 1.19 2012/09/22 00:33:41 matt Exp $	*/
+/*	$NetBSD: pxa2x0_hpc_machdep.c,v 1.20 2013/08/26 15:31:06 matt Exp $	*/
 
 /*
  * Copyright (c) 1994-1998 Mark Brinicombe.
@@ -40,7 +40,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: pxa2x0_hpc_machdep.c,v 1.19 2012/09/22 00:33:41 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pxa2x0_hpc_machdep.c,v 1.20 2013/08/26 15:31:06 matt Exp $");
 
 #include "opt_ddb.h"
 #include "opt_dram_pages.h"
@@ -77,7 +77,7 @@ __KERNEL_RCSID(0, "$NetBSD: pxa2x0_hpc_m
 #include 
 #include 
 #include 
-#include 
+#include 
 #include 
 #include

CVS commit: src/sys/arch/hpcarm/hpcarm

2013-08-18 Thread Matt Thomas 
Module Name:src
Committed By:   matt
Date:   Sun Aug 18 22:26:51 UTC 2013

Modified Files:
src/sys/arch/hpcarm/hpcarm: hpc_machdep.c sa11x0_hpc_machdep.c

Log Message:
Fix  lossage


To generate a diff of this commit:
cvs rdiff -u -r1.101 -r1.102 src/sys/arch/hpcarm/hpcarm/hpc_machdep.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/hpcarm/hpcarm/sa11x0_hpc_machdep.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/hpcarm/hpcarm/hpc_machdep.c
diff -u src/sys/arch/hpcarm/hpcarm/hpc_machdep.c:1.101 src/sys/arch/hpcarm/hpcarm/hpc_machdep.c:1.102
--- src/sys/arch/hpcarm/hpcarm/hpc_machdep.c:1.101	Sun Jul 29 00:07:06 2012
+++ src/sys/arch/hpcarm/hpcarm/hpc_machdep.c	Sun Aug 18 22:26:51 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: hpc_machdep.c,v 1.101 2012/07/29 00:07:06 matt Exp $	*/
+/*	$NetBSD: hpc_machdep.c,v 1.102 2013/08/18 22:26:51 matt Exp $	*/
 
 /*
  * Copyright (c) 1994-1998 Mark Brinicombe.
@@ -40,7 +40,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: hpc_machdep.c,v 1.101 2012/07/29 00:07:06 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hpc_machdep.c,v 1.102 2013/08/18 22:26:51 matt Exp $");
 
 #include "opt_cputypes.h"
 #include "opt_kloader.h"
@@ -54,10 +54,11 @@ __KERNEL_RCSID(0, "$NetBSD: hpc_machdep.
 #include 
 #include 
 #include 
+#include 
 
 #include 
 
-#include 
+#include 
 
 #include 
 #include 

Index: src/sys/arch/hpcarm/hpcarm/sa11x0_hpc_machdep.c
diff -u src/sys/arch/hpcarm/hpcarm/sa11x0_hpc_machdep.c:1.7 src/sys/arch/hpcarm/hpcarm/sa11x0_hpc_machdep.c:1.8
--- src/sys/arch/hpcarm/hpcarm/sa11x0_hpc_machdep.c:1.7	Sat Sep 22 00:33:41 2012
+++ src/sys/arch/hpcarm/hpcarm/sa11x0_hpc_machdep.c	Sun Aug 18 22:26:51 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: sa11x0_hpc_machdep.c,v 1.7 2012/09/22 00:33:41 matt Exp $	*/
+/*	$NetBSD: sa11x0_hpc_machdep.c,v 1.8 2013/08/18 22:26:51 matt Exp $	*/
 
 /*
  * Copyright (c) 1994-1998 Mark Brinicombe.
@@ -40,7 +40,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: sa11x0_hpc_machdep.c,v 1.7 2012/09/22 00:33:41 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sa11x0_hpc_machdep.c,v 1.8 2013/08/18 22:26:51 matt Exp $");
 
 #include "opt_ddb.h"
 #include "opt_dram_pages.h"
@@ -60,6 +60,8 @@ __KERNEL_RCSID(0, "$NetBSD: sa11x0_hpc_m
 #include 
 #include 
 #include 
+#include 
+#include 
 
 #if NKSYMS || defined(DDB) || defined(MODULAR)
 #include 
@@ -76,14 +78,11 @@ __KERNEL_RCSID(0, "$NetBSD: sa11x0_hpc_m
 
 #include 
 #include 
-#include 
+#include 
 #include 
 
 #include 
 #include 
-#include 
-#include 
-#include 
 #include 
 #include 
 #include

CVS commit: src/sys/arch/hpcarm/hpcarm

2012-08-03 Thread Matt Thomas 
Module Name:src
Committed By:   matt
Date:   Fri Aug  3 15:59:04 UTC 2012

Modified Files:
src/sys/arch/hpcarm/hpcarm: pxa2x0_hpc_machdep.c

Log Message:
include 


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/hpcarm/hpcarm/pxa2x0_hpc_machdep.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/hpcarm/hpcarm/pxa2x0_hpc_machdep.c
diff -u src/sys/arch/hpcarm/hpcarm/pxa2x0_hpc_machdep.c:1.16 src/sys/arch/hpcarm/hpcarm/pxa2x0_hpc_machdep.c:1.17
--- src/sys/arch/hpcarm/hpcarm/pxa2x0_hpc_machdep.c:1.16	Sun Jul 29 00:07:06 2012
+++ src/sys/arch/hpcarm/hpcarm/pxa2x0_hpc_machdep.c	Fri Aug  3 15:59:04 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: pxa2x0_hpc_machdep.c,v 1.16 2012/07/29 00:07:06 matt Exp $	*/
+/*	$NetBSD: pxa2x0_hpc_machdep.c,v 1.17 2012/08/03 15:59:04 matt Exp $	*/
 
 /*
  * Copyright (c) 1994-1998 Mark Brinicombe.
@@ -40,7 +40,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: pxa2x0_hpc_machdep.c,v 1.16 2012/07/29 00:07:06 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pxa2x0_hpc_machdep.c,v 1.17 2012/08/03 15:59:04 matt Exp $");
 
 #include "opt_ddb.h"
 #include "opt_dram_pages.h"
@@ -79,6 +79,7 @@ __KERNEL_RCSID(0, "$NetBSD: pxa2x0_hpc_m
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include

CVS commit: src/sys/arch/hpcarm/hpcarm

2012-03-05 Thread NONAKA Kimihiro 
Module Name:src
Committed By:   nonaka
Date:   Mon Mar  5 12:15:24 UTC 2012

Modified Files:
src/sys/arch/hpcarm/hpcarm: pxa2x0_hpc_machdep.c

Log Message:
increase kernel VM space.
fixed problem can't boot on WS011SH (probably other 128MB RAM model too).


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/hpcarm/hpcarm/pxa2x0_hpc_machdep.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/hpcarm/hpcarm/pxa2x0_hpc_machdep.c
diff -u src/sys/arch/hpcarm/hpcarm/pxa2x0_hpc_machdep.c:1.13 src/sys/arch/hpcarm/hpcarm/pxa2x0_hpc_machdep.c:1.14
--- src/sys/arch/hpcarm/hpcarm/pxa2x0_hpc_machdep.c:1.13	Tue Jul 19 15:37:39 2011
+++ src/sys/arch/hpcarm/hpcarm/pxa2x0_hpc_machdep.c	Mon Mar  5 12:15:23 2012
@@ -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.14 2012/03/05 12:15:23 nonaka Exp $	*/
 
 /*
  * Copyright (c) 1994-1998 Mark Brinicombe.
@@ -40,7 +40,7 @@
  */
 
 #include 
-__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.14 2012/03/05 12:15:23 nonaka Exp $");
 
 #include "opt_ddb.h"
 #include "opt_dram_pages.h"
@@ -102,8 +102,15 @@ __KERNEL_RCSID(0, "$NetBSD: pxa2x0_hpc_m
 
 /* Kernel text starts 2MB in from the bottom of the kernel address space. */
 #define	KERNEL_TEXT_BASE	(KERNEL_BASE + 0x0020)
-#define	KERNEL_VM_BASE		(KERNEL_BASE + 0x00C0)
-#define	KERNEL_VM_SIZE		0x0500
+#ifndef	KERNEL_VM_BASE
+#define	KERNEL_VM_BASE		(KERNEL_BASE + 0x0100)
+#endif
+
+/*
+ * The range 0xc100 - 0xccff is available for kernel VM space
+ * Core-logic registers and I/O mappings occupy 0xfd00 - 0x
+ */
+#define	KERNEL_VM_SIZE		0x0c00
 
 /*
  * Address to call from cpu_reset() to reset the machine.
@@ -148,9 +155,8 @@ extern int end;
 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 */

CVS commit: src/sys/arch/hpcarm/hpcarm

2011-06-23 Thread NONAKA Kimihiro 
Module Name:src
Committed By:   nonaka
Date:   Thu Jun 23 12:40:32 UTC 2011

Modified Files:
src/sys/arch/hpcarm/hpcarm: wzero3_machdep.c

Log Message:
Remove noneed platid_match() in consinit().


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/hpcarm/hpcarm/wzero3_machdep.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/hpcarm/hpcarm/wzero3_machdep.c
diff -u src/sys/arch/hpcarm/hpcarm/wzero3_machdep.c:1.1 src/sys/arch/hpcarm/hpcarm/wzero3_machdep.c:1.2
--- src/sys/arch/hpcarm/hpcarm/wzero3_machdep.c:1.1	Tue Jun 21 15:23:57 2011
+++ src/sys/arch/hpcarm/hpcarm/wzero3_machdep.c	Thu Jun 23 12:40:32 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: wzero3_machdep.c,v 1.1 2011/06/21 15:23:57 kiyohara Exp $	*/
+/*	$NetBSD: wzero3_machdep.c,v 1.2 2011/06/23 12:40:32 nonaka Exp $	*/
 
 /*
  * Copyright (c) 1994-1998 Mark Brinicombe.
@@ -36,7 +36,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: wzero3_machdep.c,v 1.1 2011/06/21 15:23:57 kiyohara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wzero3_machdep.c,v 1.2 2011/06/23 12:40:32 nonaka Exp $");
 
 #include 
 #include 
@@ -231,16 +231,9 @@
 	} else {
 #if (NLCD > 0)
 #if NWZERO3LCD > 0
-		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)
-		 || platid_match(&platid,&platid_mask_MACH_SHARP_WZERO3_WS011SH)
-		 || platid_match(&platid,&platid_mask_MACH_SHARP_WZERO3_WS020SH)) {
-			extern void wzero3lcd_cnattach(void);
-
-			wzero3lcd_cnattach();
-			return;
-		}
+		extern void wzero3lcd_cnattach(void);
+		wzero3lcd_cnattach();
+		return;
 #endif
 #endif
 	}

CVS commit: src/sys/arch/hpcarm/hpcarm

2011-06-23 Thread NONAKA Kimihiro 
Module Name:src
Committed By:   nonaka
Date:   Thu Jun 23 12:38:02 UTC 2011

Modified Files:
src/sys/arch/hpcarm/hpcarm: pxa2x0_hpc_machdep.c

Log Message:
Delete unused define.


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/hpcarm/hpcarm/pxa2x0_hpc_machdep.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/hpcarm/hpcarm/pxa2x0_hpc_machdep.c
diff -u src/sys/arch/hpcarm/hpcarm/pxa2x0_hpc_machdep.c:1.10 src/sys/arch/hpcarm/hpcarm/pxa2x0_hpc_machdep.c:1.11
--- src/sys/arch/hpcarm/hpcarm/pxa2x0_hpc_machdep.c:1.10	Tue Jun 21 15:23:57 2011
+++ src/sys/arch/hpcarm/hpcarm/pxa2x0_hpc_machdep.c	Thu Jun 23 12:38:02 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: pxa2x0_hpc_machdep.c,v 1.10 2011/06/21 15:23:57 kiyohara Exp $	*/
+/*	$NetBSD: pxa2x0_hpc_machdep.c,v 1.11 2011/06/23 12:38:02 nonaka Exp $	*/
 
 /*
  * Copyright (c) 1994-1998 Mark Brinicombe.
@@ -40,7 +40,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: pxa2x0_hpc_machdep.c,v 1.10 2011/06/21 15:23:57 kiyohara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pxa2x0_hpc_machdep.c,v 1.11 2011/06/23 12:38:02 nonaka Exp $");
 
 #include "opt_ddb.h"
 #include "opt_dram_pages.h"
@@ -150,8 +150,7 @@
 
 #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_IO		2	/* Page table for mapping IO */
-#define	KERNEL_PT_KERNEL	3	/* Page table for mapping kernel */
+#define	KERNEL_PT_KERNEL	2	/* 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 */

CVS commit: src/sys/arch/hpcarm/hpcarm

2011-06-21 Thread KIYOHARA Takashi 
Module Name:src
Committed By:   kiyohara
Date:   Tue Jun 21 15:28:05 UTC 2011

Modified Files:
src/sys/arch/hpcarm/hpcarm: autoconf.c

Log Message:
Add bicons to constab.


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/hpcarm/hpcarm/autoconf.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/hpcarm/hpcarm/autoconf.c
diff -u src/sys/arch/hpcarm/hpcarm/autoconf.c:1.18 src/sys/arch/hpcarm/hpcarm/autoconf.c:1.19
--- src/sys/arch/hpcarm/hpcarm/autoconf.c:1.18	Sat Apr 17 13:36:21 2010
+++ src/sys/arch/hpcarm/hpcarm/autoconf.c	Tue Jun 21 15:28:05 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: autoconf.c,v 1.18 2010/04/17 13:36:21 nonaka Exp $	*/
+/*	$NetBSD: autoconf.c,v 1.19 2011/06/21 15:28:05 kiyohara Exp $	*/
 
 /*
  * Copyright (c) 1994-1998 Mark Brinicombe.
@@ -36,7 +36,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.18 2010/04/17 13:36:21 nonaka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.19 2011/06/21 15:28:05 kiyohara Exp $");
 
 #include "opt_md.h"
 
@@ -188,14 +188,20 @@
  * known algorithm unless we see a pressing need otherwise.
  */
 
+#include "biconsdev.h"
+
 #include 
 
-cons_decl(com);   
 cons_decl(sacom);
+#define biconscnpollc	nullcnpollc
+cons_decl(bicons);   
 
 struct consdev constab[] = {
 #if (NSACOM > 0)
 	cons_init(sacom),
 #endif
+#if (NBICONSDEV > 0)
+	cons_init(bicons),
+#endif
 	{ NULL },
 };

CVS commit: src/sys/arch/hpcarm/hpcarm

2011-06-14 Thread KIYOHARA Takashi 
Module Name:src
Committed By:   kiyohara
Date:   Tue Jun 14 14:33:50 UTC 2011

Modified Files:
src/sys/arch/hpcarm/hpcarm: pxa2x0_hpc_machdep.c

Log Message:
Remove not effective call for pxa2x0_*_bootstrap().


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/hpcarm/hpcarm/pxa2x0_hpc_machdep.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/hpcarm/hpcarm/pxa2x0_hpc_machdep.c
diff -u src/sys/arch/hpcarm/hpcarm/pxa2x0_hpc_machdep.c:1.8 src/sys/arch/hpcarm/hpcarm/pxa2x0_hpc_machdep.c:1.9
--- src/sys/arch/hpcarm/hpcarm/pxa2x0_hpc_machdep.c:1.8	Sat Jun 26 00:25:02 2010
+++ src/sys/arch/hpcarm/hpcarm/pxa2x0_hpc_machdep.c	Tue Jun 14 14:33:50 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: pxa2x0_hpc_machdep.c,v 1.8 2010/06/26 00:25:02 tsutsui Exp $	*/
+/*	$NetBSD: pxa2x0_hpc_machdep.c,v 1.9 2011/06/14 14:33:50 kiyohara Exp $	*/
 
 /*
  * Copyright (c) 1994-1998 Mark Brinicombe.
@@ -40,7 +40,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: pxa2x0_hpc_machdep.c,v 1.8 2010/06/26 00:25:02 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pxa2x0_hpc_machdep.c,v 1.9 2011/06/14 14:33:50 kiyohara Exp $");
 
 #include "opt_ddb.h"
 #include "opt_dram_pages.h"
@@ -434,8 +434,6 @@
 	set_cpufuncs();
 	IRQdisable;
 
-	pxa2x0_memctl_bootstrap(PXA2X0_MEMCTL_BASE);
-	pxa2x0_intr_bootstrap(PXA2X0_INTCTL_BASE);
 	pmap_devmap_bootstrap((vaddr_t)read_ttb(), pxa2x0_devmap);
 	pxa2x0_memctl_bootstrap(PXA2X0_MEMCTL_VBASE);
 	pxa2x0_intr_bootstrap(PXA2X0_INTCTL_VBASE);

CVS commit: src/sys/arch/hpcarm/hpcarm

2010-11-13 Thread Masao Uebayashi 
Module Name:src
Committed By:   uebayasi
Date:   Sun Nov 14 03:17:50 UTC 2010

Modified Files:
src/sys/arch/hpcarm/hpcarm: hpc_machdep.c

Log Message:
Include sys/pmf.h for pmf(9) API.


To generate a diff of this commit:
cvs rdiff -u -r1.98 -r1.99 src/sys/arch/hpcarm/hpcarm/hpc_machdep.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/hpcarm/hpcarm/hpc_machdep.c
diff -u src/sys/arch/hpcarm/hpcarm/hpc_machdep.c:1.98 src/sys/arch/hpcarm/hpcarm/hpc_machdep.c:1.99
--- src/sys/arch/hpcarm/hpcarm/hpc_machdep.c:1.98	Thu Apr 29 01:54:26 2010
+++ src/sys/arch/hpcarm/hpcarm/hpc_machdep.c	Sun Nov 14 03:17:50 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: hpc_machdep.c,v 1.98 2010/04/29 01:54:26 nonaka Exp $	*/
+/*	$NetBSD: hpc_machdep.c,v 1.99 2010/11/14 03:17:50 uebayasi Exp $	*/
 
 /*
  * Copyright (c) 1994-1998 Mark Brinicombe.
@@ -40,11 +40,12 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: hpc_machdep.c,v 1.98 2010/04/29 01:54:26 nonaka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hpc_machdep.c,v 1.99 2010/11/14 03:17:50 uebayasi Exp $");
 
 #include 
 #include 
 #include 
+#include 
 
 #include

CVS commit: src/sys/arch/hpcarm/hpcarm

2010-04-28 Thread NONAKA Kimihiro 
Module Name:src
Committed By:   nonaka
Date:   Thu Apr 29 04:12:48 UTC 2010

Modified Files:
src/sys/arch/hpcarm/hpcarm: pxa2x0_hpc_machdep.c

Log Message:
fix indent.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/hpcarm/hpcarm/pxa2x0_hpc_machdep.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/hpcarm/hpcarm/pxa2x0_hpc_machdep.c
diff -u src/sys/arch/hpcarm/hpcarm/pxa2x0_hpc_machdep.c:1.4 src/sys/arch/hpcarm/hpcarm/pxa2x0_hpc_machdep.c:1.5
--- src/sys/arch/hpcarm/hpcarm/pxa2x0_hpc_machdep.c:1.4	Thu Apr 29 01:58:51 2010
+++ src/sys/arch/hpcarm/hpcarm/pxa2x0_hpc_machdep.c	Thu Apr 29 04:12:48 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: pxa2x0_hpc_machdep.c,v 1.4 2010/04/29 01:58:51 nonaka Exp $	*/
+/*	$NetBSD: pxa2x0_hpc_machdep.c,v 1.5 2010/04/29 04:12:48 nonaka Exp $	*/
 
 /*
  * Copyright (c) 1994-1998 Mark Brinicombe.
@@ -40,7 +40,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: pxa2x0_hpc_machdep.c,v 1.4 2010/04/29 01:58:51 nonaka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pxa2x0_hpc_machdep.c,v 1.5 2010/04/29 04:12:48 nonaka Exp $");
 
 #include "opt_ddb.h"
 #include "opt_dram_pages.h"
@@ -266,9 +266,9 @@
 ws003sh_cpu_reset(void)
 {
 
-		pxa2x0_gpio_set_function(89, GPIO_OUT | GPIO_SET);
-		for (;;)
-continue;
+	pxa2x0_gpio_set_function(89, GPIO_OUT | GPIO_SET);
+	for (;;)
+		continue;
 }
 
 static struct pxa2x0_gpioconf ws003sh_boarddep_gpioconf[] = {

CVS commit: src/sys/arch/hpcarm/hpcarm

2010-04-28 Thread NONAKA Kimihiro 
Module Name:src
Committed By:   nonaka
Date:   Thu Apr 29 01:58:51 UTC 2010

Modified Files:
src/sys/arch/hpcarm/hpcarm: pxa2x0_hpc_machdep.c

Log Message:
use platid_match().


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/hpcarm/hpcarm/pxa2x0_hpc_machdep.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/hpcarm/hpcarm/pxa2x0_hpc_machdep.c
diff -u src/sys/arch/hpcarm/hpcarm/pxa2x0_hpc_machdep.c:1.3 src/sys/arch/hpcarm/hpcarm/pxa2x0_hpc_machdep.c:1.4
--- src/sys/arch/hpcarm/hpcarm/pxa2x0_hpc_machdep.c:1.3	Thu Apr 29 01:54:26 2010
+++ src/sys/arch/hpcarm/hpcarm/pxa2x0_hpc_machdep.c	Thu Apr 29 01:58:51 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: pxa2x0_hpc_machdep.c,v 1.3 2010/04/29 01:54:26 nonaka Exp $	*/
+/*	$NetBSD: pxa2x0_hpc_machdep.c,v 1.4 2010/04/29 01:58:51 nonaka Exp $	*/
 
 /*
  * Copyright (c) 1994-1998 Mark Brinicombe.
@@ -40,7 +40,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: pxa2x0_hpc_machdep.c,v 1.3 2010/04/29 01:54:26 nonaka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pxa2x0_hpc_machdep.c,v 1.4 2010/04/29 01:58:51 nonaka Exp $");
 
 #include "opt_ddb.h"
 #include "opt_dram_pages.h"
@@ -396,40 +396,36 @@
 	pxa2x0_clkman_bootstrap(PXA2X0_CLKMAN_VBASE);
 	pxa2x0_gpio_bootstrap(PXA2X0_GPIO_VBASE);
 
-	if (bi->magic == BOOTINFO_MAGIC) {
-		if (bi->platid_cpu == PLATID_CPU_ARM_XSCALE_PXA270) {
-			if ((bi->platid_machine == PLATID_MACH_SHARP_WZERO3_WS003SH)
-			 || (bi->platid_machine == PLATID_MACH_SHARP_WZERO3_WS004SH)
-			 || (bi->platid_machine == PLATID_MACH_SHARP_WZERO3_WS007SH)
-			 || (bi->platid_machine == PLATID_MACH_SHARP_WZERO3_WS011SH)
-			 || (bi->platid_machine == PLATID_MACH_SHARP_WZERO3_WS020SH)) {
-if (bi->platid_machine == PLATID_MACH_SHARP_WZERO3_WS003SH
- || bi->platid_machine == PLATID_MACH_SHARP_WZERO3_WS004SH) {
-	pxa2x0_gpio_config(ws003sh_gpioconf);
-	__cpu_reset = ws003sh_cpu_reset;
-} else if (bi->platid_machine == PLATID_MACH_SHARP_WZERO3_WS007SH) {
-	pxa2x0_gpio_config(ws007sh_gpioconf);
-} else if (bi->platid_machine == PLATID_MACH_SHARP_WZERO3_WS011SH) {
-	pxa2x0_gpio_config(ws011sh_gpioconf);
-}
-pxa2x0_clkman_config(CKEN_FFUART, 1);
-pxa2x0_clkman_config(CKEN_NSSP, 1); /* XXXOST */
-pxa2x0_clkman_config(CKEN_USBHC, 0);
-pxa2x0_clkman_config(CKEN_USBDC, 0);
-pxa2x0_clkman_config(CKEN_AC97, 0);
-pxa2x0_clkman_config(CKEN_SSP, 0);
-pxa2x0_clkman_config(CKEN_HWUART, 0);
-pxa2x0_clkman_config(CKEN_STUART, 0);
-pxa2x0_clkman_config(CKEN_BTUART, 0);
-pxa2x0_clkman_config(CKEN_I2S, 0);
-pxa2x0_clkman_config(CKEN_MMC, 0);
-pxa2x0_clkman_config(CKEN_FICP, 0);
-pxa2x0_clkman_config(CKEN_I2C, 0);
-pxa2x0_clkman_config(CKEN_PWM1, 0);
-if (bi->platid_machine != PLATID_MACH_SHARP_WZERO3_WS011SH) {
-	pxa2x0_clkman_config(CKEN_PWM0, 0); /* WS011SH: DON'T DISABLE */
-}
-			}
+	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)
+	 || platid_match(&platid, &platid_mask_MACH_SHARP_WZERO3_WS011SH)
+	 || platid_match(&platid, &platid_mask_MACH_SHARP_WZERO3_WS020SH)) {
+		if (platid_match(&platid, &platid_mask_MACH_SHARP_WZERO3_WS003SH)
+		 || platid_match(&platid, &platid_mask_MACH_SHARP_WZERO3_WS004SH)) {
+			pxa2x0_gpio_config(ws003sh_gpioconf);
+			__cpu_reset = ws003sh_cpu_reset;
+		} else if (platid_match(&platid, &platid_mask_MACH_SHARP_WZERO3_WS007SH)) {
+			pxa2x0_gpio_config(ws007sh_gpioconf);
+		} else if (platid_match(&platid, &platid_mask_MACH_SHARP_WZERO3_WS011SH)) {
+			pxa2x0_gpio_config(ws011sh_gpioconf);
+		}
+		pxa2x0_clkman_config(CKEN_FFUART, 1);
+		pxa2x0_clkman_config(CKEN_NSSP, 1); /* XXXOST */
+		pxa2x0_clkman_config(CKEN_USBHC, 0);
+		pxa2x0_clkman_config(CKEN_USBDC, 0);
+		pxa2x0_clkman_config(CKEN_AC97, 0);
+		pxa2x0_clkman_config(CKEN_SSP, 0);
+		pxa2x0_clkman_config(CKEN_HWUART, 0);
+		pxa2x0_clkman_config(CKEN_STUART, 0);
+		pxa2x0_clkman_config(CKEN_BTUART, 0);
+		pxa2x0_clkman_config(CKEN_I2S, 0);
+		pxa2x0_clkman_config(CKEN_MMC, 0);
+		pxa2x0_clkman_config(CKEN_FICP, 0);
+		pxa2x0_clkman_config(CKEN_I2C, 0);
+		pxa2x0_clkman_config(CKEN_PWM1, 0);
+		if (!platid_match(&platid, &platid_mask_MACH_SHARP_WZERO3_WS011SH)) {
+			pxa2x0_clkman_config(CKEN_PWM0, 0); /* WS011SH: DON'T DISABLE */
 		}
 	}

CVS commit: src/sys/arch/hpcarm/hpcarm

2010-04-28 Thread NONAKA Kimihiro 
Module Name:src
Committed By:   nonaka
Date:   Thu Apr 29 01:54:26 UTC 2010

Modified Files:
src/sys/arch/hpcarm/hpcarm: hpc_machdep.c pxa2x0_hpc_machdep.c

Log Message:
WS003SH is normally reseted.


To generate a diff of this commit:
cvs rdiff -u -r1.97 -r1.98 src/sys/arch/hpcarm/hpcarm/hpc_machdep.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/hpcarm/hpcarm/pxa2x0_hpc_machdep.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/hpcarm/hpcarm/hpc_machdep.c
diff -u src/sys/arch/hpcarm/hpcarm/hpc_machdep.c:1.97 src/sys/arch/hpcarm/hpcarm/hpc_machdep.c:1.98
--- src/sys/arch/hpcarm/hpcarm/hpc_machdep.c:1.97	Sat Apr 17 13:36:21 2010
+++ src/sys/arch/hpcarm/hpcarm/hpc_machdep.c	Thu Apr 29 01:54:26 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: hpc_machdep.c,v 1.97 2010/04/17 13:36:21 nonaka Exp $	*/
+/*	$NetBSD: hpc_machdep.c,v 1.98 2010/04/29 01:54:26 nonaka Exp $	*/
 
 /*
  * Copyright (c) 1994-1998 Mark Brinicombe.
@@ -40,7 +40,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: hpc_machdep.c,v 1.97 2010/04/17 13:36:21 nonaka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hpc_machdep.c,v 1.98 2010/04/29 01:54:26 nonaka Exp $");
 
 #include 
 #include 
@@ -89,6 +89,8 @@
 void (*__sleep_func)(void *);
 void *__sleep_ctx;
 
+void (*__cpu_reset)(void) = cpu_reset;
+
 #ifdef BOOT_DUMP
 void	dumppages(char *, int);
 #endif
@@ -114,7 +116,7 @@
 		printf("Please press any key to reboot.\n\n");
 		cngetc();
 		printf("rebooting...\n");
-		cpu_reset();
+		__cpu_reset();
 		/* NOTREACHED */
 	}
 
@@ -157,7 +159,7 @@
 	}
 
 	printf("rebooting...\n");
-	cpu_reset();
+	__cpu_reset();
 	/* NOTREACHED */
 }
 

Index: src/sys/arch/hpcarm/hpcarm/pxa2x0_hpc_machdep.c
diff -u src/sys/arch/hpcarm/hpcarm/pxa2x0_hpc_machdep.c:1.2 src/sys/arch/hpcarm/hpcarm/pxa2x0_hpc_machdep.c:1.3
--- src/sys/arch/hpcarm/hpcarm/pxa2x0_hpc_machdep.c:1.2	Sat Apr 24 21:52:34 2010
+++ src/sys/arch/hpcarm/hpcarm/pxa2x0_hpc_machdep.c	Thu Apr 29 01:54:26 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: pxa2x0_hpc_machdep.c,v 1.2 2010/04/24 21:52:34 nonaka Exp $	*/
+/*	$NetBSD: pxa2x0_hpc_machdep.c,v 1.3 2010/04/29 01:54:26 nonaka Exp $	*/
 
 /*
  * Copyright (c) 1994-1998 Mark Brinicombe.
@@ -40,7 +40,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: pxa2x0_hpc_machdep.c,v 1.2 2010/04/24 21:52:34 nonaka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pxa2x0_hpc_machdep.c,v 1.3 2010/04/29 01:54:26 nonaka Exp $");
 
 #include "opt_ddb.h"
 #include "opt_dram_pages.h"
@@ -185,6 +185,8 @@
 extern void (*__sleep_func)(void *);
 extern void *__sleep_ctx;
 
+extern void (*__cpu_reset)(void);
+
 #ifdef DEBUG_BEFOREMMU
 static void	fakecninit(void);
 #endif
@@ -260,6 +262,15 @@
 #undef	_A
 #undef	_S
 
+static void
+ws003sh_cpu_reset(void)
+{
+
+		pxa2x0_gpio_set_function(89, GPIO_OUT | GPIO_SET);
+		for (;;)
+continue;
+}
+
 static struct pxa2x0_gpioconf ws003sh_boarddep_gpioconf[] = {
 	{  41, GPIO_ALT_FN_1_IN },	/* FFRXD */
 	{  99, GPIO_ALT_FN_3_OUT },	/* FFTXD */
@@ -392,8 +403,10 @@
 			 || (bi->platid_machine == PLATID_MACH_SHARP_WZERO3_WS007SH)
 			 || (bi->platid_machine == PLATID_MACH_SHARP_WZERO3_WS011SH)
 			 || (bi->platid_machine == PLATID_MACH_SHARP_WZERO3_WS020SH)) {
-if (bi->platid_machine == PLATID_MACH_SHARP_WZERO3_WS003SH) {
+if (bi->platid_machine == PLATID_MACH_SHARP_WZERO3_WS003SH
+ || bi->platid_machine == PLATID_MACH_SHARP_WZERO3_WS004SH) {
 	pxa2x0_gpio_config(ws003sh_gpioconf);
+	__cpu_reset = ws003sh_cpu_reset;
 } else if (bi->platid_machine == PLATID_MACH_SHARP_WZERO3_WS007SH) {
 	pxa2x0_gpio_config(ws007sh_gpioconf);
 } else if (bi->platid_machine == PLATID_MACH_SHARP_WZERO3_WS011SH) {