Support xserver for prep.

It tested only s3(864).
This commit is contained in:
kiyohara 2010-07-12 07:54:11 +00:00
parent 01c06fb42e
commit 299d82b760
10 changed files with 170 additions and 15 deletions

View File

@ -0,0 +1,136 @@
# $NetBSD: md.prep,v 1.4 2010/07/12 07:54:11 kiyohara Exp $
./usr/X11R7/bin/X -unknown- xorg
./usr/X11R7/bin/Xorg -unknown- xorg
./usr/X11R7/bin/cvt -unknown- xorg
./usr/X11R7/bin/gtf -unknown- xorg
./usr/X11R7/lib/X11/doc/README.DRI -unknown- xorg
./usr/X11R7/lib/X11/doc/README.rapidaccess -unknown- xorg
./usr/X11R7/lib/modules/dri/mga_dri.so -unknown- xorg
./usr/X11R7/lib/modules/dri/mga_dri.so.0 -unknown- xorg
./usr/X11R7/lib/modules/drivers/cirrus_alpine.so -unknown- xorg
./usr/X11R7/lib/modules/drivers/cirrus_alpine.so.1 -unknown- xorg
./usr/X11R7/lib/modules/drivers/cirrus_drv.so -unknown- xorg
./usr/X11R7/lib/modules/drivers/cirrus_drv.so.1 -unknown- xorg
./usr/X11R7/lib/modules/drivers/kbd_drv.so -unknown- xorg
./usr/X11R7/lib/modules/drivers/kbd_drv.so.1 -unknown- xorg
./usr/X11R7/lib/modules/drivers/mga_drv.so -unknown- xorg
./usr/X11R7/lib/modules/drivers/mga_drv.so.1 -unknown- xorg
./usr/X11R7/lib/modules/drivers/mouse_drv.so -unknown- xorg
./usr/X11R7/lib/modules/drivers/mouse_drv.so.1 -unknown- xorg
./usr/X11R7/lib/modules/drivers/s3_drv.so -unknown- xorg
./usr/X11R7/lib/modules/drivers/s3_drv.so.0 -unknown- xorg
./usr/X11R7/lib/modules/drivers/ws_drv.so -unknown- xorg
./usr/X11R7/lib/modules/drivers/ws_drv.so.1 -unknown- xorg
./usr/X11R7/lib/modules/extensions/libdbe.a -unknown- xorg
./usr/X11R7/lib/modules/extensions/libdbe.so -unknown- xorg
./usr/X11R7/lib/modules/extensions/libdbe.so.0 -unknown- xorg
./usr/X11R7/lib/modules/extensions/libdbe_g.a -unknown- debuglib,xorg
./usr/X11R7/lib/modules/extensions/libdbe_pic.a -unknown- xorg
./usr/X11R7/lib/modules/extensions/libdri.a -unknown- xorg
./usr/X11R7/lib/modules/extensions/libdri.so -unknown- xorg
./usr/X11R7/lib/modules/extensions/libdri.so.0 -unknown- xorg
./usr/X11R7/lib/modules/extensions/libdri_g.a -unknown- debuglib,xorg
./usr/X11R7/lib/modules/extensions/libdri_pic.a -unknown- xorg
./usr/X11R7/lib/modules/extensions/libdri2.a -unknown- xorg
./usr/X11R7/lib/modules/extensions/libdri2.so -unknown- xorg
./usr/X11R7/lib/modules/extensions/libdri2.so.0 -unknown- xorg
./usr/X11R7/lib/modules/extensions/libdri2_g.a -unknown- debuglib,xorg
./usr/X11R7/lib/modules/extensions/libdri2_pic.a -unknown- xorg
./usr/X11R7/lib/modules/extensions/libextmod.a -unknown- xorg
./usr/X11R7/lib/modules/extensions/libextmod.so -unknown- xorg
./usr/X11R7/lib/modules/extensions/libextmod.so.0 -unknown- xorg
./usr/X11R7/lib/modules/extensions/libextmod_g.a -unknown- debuglib,xorg
./usr/X11R7/lib/modules/extensions/libextmod_pic.a -unknown- xorg
./usr/X11R7/lib/modules/extensions/libglx.a -unknown- xorg
./usr/X11R7/lib/modules/extensions/libglx.so -unknown- xorg
./usr/X11R7/lib/modules/extensions/libglx.so.0 -unknown- xorg
./usr/X11R7/lib/modules/extensions/libglx_g.a -unknown- debuglib,xorg
./usr/X11R7/lib/modules/extensions/libglx_pic.a -unknown- xorg
./usr/X11R7/lib/modules/extensions/librecord.a -unknown- xorg
./usr/X11R7/lib/modules/extensions/librecord.so -unknown- xorg
./usr/X11R7/lib/modules/extensions/librecord.so.0 -unknown- xorg
./usr/X11R7/lib/modules/extensions/librecord_g.a -unknown- debuglib,xorg
./usr/X11R7/lib/modules/extensions/librecord_pic.a -unknown- xorg
./usr/X11R7/lib/modules/extensions/libshadow.a -unknown- xorg
./usr/X11R7/lib/modules/extensions/libshadow.so -unknown- xorg
./usr/X11R7/lib/modules/extensions/libshadow.so.0 -unknown- xorg
./usr/X11R7/lib/modules/extensions/libshadow_g.a -unknown- debuglib,xorg
./usr/X11R7/lib/modules/extensions/libshadow_pic.a -unknown- xorg
./usr/X11R7/lib/modules/libexa.a -unknown- xorg
./usr/X11R7/lib/modules/libexa.so -unknown- xorg
./usr/X11R7/lib/modules/libexa.so.0 -unknown- xorg
./usr/X11R7/lib/modules/libexa_g.a -unknown- debuglib,xorg
./usr/X11R7/lib/modules/libexa_pic.a -unknown- xorg
./usr/X11R7/lib/modules/libfb.a -unknown- xorg
./usr/X11R7/lib/modules/libfb.so -unknown- xorg
./usr/X11R7/lib/modules/libfb.so.0 -unknown- xorg
./usr/X11R7/lib/modules/libfb_g.a -unknown- debuglib,xorg
./usr/X11R7/lib/modules/libfb_pic.a -unknown- xorg
./usr/X11R7/lib/modules/libi2c.a -unknown- xorg
./usr/X11R7/lib/modules/libi2c.so -unknown- xorg
./usr/X11R7/lib/modules/libi2c.so.0 -unknown- xorg
./usr/X11R7/lib/modules/libi2c_g.a -unknown- debuglib,xorg
./usr/X11R7/lib/modules/libi2c_pic.a -unknown- xorg
./usr/X11R7/lib/modules/libint10.a -unknown- xorg
./usr/X11R7/lib/modules/libint10.so -unknown- xorg
./usr/X11R7/lib/modules/libint10.so.0 -unknown- xorg
./usr/X11R7/lib/modules/libint10_g.a -unknown- debuglib,xorg
./usr/X11R7/lib/modules/libint10_pic.a -unknown- xorg
./usr/X11R7/lib/modules/libshadowfb.a -unknown- xorg
./usr/X11R7/lib/modules/libshadowfb.so -unknown- xorg
./usr/X11R7/lib/modules/libshadowfb.so.0 -unknown- xorg
./usr/X11R7/lib/modules/libshadowfb_g.a -unknown- debuglib,xorg
./usr/X11R7/lib/modules/libshadowfb_pic.a -unknown- xorg
./usr/X11R7/lib/modules/libvbe.a -unknown- xorg
./usr/X11R7/lib/modules/libvbe.so -unknown- xorg
./usr/X11R7/lib/modules/libvbe.so.0 -unknown- xorg
./usr/X11R7/lib/modules/libvbe_g.a -unknown- debuglib,xorg
./usr/X11R7/lib/modules/libvbe_pic.a -unknown- xorg
./usr/X11R7/lib/modules/libvgahw.a -unknown- xorg
./usr/X11R7/lib/modules/libvgahw.so -unknown- xorg
./usr/X11R7/lib/modules/libvgahw.so.0 -unknown- xorg
./usr/X11R7/lib/modules/libvgahw_g.a -unknown- debuglib,xorg
./usr/X11R7/lib/modules/libvgahw_pic.a -unknown- xorg
./usr/X11R7/lib/modules/libxaa.a -unknown- xorg
./usr/X11R7/lib/modules/libxaa.so -unknown- xorg
./usr/X11R7/lib/modules/libxaa.so.0 -unknown- xorg
./usr/X11R7/lib/modules/libxaa_g.a -unknown- debuglib,xorg
./usr/X11R7/lib/modules/libxaa_pic.a -unknown- xorg
./usr/X11R7/lib/modules/libxf8_16bpp.a -unknown- xorg
./usr/X11R7/lib/modules/libxf8_16bpp.so -unknown- xorg
./usr/X11R7/lib/modules/libxf8_16bpp.so.0 -unknown- xorg
./usr/X11R7/lib/modules/libxf8_16bpp_g.a -unknown- debuglib,xorg
./usr/X11R7/lib/modules/libxf8_16bpp_pic.a -unknown- xorg
./usr/X11R7/man/cat1/Xorg.0 -unknown- .cat,xorg
./usr/X11R7/man/cat1/cvt.0 -unknown- .cat,xorg
./usr/X11R7/man/cat1/gtf.0 -unknown- .cat,xorg
./usr/X11R7/man/cat4/cirrus.0 -unknown- .cat,xorg
./usr/X11R7/man/cat4/exa.0 -unknown- .cat,xorg
./usr/X11R7/man/cat4/kbd.0 -unknown- .cat,xorg
./usr/X11R7/man/cat4/mga.0 -unknown- .cat,xorg
./usr/X11R7/man/cat4/mousedrv.0 -unknown- .cat,xorg
./usr/X11R7/man/cat4/s3.0 -unknown- .cat,xorg
./usr/X11R7/man/cat4/ws.0 -unknown- .cat,xorg
./usr/X11R7/man/cat5/xorg.conf.0 -unknown- .cat,xorg
./usr/X11R7/man/html1/Xorg.html -unknown- html,xorg
./usr/X11R7/man/html1/cvt.html -unknown- html,xorg
./usr/X11R7/man/html1/gtf.html -unknown- html,xorg
./usr/X11R7/man/html4/cirrus.html -unknown- html,xorg
./usr/X11R7/man/html4/exa.html -unknown- html,xorg
./usr/X11R7/man/html4/kbd.html -unknown- html,xorg
./usr/X11R7/man/html4/mousedrv.html -unknown- html,xorg
./usr/X11R7/man/html4/mga.html -unknown- html,xorg
./usr/X11R7/man/html4/s3.html -unknown- html,xorg
./usr/X11R7/man/html4/ws.html -unknown- html,xorg
./usr/X11R7/man/html5/xorg.conf.html -unknown- html,xorg
./usr/X11R7/man/man1/Xorg.1 -unknown- .man,xorg
./usr/X11R7/man/man1/cvt.1 -unknown- .man,xorg
./usr/X11R7/man/man1/gtf.1 -unknown- .man,xorg
./usr/X11R7/man/man4/cirrus.4 -unknown- .man,xorg
./usr/X11R7/man/man4/exa.4 -unknown- .man,xorg
./usr/X11R7/man/man4/kbd.4 -unknown- .man,xorg
./usr/X11R7/man/man4/mga.4 -unknown- .man,xorg
./usr/X11R7/man/man4/mousedrv.4 -unknown- .man,xorg
./usr/X11R7/man/man4/s3.4 -unknown- .man,xorg
./usr/X11R7/man/man4/ws.4 -unknown- .man,xorg
./usr/X11R7/man/man5/xorg.conf.5 -unknown- .man,xorg

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.14 2010/05/23 21:31:52 mrg Exp $
# $NetBSD: Makefile,v 1.15 2010/07/12 07:54:12 kiyohara Exp $
SUBDIR= libmesa .WAIT
@ -11,6 +11,8 @@ SUBDIR+= mach64 mga r128 r200 r300 r600 radeon
.elif ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
SUBDIR+= i810 i915 i965 mach64 mga r128 r200 r300 r600 radeon \
savage sis tdfx unichrome
.elif ${MACHINE} == "prep"
SUBDIR+= mga
.endif
SUBDIR+= swrast

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.44 2010/06/19 18:17:55 tsutsui Exp $
# $NetBSD: Makefile,v 1.45 2010/07/12 07:54:12 kiyohara Exp $
SUBDIR= \
xf86-input-keyboard \
@ -170,6 +170,13 @@ SUBDIR+= \
.elif ${MACHINE} == "zaurus"
SUBDIR+= \
xf86-video-wsfb
.elif ${MACHINE} == "prep"
SUBDIR+= \
xf86-video-cirrus \
xf86-video-cirrus_alpine \
xf86-video-mga \
xf86-video-s3 \
xf86-video-vga
.endif
# broken with xorg-server 1.6

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.8 2009/08/28 17:20:07 ahoka Exp $
# $NetBSD: Makefile,v 1.9 2010/07/12 07:54:12 kiyohara Exp $
DRIVER= xf86-video-s3
DRIVER_NAME= s3_drv
@ -7,6 +7,7 @@ DRIVER_VERSION= 0.6.3
SRCS= s3_bios.c s3_cursor.c s3_dga.c s3_driver.c s3_IBMRGB.c \
s3_Ti.c s3_Trio64DAC.c s3_video.c s3_accel.c \
s3_accel_newmmio.c s3_shadow.c
SRCS+= s3_GENDAC.c
MAN= s3.4
# PLEASE NOTE: s3_accel.c is compiled two times with different

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile.common,v 1.12 2010/06/19 18:17:55 tsutsui Exp $
# $NetBSD: Makefile.common,v 1.13 2010/07/12 07:54:12 kiyohara Exp $
# These define parts of the Xserver tree that are to be
# conditionally compiled for different platforms. See
@ -49,7 +49,7 @@ XSERVER_XNEWSMIPS?= yes
${MACHINE} == "sgimips" || ${MACHINE} == "shark" || \
${MACHINE} == "netwinder" || ${MACHINE} == "sparc64" || \
${MACHINE} == "sparc" || ${MACHINE} == "alpha" || \
${MACHINE} == "zaurus"
${MACHINE} == "zaurus" || ${MACHINE} == "prep"
XSERVER_NEEDS_XFONT= yes
XSERVER_XFREE86= yes
.endif

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.12 2009/06/11 05:43:17 mrg Exp $
# $NetBSD: Makefile,v 1.13 2010/07/12 07:54:12 kiyohara Exp $
SUBDIR= cvt gtf
#SUBDIR= cvt gtf xorgconfig
@ -9,7 +9,8 @@ SUBDIR= cvt gtf
.if ${MACHINE} == "cats" || ${MACHINE} == "macppc" || \
${MACHINE} == "netwinder" || ${MACHINE_ARCH} == "sparc" || \
${MACHINE_ARCH} == "sparc64" || ${MACHINE_ARCH} == "alpha"
${MACHINE_ARCH} == "sparc64" || ${MACHINE_ARCH} == "alpha" || \
${MACHINE} == "prep"
#SUBDIR+=pcitweak scanpci
.endif

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.21 2010/06/19 18:17:56 tsutsui Exp $
# $NetBSD: Makefile,v 1.22 2010/07/12 07:54:12 kiyohara Exp $
.include "../../../Makefile.serverlib"
.include "../../../Makefile.servermod"
@ -32,7 +32,7 @@ CPPFLAGS.${_FN}+= -DUSE_I386_IOPL -DPCVT_SUPPORT -DWSCONS_SUPPORT \
.endfor
.endif
.if ${MACHINE} == "macppc"
.if ${MACHINE} == "macppc" || ${MACHINE} == "prep"
SRCS.bsd+= ppc_video.c stdResource.c pm_noop.c lnx_agp.c
.for _FN in ${SRCS.bsd}
CPPFLAGS.${_FN}= -DWSCONS_SUPPORT -DUSESTDRES -DHAVE_SYSV_IPC
@ -90,7 +90,8 @@ SRCS.bus+= Pci.c
.if ${MACHINE} == "macppc" || ${MACHINE} == "cats" || \
${MACHINE} == "sgimips" || ${MACHINE} == "shark" || \
${MACHINE} == "netwinder" || ${MACHINE_ARCH} == "sparc" || \
${MACHINE_ARCH} == "sparc64" || ${MACHINE_ARCH} == "alpha"
${MACHINE_ARCH} == "sparc64" || ${MACHINE_ARCH} == "alpha" || \
${MACHINE} == "prep"
#SRCS.bus+= netbsdPci.c
.endif
@ -114,7 +115,7 @@ SRCS.misc= Delay.c
${MACHINE} == "sgimips" || ${MACHINE_ARCH} == "sparc64" || \
${MACHINE_ARCH} == "sparc" || ${MACHINE} == "netwinder" || \
${MACHINE} == "shark" || ${MACHINE} == "ofppc" || \
${MACHINE_ARCH} == "alpha"
${MACHINE_ARCH} == "alpha" || ${MACHINE} == "prep"
#SRCS.misc+= CBUSmemcpy.c CIODelay.c CSlowBcopy.c
.endif

View File

@ -1,4 +1,4 @@
# $NetBSD: bsd.x11.mk,v 1.85 2010/06/17 03:10:21 mrg Exp $
# $NetBSD: bsd.x11.mk,v 1.86 2010/07/12 07:54:12 kiyohara Exp $
.include <bsd.init.mk>
@ -113,6 +113,7 @@ X11FLAGS.EXTENSION+= -D__GLX_ALIGN64
${MACHINE} == "macppc" || \
${MACHINE} == "netwinder" || \
${MACHINE} == "ofppc" || \
${MACHINE} == "prep" || \
${MACHINE} == "sgimips" || \
${MACHINE} == "sparc64" || \
${MACHINE} == "sparc" || \

View File

@ -1,4 +1,4 @@
# $NetBSD: GENERIC,v 1.154 2010/07/05 07:55:55 kiyohara Exp $
# $NetBSD: GENERIC,v 1.155 2010/07/12 07:54:13 kiyohara Exp $
#
# GENERIC machine description file
#
@ -22,7 +22,7 @@ include "arch/prep/conf/std.prep"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
#ident "GENERIC-$Revision: 1.154 $"
#ident "GENERIC-$Revision: 1.155 $"
maxusers 32
@ -165,6 +165,9 @@ options WSEMUL_VT100 # VT100 / VT220 emulation
# different kernel output - see dev/wscons/wsdisplayvar.h
options WS_KERNEL_FG=WSCOL_GREEN
#options WS_KERNEL_BG=WSCOL_BLACK
# compatibility to other console drivers
options WSDISPLAY_COMPAT_USL # VT handling
options WSDISPLAY_COMPAT_RAWKBD # can get raw scancodes
# see dev/pckbport/wskbdmap_mfii.c for implemented layouts
#options PCKBD_LAYOUT="(KB_DE | KB_NODEAD)"
# allocate a number of virtual screens at autoconfiguration time

View File

@ -1,4 +1,4 @@
/* $NetBSD: param.h,v 1.4 2001/06/17 16:01:29 nonaka Exp $ */
/* $NetBSD: param.h,v 1.5 2010/07/12 07:54:13 kiyohara Exp $ */
/*-
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@ -47,3 +47,6 @@
#define KERNBASE 0x100000
#include <powerpc/param.h>
/* at this offset we mmap() the PCI IO range in display drivers */
#define PCI_MAGIC_IO_RANGE 0xf2000000