Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch/usermode get rid of urkelvisor, and use same MD maj...
details: https://anonhg.NetBSD.org/src/rev/6881a2e07af7
branches: trunk
changeset: 772151:6881a2e07af7
user: jmcneill <jmcneill%NetBSD.org@localhost>
date: Tue Dec 20 21:01:39 2011 +0000
description:
get rid of urkelvisor, and use same MD majors as the host
diffstat:
sys/arch/usermode/conf/GENERIC | 64 ---------
sys/arch/usermode/conf/GENERIC.common | 61 ++++++++
sys/arch/usermode/conf/GENERIC.i386 | 17 ++
sys/arch/usermode/conf/GENERIC32 | 12 -
sys/arch/usermode/conf/Makefile.usermode | 16 +--
sys/arch/usermode/conf/files.usermode | 3 +-
sys/arch/usermode/conf/majors.usermode | 15 +--
sys/arch/usermode/conf/std.usermode | 5 +-
sys/arch/usermode/include/urkelvisor.h | 34 ----
sys/arch/usermode/usermode/machdep.c | 13 +-
sys/arch/usermode/usermode/pmap.c | 11 +-
sys/arch/usermode/usermode/urkelvisor.c | 212 -------------------------------
12 files changed, 86 insertions(+), 377 deletions(-)
diffs (truncated from 607 to 300 lines):
diff -r 512a098f0f20 -r 6881a2e07af7 sys/arch/usermode/conf/GENERIC
--- a/sys/arch/usermode/conf/GENERIC Tue Dec 20 19:49:36 2011 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,64 +0,0 @@
-# $NetBSD: GENERIC,v 1.24 2011/12/15 11:26:04 jmcneill Exp $
-
-include "arch/usermode/conf/std.usermode"
-
-options INCLUDE_CONFIG_FILE
-#ident "GENERIC-$Revision: 1.24 $"
-maxusers 32
-
-makeoptions DEBUG="-O1 -g3"
-
-options TEXTADDR=0x0f000000 # 1.5 Gb?
-options KVMSIZE=0x008000000
-
-options RTC_OFFSET=0
-options KTRACE
-#options USERCONF
-
-options SYSVMSG
-options SYSVSEM
-options SYSVSHM
-
-options DEBUG
-#options DDB # missing support
-options DIAGNOSTIC
-options LOCKDEBUG
-#options DEBUG_EXEC
-options CPU_DEBUG
-#options UVMHIST
-#options UVMHIST_PRINT
-
-options COMPAT_BSDPTY
-options COMPAT_50
-
-file-system FFS
-file-system MFS
-file-system FDESC
-file-system KERNFS
-file-system PROCFS
-file-system PTYFS
-file-system TMPFS
-options WAPBL
-
-options INET
-options INET6
-options NFS_BOOT_DHCP
-options NFS_BOOT_BOOTPARAM
-
-config netbsd root on ? type ?
-
-mainbus0 at root
-cpu0 at mainbus?
-clock0 at mainbus?
-ttycons0 at mainbus?
-ld0 at mainbus?
-
-#options SDL
-#genfb0 at thunkbus?
-#wsdisplay0 at genfb?
-
-pseudo-device loop
-pseudo-device pty
-
-# Pull in optional local configuration
-cinclude "arch/usermode/conf/GENERIC.local"
diff -r 512a098f0f20 -r 6881a2e07af7 sys/arch/usermode/conf/GENERIC.common
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/usermode/conf/GENERIC.common Tue Dec 20 21:01:39 2011 +0000
@@ -0,0 +1,61 @@
+# $NetBSD: GENERIC.common,v 1.1 2011/12/20 21:01:39 jmcneill Exp $
+
+include "arch/usermode/conf/std.usermode"
+
+options INCLUDE_CONFIG_FILE
+#ident "GENERIC-$Revision: 1.1 $"
+maxusers 32
+
+makeoptions DEBUG="-O1 -g3"
+
+options RTC_OFFSET=0
+options KTRACE
+#options USERCONF
+
+options SYSVMSG
+options SYSVSEM
+options SYSVSHM
+
+options DEBUG
+#options DDB # missing support
+options DIAGNOSTIC
+options LOCKDEBUG
+#options DEBUG_EXEC
+options CPU_DEBUG
+#options UVMHIST
+#options UVMHIST_PRINT
+
+options COMPAT_BSDPTY
+options COMPAT_50
+
+file-system FFS
+file-system MFS
+file-system FDESC
+file-system KERNFS
+file-system PROCFS
+file-system PTYFS
+file-system TMPFS
+options WAPBL
+
+options INET
+options INET6
+options NFS_BOOT_DHCP
+options NFS_BOOT_BOOTPARAM
+
+config netbsd root on ? type ?
+
+mainbus0 at root
+cpu0 at mainbus?
+clock0 at mainbus?
+ttycons0 at mainbus?
+ld0 at mainbus?
+
+#options SDL
+#genfb0 at thunkbus?
+#wsdisplay0 at genfb?
+
+pseudo-device loop
+pseudo-device pty
+
+# Pull in optional local configuration
+cinclude "arch/usermode/conf/GENERIC.local"
diff -r 512a098f0f20 -r 6881a2e07af7 sys/arch/usermode/conf/GENERIC.i386
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/usermode/conf/GENERIC.i386 Tue Dec 20 21:01:39 2011 +0000
@@ -0,0 +1,17 @@
+# $NetBSD: GENERIC.i386,v 1.1 2011/12/20 21:01:39 jmcneill Exp $
+
+machine usermode
+include "arch/usermode/conf/GENERIC.common"
+include "arch/i386/conf/majors.i386"
+
+no options EXEC_ELF64
+
+options TEXTADDR=0x0f000000 # 1.5 Gb?
+options KVMSIZE=0x008000000
+
+makeoptions COPTS+="-m32"
+makeoptions LD="ld -melf_i386"
+
+#options INCLUDE_CONFIG_FILE
+#ident "GENERIC32-$Revision: 1.1 $"
+
diff -r 512a098f0f20 -r 6881a2e07af7 sys/arch/usermode/conf/GENERIC32
--- a/sys/arch/usermode/conf/GENERIC32 Tue Dec 20 19:49:36 2011 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-# $NetBSD: GENERIC32,v 1.2 2011/08/12 11:22:11 jmcneill Exp $
-
-include "arch/usermode/conf/GENERIC"
-
-no options EXEC_ELF64
-
-makeoptions COPTS+="-m32"
-makeoptions LD="ld -melf_i386"
-
-#options INCLUDE_CONFIG_FILE
-#ident "GENERIC32-$Revision: 1.2 $"
-
diff -r 512a098f0f20 -r 6881a2e07af7 sys/arch/usermode/conf/Makefile.usermode
--- a/sys/arch/usermode/conf/Makefile.usermode Tue Dec 20 19:49:36 2011 +0000
+++ b/sys/arch/usermode/conf/Makefile.usermode Tue Dec 20 21:01:39 2011 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.usermode,v 1.24 2011/09/16 11:28:36 jmcneill Exp $
+# $NetBSD: Makefile.usermode,v 1.25 2011/12/20 21:01:39 jmcneill Exp $
OPT_CPU_HOST= %CPU_HOST%
.if !empty(OPT_CPU_HOST)
@@ -38,7 +38,6 @@
CPPFLAGS.init_main.c+= -Dmain=kernmain
OPT_SDL= %SDL%
-OPT_URKELVISOR= %URKELVISOR%
.if !empty(OPT_SDL)
SDL_CFLAGS!= sdl-config --cflags
@@ -48,7 +47,6 @@
CPPFLAGS.thunk.c+= ${USERMODE_CPPFLAGS}
CPPFLAGS.thunk_sdl.c+= ${SDL_CFLAGS} ${USERMODE_CPPFLAGS}
-CPPFLAGS.urkelvisor.c+= ${USERMODE_CPPFLAGS}
##
## (3) libkern and compat
@@ -63,11 +61,6 @@
MD_CFILES= ${USERMODE}/usermode/thunk.c
MD_SFILES=
-.if !empty(OPT_URKELVISOR)
-MD_OBJS+= urkelvisor.o
-MD_CFILES+= ${USERMODE}/usermode/urkelvisor.c
-.endif
-
.if !empty(OPT_SDL)
MD_OBJS+= thunk_sdl.o
MD_CFILES+= ${USERMODE}/usermode/thunk_sdl.c
@@ -112,13 +105,6 @@
thunk_sdl.o: ${USERMODE}/usermode/thunk_sdl.c
${CC} ${CPPFLAGS.thunk_sdl.c} -c -o $@ ${USERMODE}/usermode/thunk_sdl.c
-urkelvisor.d: ${USERMODE}/usermode/urkelvisor.c
- ${MKDEP} -f ${.TARGET} -- ${MKDEP_CFLAGS} \
- ${CPPFLAGS.urkelvisor.c} ${USERMODE}/usermode/urkelvisor.c
-
-urkelvisor.o: ${USERMODE}/usermode/urkelvisor.c
- ${CC} ${CPPFLAGS.urkelvisor.c} -c -o $@ ${USERMODE}/usermode/urkelvisor.c
-
##
## (7) misc settings
##
diff -r 512a098f0f20 -r 6881a2e07af7 sys/arch/usermode/conf/files.usermode
--- a/sys/arch/usermode/conf/files.usermode Tue Dec 20 19:49:36 2011 +0000
+++ b/sys/arch/usermode/conf/files.usermode Tue Dec 20 21:01:39 2011 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: files.usermode,v 1.11 2011/09/16 11:28:36 jmcneill Exp $
+# $NetBSD: files.usermode,v 1.12 2011/12/20 21:01:39 jmcneill Exp $
maxpartitions 8
maxusers 8 16 64
@@ -8,7 +8,6 @@
defflag opt_cpu.h CPU_DEBUG
defparam opt_cpu.h CPU_HOST
defparam opt_misc.h TEXTADDR
-defflag opt_urkelvisor.h URKELVISOR
define thunkbus { }
diff -r 512a098f0f20 -r 6881a2e07af7 sys/arch/usermode/conf/majors.usermode
--- a/sys/arch/usermode/conf/majors.usermode Tue Dec 20 19:49:36 2011 +0000
+++ b/sys/arch/usermode/conf/majors.usermode Tue Dec 20 21:01:39 2011 +0000
@@ -1,15 +1,2 @@
-# $NetBSD: majors.usermode,v 1.4 2011/12/11 22:34:42 jmcneill Exp $
-
-device-major cons char 0
-device-major ctty char 1
-device-major mem char 2
-#device-major wd char 3
-device-major swap char 4 block 1 vmswap
-device-major pts char 5 pty
-device-major ptc char 6 pty
-device-major log char 7
-device-major com char 8 com
-device-major md char 24 block 17 md
-device-major wsdisplay char 47 wsdisplay
-device-major ld char 69 block 19 ld
+# $NetBSD: majors.usermode,v 1.5 2011/12/20 21:01:39 jmcneill Exp $
device-major ttycons char 159 ttycons
diff -r 512a098f0f20 -r 6881a2e07af7 sys/arch/usermode/conf/std.usermode
--- a/sys/arch/usermode/conf/std.usermode Tue Dec 20 19:49:36 2011 +0000
+++ b/sys/arch/usermode/conf/std.usermode Tue Dec 20 21:01:39 2011 +0000
@@ -1,6 +1,5 @@
-# $NetBSD: std.usermode,v 1.8 2011/12/13 20:58:47 reinoud Exp $
+# $NetBSD: std.usermode,v 1.9 2011/12/20 21:01:39 jmcneill Exp $
-machine usermode
include "conf/std"
options HZ=100
@@ -8,8 +7,6 @@
options EXEC_ELF64
options EXEC_SCRIPT
-options URKELVISOR
-
# Defaults
options NKMEMPAGES=4096
#options NKMEMPAGES_MAX_DEFAULT=2048
diff -r 512a098f0f20 -r 6881a2e07af7 sys/arch/usermode/include/urkelvisor.h
--- a/sys/arch/usermode/include/urkelvisor.h Tue Dec 20 19:49:36 2011 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
-/* $NetBSD: urkelvisor.h,v 1.1 2011/09/03 12:28:45 jmcneill Exp $ */
-
-/*-
- * Copyright (c) 2011 Jared D. McNeill <jmcneill%invisible.ca@localhost>
- * All rights reserved.
- *
- * 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
Home |
Main Index |
Thread Index |
Old Index