CVS commit: src/sys/arch/evbarm/gemini

2018-08-12 Thread Nick Hudson 
Module Name:src
Committed By:   skrll
Date:   Sun Aug 12 18:42:08 UTC 2018

Modified Files:
src/sys/arch/evbarm/gemini: gemini_machdep.c

Log Message:
Fix GEMINI build


To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/evbarm/gemini/gemini_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/evbarm/gemini/gemini_machdep.c
diff -u src/sys/arch/evbarm/gemini/gemini_machdep.c:1.26 src/sys/arch/evbarm/gemini/gemini_machdep.c:1.27
--- src/sys/arch/evbarm/gemini/gemini_machdep.c:1.26	Tue Jul 31 06:46:26 2018
+++ src/sys/arch/evbarm/gemini/gemini_machdep.c	Sun Aug 12 18:42:08 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: gemini_machdep.c,v 1.26 2018/07/31 06:46:26 skrll Exp $	*/
+/*	$NetBSD: gemini_machdep.c,v 1.27 2018/08/12 18:42:08 skrll Exp $	*/
 
 /* adapted from:
  *	NetBSD: sdp24xx_machdep.c,v 1.4 2008/08/27 11:03:10 matt Exp
@@ -129,7 +129,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: gemini_machdep.c,v 1.26 2018/07/31 06:46:26 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gemini_machdep.c,v 1.27 2018/08/12 18:42:08 skrll Exp $");
 
 #include "opt_arm_debug.h"
 #include "opt_machdep.h"
@@ -237,10 +237,7 @@ unsigned long gemini_ipmq_vbase = GEMINI
  */
 #define KERNEL_BASE_PHYS ((paddr_t)_BASE_phys)
 
-#define KERN_VTOPHYS(va) \
-	((paddr_t)((vaddr_t)va - KERNEL_BASE + GEMINI_DRAM_BASE))
-#define KERN_PHYSTOV(pa) \
-	((vaddr_t)((paddr_t)pa - GEMINI_DRAM_BASE + KERNEL_BASE))
+u_long kern_vtopdiff;
 
 /* Prototypes */
 
@@ -632,6 +629,8 @@ initarm(void *arg)
 	bootconfig.dram[0].address = physical_start;
 	bootconfig.dram[0].pages = physmem;
 
+	kern_vtopdiff = KERNEL_BASE + GEMINI_DRAM_BASE;
+
 	/*
 	 * Our kernel is at the beginning of memory, so set our free space to
 	 * all the memory after the kernel.
@@ -1145,16 +1144,16 @@ printf("%s:%d: pmap_link_l2pt ipmq_pt\n"
 	KERN_PHYSTOV(physical_start), KERN_PHYSTOV(physical_end-1),
 	(int)physmem);
 	printf(mem_fmt, "text section",
-	   KERN_VTOPHYS(KERNEL_BASE_virt), KERN_VTOPHYS(etext-1),
+	   KERN_VTOPHYS((vaddr_t)KERNEL_BASE_virt), KERN_VTOPHYS((vaddr_t)etext-1),
 	   (vaddr_t)KERNEL_BASE_virt, (vaddr_t)etext-1,
 	   (int)(textsize / PAGE_SIZE));
 	printf(mem_fmt, "data section",
-	   KERN_VTOPHYS(__data_start), KERN_VTOPHYS(_edata),
+	   KERN_VTOPHYS((vaddr_t)__data_start), KERN_VTOPHYS((vaddr_t)_edata),
 	   (vaddr_t)__data_start, (vaddr_t)_edata,
 	   (int)((round_page((vaddr_t)_edata)
 		  - trunc_page((vaddr_t)__data_start)) / PAGE_SIZE));
 	printf(mem_fmt, "bss section",
-	   KERN_VTOPHYS(__bss_start), KERN_VTOPHYS(__bss_end__),
+	   KERN_VTOPHYS((vaddr_t)__bss_start), KERN_VTOPHYS((vaddr_t)__bss_end__),
 	   (vaddr_t)__bss_start, (vaddr_t)__bss_end__,
 	   (int)((round_page((vaddr_t)__bss_end__)
 		  - trunc_page((vaddr_t)__bss_start)) / PAGE_SIZE));

CVS commit: src/sys/arch/evbarm/gemini

2018-08-12 Thread Nick Hudson 
Module Name:src
Committed By:   skrll
Date:   Sun Aug 12 18:42:08 UTC 2018

Modified Files:
src/sys/arch/evbarm/gemini: gemini_machdep.c

Log Message:
Fix GEMINI build


To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/evbarm/gemini/gemini_machdep.c

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

CVS commit: src/sys/arch/evbarm/gemini

2016-12-29 Thread Rin Okuyama 
Module Name:src
Committed By:   rin
Date:   Fri Dec 30 07:35:14 UTC 2016

Modified Files:
src/sys/arch/evbarm/gemini: gemini_machdep.c

Log Message:
catch up with physmem type change (in the same manner as sdp24xx_machdep.c)


To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/evbarm/gemini/gemini_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/evbarm/gemini/gemini_machdep.c
diff -u src/sys/arch/evbarm/gemini/gemini_machdep.c:1.23 src/sys/arch/evbarm/gemini/gemini_machdep.c:1.24
--- src/sys/arch/evbarm/gemini/gemini_machdep.c:1.23	Thu Dec 22 14:47:55 2016
+++ src/sys/arch/evbarm/gemini/gemini_machdep.c	Fri Dec 30 07:35:14 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: gemini_machdep.c,v 1.23 2016/12/22 14:47:55 cherry Exp $	*/
+/*	$NetBSD: gemini_machdep.c,v 1.24 2016/12/30 07:35:14 rin Exp $	*/
 
 /* adapted from:
  *	NetBSD: sdp24xx_machdep.c,v 1.4 2008/08/27 11:03:10 matt Exp
@@ -129,7 +129,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: gemini_machdep.c,v 1.23 2016/12/22 14:47:55 cherry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gemini_machdep.c,v 1.24 2016/12/30 07:35:14 rin Exp $");
 
 #include "opt_machdep.h"
 #include "opt_ddb.h"
@@ -1150,7 +1150,7 @@ printf("%s:%d: pmap_link_l2pt ipmq_pt\n"
 
 	printf(mem_fmt, "SDRAM", physical_start, physical_end-1,
 	KERN_PHYSTOV(physical_start), KERN_PHYSTOV(physical_end-1),
-	physmem);
+	(int)physmem);
 	printf(mem_fmt, "text section",
 	   KERN_VTOPHYS(KERNEL_BASE_virt), KERN_VTOPHYS(etext-1),
 	   (vaddr_t)KERNEL_BASE_virt, (vaddr_t)etext-1,

CVS commit: src/sys/arch/evbarm/gemini

2016-12-29 Thread Rin Okuyama 
Module Name:src
Committed By:   rin
Date:   Fri Dec 30 07:35:14 UTC 2016

Modified Files:
src/sys/arch/evbarm/gemini: gemini_machdep.c

Log Message:
catch up with physmem type change (in the same manner as sdp24xx_machdep.c)


To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/evbarm/gemini/gemini_machdep.c

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

CVS commit: src/sys/arch/evbarm/gemini

2013-10-01 Thread Nick Hudson 
Module Name:src
Committed By:   skrll
Date:   Tue Oct  1 07:48:35 UTC 2013

Modified Files:
src/sys/arch/evbarm/gemini: gemini_start.S

Log Message:
Appease new gas.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/evbarm/gemini/gemini_start.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/evbarm/gemini/gemini_start.S
diff -u src/sys/arch/evbarm/gemini/gemini_start.S:1.8 src/sys/arch/evbarm/gemini/gemini_start.S:1.9
--- src/sys/arch/evbarm/gemini/gemini_start.S:1.8	Thu Jun 30 20:09:24 2011
+++ src/sys/arch/evbarm/gemini/gemini_start.S	Tue Oct  1 07:48:35 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: gemini_start.S,v 1.8 2011/06/30 20:09:24 wiz Exp $	*/
+/*	$NetBSD: gemini_start.S,v 1.9 2013/10/01 07:48:35 skrll Exp $	*/
 
 /*
  * Machine dependent startup code for GEMINI boards.
@@ -91,20 +91,20 @@
 #include arm/armreg.h
 #include assym.h
 
-RCSID($NetBSD: gemini_start.S,v 1.8 2011/06/30 20:09:24 wiz Exp $)
+RCSID($NetBSD: gemini_start.S,v 1.9 2013/10/01 07:48:35 skrll Exp $)
 
 
 #if defined(VERBOSE_INIT_ARM)
 # define _PUTCHAR(addr, areg, breg, c) 			\
 	ldr	areg, addr;\
 1:			\
-	ldr	breg, [ areg, #0x14 ];	/* LSR*/	\
+	ldr	breg, [areg, #0x14];	/* LSR*/	\
 	tst	breg, #0x20;		/* TXRDY? */	\
 	beq	1b;	\
 	mov	breg, #(c);		/*   c*/	\
-	str	breg, [ areg ];		/* TXDATA */	\
+	str	breg, [areg];		/* TXDATA */	\
 2:			\
-	ldr	breg, [ areg, #0x14 ];	/* LSR*/	\
+	ldr	breg, [areg, #0x14];	/* LSR*/	\
 	tst	breg, #0x40;		/* TSRE?  */	\
 	beq	2b;
 #else

CVS commit: src/sys/arch/evbarm/gemini

2013-10-01 Thread Nick Hudson 
Module Name:src
Committed By:   skrll
Date:   Tue Oct  1 07:48:35 UTC 2013

Modified Files:
src/sys/arch/evbarm/gemini: gemini_start.S

Log Message:
Appease new gas.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/evbarm/gemini/gemini_start.S

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

CVS commit: src/sys/arch/evbarm/gemini

2011-01-30 Thread Matt Thomas 
Module Name:src
Committed By:   matt
Date:   Mon Jan 31 06:10:25 UTC 2011

Added Files:
src/sys/arch/evbarm/gemini: genassym.cf

Log Message:
Generate addresses from this instead of including gemini.h


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/sys/arch/evbarm/gemini/genassym.cf

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

Added files:

Index: src/sys/arch/evbarm/gemini/genassym.cf
diff -u /dev/null src/sys/arch/evbarm/gemini/genassym.cf:1.1
--- /dev/null	Mon Jan 31 06:10:25 2011
+++ src/sys/arch/evbarm/gemini/genassym.cf	Mon Jan 31 06:10:25 2011
@@ -0,0 +1,45 @@
+# $NetBSD: genassym.cf,v 1.1 2011/01/31 06:10:25 matt Exp $
+
+#-
+# Copyright (c) 2011 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# This code is derived from software contributed to The NetBSD Foundation
+# by Matt Thomas m...@3am-software.com
+#
+# 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.
+#
+# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+# ``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 THE FOUNDATION OR CONTRIBUTORS
+# 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.
+#
+
+include evbarm/gemini/gemini.h
+
+#define	KERNEL_BASE_phys	KERNEL_BASE_phys
+#define	KERNEL_BASE_virt	KERNEL_BASE_virt
+define	GEMINI_GLOBAL_VBASE	GEMINI_GLOBAL_VBASE
+define	GEMINI_GLOBAL_BASE	GEMINI_GLOBAL_BASE
+define	GEMINI_UART_VBASE	GEMINI_UART_VBASE
+define	GEMINI_UART_BASE	GEMINI_UART_BASE
+define	GEMINI_LPCHC_VBASE	GEMINI_LPCHC_VBASE
+define	GEMINI_LPCHC_BASE	GEMINI_LPCHC_BASE
+define	GEMINI_LPCIO_VBASE	GEMINI_LPCIO_VBASE
+define	GEMINI_LPCIO_BASE	GEMINI_LPCIO_BASE
+define	GEMINI_DRAMC_VBASE	GEMINI_DRAMC_VBASE
+define	GEMINI_DRAMC_BASE	GEMINI_DRAMC_BASE