Module Name: src
Committed By: matt
Date: Thu Dec 17 05:29:56 UTC 2009
Modified Files:
src/sys/arch/newsmips/newsmips: locore_machdep.S machdep.c
src/sys/arch/newsmips/stand/boot: Makefile
Log Message:
More changes to make newsmips compile (include "assym.h, remove unused
variables, etc.)
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/newsmips/newsmips/locore_machdep.S
cvs rdiff -u -r1.106 -r1.107 src/sys/arch/newsmips/newsmips/machdep.c
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/newsmips/stand/boot/Makefile
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/newsmips/newsmips/locore_machdep.S
diff -u src/sys/arch/newsmips/newsmips/locore_machdep.S:1.14 src/sys/arch/newsmips/newsmips/locore_machdep.S:1.15
--- src/sys/arch/newsmips/newsmips/locore_machdep.S:1.14 Sun Dec 11 12:18:25 2005
+++ src/sys/arch/newsmips/newsmips/locore_machdep.S Thu Dec 17 05:29:56 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: locore_machdep.S,v 1.14 2005/12/11 12:18:25 christos Exp $ */
+/* $NetBSD: locore_machdep.S,v 1.15 2009/12/17 05:29:56 matt Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -60,6 +60,8 @@
#include <machine/machConst.h>
#include <machine/param.h>
+#include "assym.h"
+
.set noreorder
LEAF(to_monitor)
Index: src/sys/arch/newsmips/newsmips/machdep.c
diff -u src/sys/arch/newsmips/newsmips/machdep.c:1.106 src/sys/arch/newsmips/newsmips/machdep.c:1.107
--- src/sys/arch/newsmips/newsmips/machdep.c:1.106 Mon Dec 14 00:46:09 2009
+++ src/sys/arch/newsmips/newsmips/machdep.c Thu Dec 17 05:29:56 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.106 2009/12/14 00:46:09 matt Exp $ */
+/* $NetBSD: machdep.c,v 1.107 2009/12/17 05:29:56 matt Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -76,7 +76,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.106 2009/12/14 00:46:09 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.107 2009/12/17 05:29:56 matt Exp $");
/* from: Utah Hdr: machdep.c 1.63 91/04/24 */
@@ -216,9 +216,7 @@
mach_init(int x_boothowto, int x_bootdev, int x_bootname, int x_maxmem)
{
u_long first, last;
- struct pcb *pcb0;
char *kernend;
- vaddr_t v;
struct btinfo_magic *bi_magic;
struct btinfo_bootarg *bi_arg;
struct btinfo_systype *bi_systype;
@@ -378,7 +376,7 @@
/*
* Allocate uarea page for lwp0 and set it.
*/
- pmap_init_lwp0_uarea();
+ mips_init_lwp0_uarea();
/*
* Determine what model of computer we are running on.
Index: src/sys/arch/newsmips/stand/boot/Makefile
diff -u src/sys/arch/newsmips/stand/boot/Makefile:1.21 src/sys/arch/newsmips/stand/boot/Makefile:1.22
--- src/sys/arch/newsmips/stand/boot/Makefile:1.21 Wed Dec 16 23:19:07 2009
+++ src/sys/arch/newsmips/stand/boot/Makefile Thu Dec 17 05:29:56 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2009/12/16 23:19:07 matt Exp $
+# $NetBSD: Makefile,v 1.22 2009/12/17 05:29:56 matt Exp $
S!= cd ${.CURDIR}/../../../..; pwd
@@ -25,9 +25,8 @@
CPPFLAGS+= -D_STANDALONE #-DBOOT_DEBUG
CPPFLAGS+= -I${.CURDIR} -I. -I${S}
CPPFLAGS+= -D__daddr_t=int32_t
-CPPFLAGS+= -DMIPS_KSEG1_START=0xa0000000
-AFLAGS= -D_LOCORE -mno-abicalls
+AFLAGS= -D_LOCORE -mno-abicalls -DMIPS_KSEG1_START=0xa0000000
LIBS = ${COMMON}/romcalls.o
LIBS+= ${COMMON}/lib/sa/libsa.a
