CVS commit: src/sys/arch/evbppc/conf

2024-09-22 Thread Jared D. McNeill
Module Name:src
Committed By:   jmcneill
Date:   Sun Sep 22 14:07:13 UTC 2024

Modified Files:
src/sys/arch/evbppc/conf: WII

Log Message:
wii: Enable ohci(4) driver.

This seems to be stable now, let's enable support for plugging in LS/FS
devices directly into the system without a hub.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/evbppc/conf/WII

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/evbppc/conf/WII
diff -u src/sys/arch/evbppc/conf/WII:1.5 src/sys/arch/evbppc/conf/WII:1.6
--- src/sys/arch/evbppc/conf/WII:1.5	Tue Sep 17 13:47:30 2024
+++ src/sys/arch/evbppc/conf/WII	Sun Sep 22 14:07:13 2024
@@ -1,4 +1,4 @@
-#	$NetBSD: WII,v 1.5 2024/09/17 13:47:30 jakllsch Exp $
+#	$NetBSD: WII,v 1.6 2024/09/22 14:07:13 jmcneill Exp $
 #
 #	Nintendo Wii
 #
@@ -147,8 +147,8 @@ avenc0		at iic0 addr 0x70			# A/V Encode
 resetbtn0	at hollywood0 irq 17			# Reset button
 
 ehci0		at hollywood0 addr 0x0d04 irq 4	# EHCI
-#ohci0		at hollywood0 addr 0x0d05 irq 5	# OHCI0
-#ohci1		at hollywood0 addr 0x0d06 irq 6	# OHCI1
+ohci0		at hollywood0 addr 0x0d05 irq 5	# OHCI0
+ohci1		at hollywood0 addr 0x0d06 irq 6	# OHCI1
 usb*		at usbus?
 
 sdhc0		at hollywood0 addr 0x0d07 irq 7	# SD card



CVS commit: src/sys/arch/evbppc/conf

2024-09-22 Thread Jared D. McNeill
Module Name:src
Committed By:   jmcneill
Date:   Sun Sep 22 14:07:13 UTC 2024

Modified Files:
src/sys/arch/evbppc/conf: WII

Log Message:
wii: Enable ohci(4) driver.

This seems to be stable now, let's enable support for plugging in LS/FS
devices directly into the system without a hub.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/evbppc/conf/WII

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



CVS commit: src/sys/arch/evbppc/conf

2024-09-17 Thread Jonathan A. Kollasch
Module Name:src
Committed By:   jakllsch
Date:   Tue Sep 17 13:47:30 UTC 2024

Modified Files:
src/sys/arch/evbppc/conf: WII

Log Message:
Add DKWEDGE_AUTODISCOVER and DKWEDGE_METHOD_GPT to WII

>From Guilherme Janczak in PR 58676


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/evbppc/conf/WII

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



CVS commit: src/sys/arch/evbppc/conf

2024-09-17 Thread Jonathan A. Kollasch
Module Name:src
Committed By:   jakllsch
Date:   Tue Sep 17 13:47:30 UTC 2024

Modified Files:
src/sys/arch/evbppc/conf: WII

Log Message:
Add DKWEDGE_AUTODISCOVER and DKWEDGE_METHOD_GPT to WII

>From Guilherme Janczak in PR 58676


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/evbppc/conf/WII

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/evbppc/conf/WII
diff -u src/sys/arch/evbppc/conf/WII:1.4 src/sys/arch/evbppc/conf/WII:1.5
--- src/sys/arch/evbppc/conf/WII:1.4	Thu Jan 25 11:47:53 2024
+++ src/sys/arch/evbppc/conf/WII	Tue Sep 17 13:47:30 2024
@@ -1,4 +1,4 @@
-#	$NetBSD: WII,v 1.4 2024/01/25 11:47:53 jmcneill Exp $
+#	$NetBSD: WII,v 1.5 2024/09/17 13:47:30 jakllsch Exp $
 #
 #	Nintendo Wii
 #
@@ -46,6 +46,10 @@ makeoptions DEBUG="-g"	# compile full sy
 include 	"conf/compat_netbsd50.config"
 #options 	COMPAT_386BSD_MBRPART # recognize old partition ID
 
+# Wedge support
+options 	DKWEDGE_AUTODISCOVER	# Automatically add dk(4) instances
+options 	DKWEDGE_METHOD_GPT	# Supports GPT partitions as wedges
+
 # File systems
 file-system 	FFS		# UFS
 file-system 	EXT2FS		# second extended file system (linux)



CVS commit: src/sys/arch/evbppc/conf

2024-02-11 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sun Feb 11 17:16:05 UTC 2024

Modified Files:
src/sys/arch/evbppc/conf: Makefile.obs405.inc

Log Message:
PR/57924: Jan-Benedict Glaw: Use $MKREPRO_TIMESTAMP for mkubootimage


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/evbppc/conf/Makefile.obs405.inc

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/evbppc/conf/Makefile.obs405.inc
diff -u src/sys/arch/evbppc/conf/Makefile.obs405.inc:1.13 src/sys/arch/evbppc/conf/Makefile.obs405.inc:1.14
--- src/sys/arch/evbppc/conf/Makefile.obs405.inc:1.13	Thu Jul 28 18:46:48 2016
+++ src/sys/arch/evbppc/conf/Makefile.obs405.inc	Sun Feb 11 12:16:05 2024
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.obs405.inc,v 1.13 2016/07/28 22:46:48 maya Exp $
+#	$NetBSD: Makefile.obs405.inc,v 1.14 2024/02/11 17:16:05 christos Exp $
 
 CFLAGS+=-mcpu=405
 AFLAGS+=-mcpu=405
@@ -49,6 +49,9 @@ MKUBOOTIMAGE=		mkubootimage
 MKUBOOTIMAGEARGS=	-A powerpc -T kernel
 MKUBOOTIMAGEARGS+=	-a $(TEXTADDR)
 MKUBOOTIMAGEARGS+=	-n "NetBSD/openblocks600 ${_OSRELEASE}"
+.if ${MKREPRO_TIMESTAMP:Uno} != "no"
+MKUBOOTIMAGEARGS+=	-t "${MKREPRO_TIMESTAMP}"
+.endif
 MKUBOOTIMAGEARGS_NONE=  ${MKUBOOTIMAGEARGS} -C none
 MKUBOOTIMAGEARGS_GZ=${MKUBOOTIMAGEARGS} -C gz
 



CVS commit: src/sys/arch/evbppc/conf

2024-02-11 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sun Feb 11 17:16:05 UTC 2024

Modified Files:
src/sys/arch/evbppc/conf: Makefile.obs405.inc

Log Message:
PR/57924: Jan-Benedict Glaw: Use $MKREPRO_TIMESTAMP for mkubootimage


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/evbppc/conf/Makefile.obs405.inc

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



CVS commit: src/sys/arch/evbppc/conf

2024-01-25 Thread Jared D. McNeill
Module Name:src
Committed By:   jmcneill
Date:   Fri Jan 26 00:49:22 UTC 2024

Modified Files:
src/sys/arch/evbppc/conf: Makefile.wii.inc std.wii

Log Message:
wii: Remove objcopy after kernel build.

HBC will do the right thing.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbppc/conf/Makefile.wii.inc
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/evbppc/conf/std.wii

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/evbppc/conf/Makefile.wii.inc
diff -u src/sys/arch/evbppc/conf/Makefile.wii.inc:1.1 src/sys/arch/evbppc/conf/Makefile.wii.inc:1.2
--- src/sys/arch/evbppc/conf/Makefile.wii.inc:1.1	Sat Jan 20 21:35:59 2024
+++ src/sys/arch/evbppc/conf/Makefile.wii.inc	Fri Jan 26 00:49:22 2024
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.wii.inc,v 1.1 2024/01/20 21:35:59 jmcneill Exp $
+#	$NetBSD: Makefile.wii.inc,v 1.2 2024/01/26 00:49:22 jmcneill Exp $
 
 CFLAGS+=-mcpu=750
 AFLAGS+=-mcpu=750
@@ -11,7 +11,3 @@ BEGIN:
 
 SYSTEM_FIRST_OBJ=	${BOARDTYPE}_locore.o
 SYSTEM_FIRST_SFILE=	${THISPPC}/${BOARDTYPE}/${BOARDTYPE}_locore.S
-
-SYSTEM_LD_TAIL= \
-	mv $@ $@_${TEXTADDR}.elf ; \
-	${OBJCOPY} --adjust-vma 0x8000 $@_${TEXTADDR}.elf $@

Index: src/sys/arch/evbppc/conf/std.wii
diff -u src/sys/arch/evbppc/conf/std.wii:1.2 src/sys/arch/evbppc/conf/std.wii:1.3
--- src/sys/arch/evbppc/conf/std.wii:1.2	Mon Jan 22 21:23:03 2024
+++ src/sys/arch/evbppc/conf/std.wii	Fri Jan 26 00:49:22 2024
@@ -1,4 +1,4 @@
-#	$NetBSD: std.wii,v 1.2 2024/01/22 21:23:03 jmcneill Exp $
+#	$NetBSD: std.wii,v 1.3 2024/01/26 00:49:22 jmcneill Exp $
 #
 # standard, required NetBSD/wii 'options'
 
@@ -15,7 +15,6 @@ options		EVBPPC_HAS_MBR
 
 options 	INTSTK=0x2000
 
-#makeoptions	TEXTADDR=0x80004000
 makeoptions	TEXTADDR=0x4000
 options 	DISTANT_KERNEL
 makeoptions 	EXTRA_LINKFLAGS="-q"



CVS commit: src/sys/arch/evbppc/conf

2024-01-25 Thread Jared D. McNeill
Module Name:src
Committed By:   jmcneill
Date:   Fri Jan 26 00:49:22 UTC 2024

Modified Files:
src/sys/arch/evbppc/conf: Makefile.wii.inc std.wii

Log Message:
wii: Remove objcopy after kernel build.

HBC will do the right thing.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbppc/conf/Makefile.wii.inc
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/evbppc/conf/std.wii

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



CVS commit: src/sys/arch/evbppc/conf

2024-01-22 Thread Jared D. McNeill
Module Name:src
Committed By:   jmcneill
Date:   Mon Jan 22 21:23:03 UTC 2024

Modified Files:
src/sys/arch/evbppc/conf: std.wii

Log Message:
wii: Fix a comment


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbppc/conf/std.wii

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/evbppc/conf/std.wii
diff -u src/sys/arch/evbppc/conf/std.wii:1.1 src/sys/arch/evbppc/conf/std.wii:1.2
--- src/sys/arch/evbppc/conf/std.wii:1.1	Sat Jan 20 21:35:59 2024
+++ src/sys/arch/evbppc/conf/std.wii	Mon Jan 22 21:23:03 2024
@@ -1,11 +1,11 @@
-#	$NetBSD: std.wii,v 1.1 2024/01/20 21:35:59 jmcneill Exp $
+#	$NetBSD: std.wii,v 1.2 2024/01/22 21:23:03 jmcneill Exp $
 #
 # standard, required NetBSD/wii 'options'
 
 machine		evbppc powerpc
 include		"conf/std"	# MI standard options
 
-options 	PPC_OEA		# Nintendo Wii uses IBM PPC750CXe CPUs
+options 	PPC_OEA		# Nintendo Wii uses IBM PPC750CL CPUs
 makeoptions 	PPCDIR="oea"	# Tell Makefile.powerpc what dir to use
 
 # Executable support:



CVS commit: src/sys/arch/evbppc/conf

2024-01-22 Thread Jared D. McNeill
Module Name:src
Committed By:   jmcneill
Date:   Mon Jan 22 21:23:03 UTC 2024

Modified Files:
src/sys/arch/evbppc/conf: std.wii

Log Message:
wii: Fix a comment


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbppc/conf/std.wii

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



CVS commit: src/sys/arch/evbppc/conf

2022-09-11 Thread Rin Okuyama
Module Name:src
Committed By:   rin
Date:   Sun Sep 11 09:14:56 UTC 2022

Modified Files:
src/sys/arch/evbppc/conf: Makefile.evbppc.inc

Log Message:
Add hack for clang for ibm4xx/trap.c.

Integrated as does not recognize {l,st}swx, that have been
requisite insns by architecture since 601.

Also, it does not pass gas for appropriate -mfoo flag.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/evbppc/conf/Makefile.evbppc.inc

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/evbppc/conf/Makefile.evbppc.inc
diff -u src/sys/arch/evbppc/conf/Makefile.evbppc.inc:1.8 src/sys/arch/evbppc/conf/Makefile.evbppc.inc:1.9
--- src/sys/arch/evbppc/conf/Makefile.evbppc.inc:1.8	Sat Jun 25 02:26:53 2011
+++ src/sys/arch/evbppc/conf/Makefile.evbppc.inc	Sun Sep 11 09:14:56 2022
@@ -1,7 +1,19 @@
-#	$NetBSD: Makefile.evbppc.inc,v 1.8 2011/06/25 02:26:53 matt Exp $
+#	$NetBSD: Makefile.evbppc.inc,v 1.9 2022/09/11 09:14:56 rin Exp $
 
 CPPFLAGS += -D__${BOARDTYPE}__
 
 RAMDISKDIR!=	cd ${NETBSDSRCDIR}/distrib/${THISPPC:T}/ramdisk && ${PRINTOBJDIR}
 
 .-include "${THISPPC}/conf/Makefile.${BOARDTYPE}.inc"
+
+# XXX hack for clang:
+# - integrated as does not recognize {l,st}swx.
+# - it does not pass gas for appropriate -mfoo flag.
+.if ${ACTIVE_CC} == "clang"
+.  if !empty(AFLAGS:M-mcpu=403)
+COPTS.trap.c+=	-fno-integrated-as -Wa,-m403
+.  endif
+.  if !empty(AFLAGS:M-mcpu=405)
+COPTS.trap.c+=	-fno-integrated-as -Wa,-m405
+.  endif
+.endif



CVS commit: src/sys/arch/evbppc/conf

2022-09-11 Thread Rin Okuyama
Module Name:src
Committed By:   rin
Date:   Sun Sep 11 09:14:56 UTC 2022

Modified Files:
src/sys/arch/evbppc/conf: Makefile.evbppc.inc

Log Message:
Add hack for clang for ibm4xx/trap.c.

Integrated as does not recognize {l,st}swx, that have been
requisite insns by architecture since 601.

Also, it does not pass gas for appropriate -mfoo flag.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/evbppc/conf/Makefile.evbppc.inc

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



CVS commit: src/sys/arch/evbppc/conf

2022-08-06 Thread Rin Okuyama
Module Name:src
Committed By:   rin
Date:   Sun Aug  7 03:08:40 UTC 2022

Modified Files:
src/sys/arch/evbppc/conf: RB800

Log Message:
Enable UFS_DIRHASH; this machine has 256MB RAM :)


To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 src/sys/arch/evbppc/conf/RB800

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/evbppc/conf/RB800
diff -u src/sys/arch/evbppc/conf/RB800:1.39 src/sys/arch/evbppc/conf/RB800:1.40
--- src/sys/arch/evbppc/conf/RB800:1.39	Sun Aug  7 02:52:25 2022
+++ src/sys/arch/evbppc/conf/RB800	Sun Aug  7 03:08:40 2022
@@ -1,4 +1,4 @@
-#	$NetBSD: RB800,v 1.39 2022/08/07 02:52:25 simonb Exp $
+#	$NetBSD: RB800,v 1.40 2022/08/07 03:08:40 rin Exp $
 #
 #	RB800 -- everything that's currently supported
 #
@@ -7,7 +7,7 @@ include 	"arch/evbppc/conf/std.mpc85xx"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-ident 		"RB800-$Revision: 1.39 $"
+ident 		"RB800-$Revision: 1.40 $"
 
 maxusers	32
 
@@ -86,7 +86,7 @@ options 	FFS_EI		# FFS Endian Independen
 #options 	FFS_NO_SNAPSHOT	# No FFS snapshot support
 options 	QUOTA		# legacy UFS quotas
 options 	QUOTA2		# new, in-filesystem UFS quotas
-#options 	UFS_DIRHASH	# UFS Large Directory Hashing
+options 	UFS_DIRHASH	# UFS Large Directory Hashing
 #options 	UFS_EXTATTR	# Extended attribute support for UFS1
 options 	WAPBL		# File system journaling support
 #options 	LFS_DIRHASH	# LFS version of UFS_DIRHASH - experimental



CVS commit: src/sys/arch/evbppc/conf

2022-08-06 Thread Rin Okuyama
Module Name:src
Committed By:   rin
Date:   Sun Aug  7 03:08:40 UTC 2022

Modified Files:
src/sys/arch/evbppc/conf: RB800

Log Message:
Enable UFS_DIRHASH; this machine has 256MB RAM :)


To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 src/sys/arch/evbppc/conf/RB800

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



Re: CVS commit: src/sys/arch/evbppc/conf

2011-06-24 Thread Christos Zoulas
On Jun 23,  9:02pm, m...@3am-software.com (Matt Thomas) wrote:
-- Subject: Re: CVS commit: src/sys/arch/evbppc/conf

| Already doing that.  Pretty certain I'm the only one using RB800 so ...
| I want to do some timings to compare MKPIE=yes against MKPIE=no.

Great.

| > - just using options PAX_ASLR is probably safer and you can then enable
| >  it with: sysctl -w security.pax.aslr.enabled=1
| 
| PAX_ASLR requires a value.

Right, set it to 0

christos


Re: CVS commit: src/sys/arch/evbppc/conf

2011-06-23 Thread Matt Thomas

On Jun 23, 2011, at 6:50 PM, Christos Zoulas wrote:

> In article <20110624004847.8a0ce17...@cvs.netbsd.org>,
> Matt Thomas  wrote:
>> -=-=-=-=-=-
>> 
>> Module Name: src
>> Committed By:matt
>> Date:Fri Jun 24 00:48:47 UTC 2011
>> 
>> Modified Files:
>>  src/sys/arch/evbppc/conf: RB800
>> 
>> Log Message:
>> Turn on PAX_ASLR
> 
> I am fine with that, just 2 comments.
> - to fully take advantage of ASLR you need MKPIE=yes so that the text
>  and data segments get randomized too.

Already doing that.  Pretty certain I'm the only one using RB800 so ...
I want to do some timings to compare MKPIE=yes against MKPIE=no.

> - just using options PAX_ASLR is probably safer and you can then enable
>  it with: sysctl -w security.pax.aslr.enabled=1

PAX_ASLR requires a value.




Re: CVS commit: src/sys/arch/evbppc/conf

2011-06-23 Thread Christos Zoulas
In article <20110624004847.8a0ce17...@cvs.netbsd.org>,
Matt Thomas  wrote:
>-=-=-=-=-=-
>
>Module Name:   src
>Committed By:  matt
>Date:  Fri Jun 24 00:48:47 UTC 2011
>
>Modified Files:
>   src/sys/arch/evbppc/conf: RB800
>
>Log Message:
>Turn on PAX_ASLR

I am fine with that, just 2 comments.
- to fully take advantage of ASLR you need MKPIE=yes so that the text
  and data segments get randomized too.
- just using options PAX_ASLR is probably safer and you can then enable
  it with: sysctl -w security.pax.aslr.enabled=1

christos



CVS commit: src/sys/arch/evbppc/conf

2010-03-10 Thread KIYOHARA Takashi
Module Name:src
Committed By:   kiyohara
Date:   Wed Mar 10 17:40:31 UTC 2010

Modified Files:
src/sys/arch/evbppc/conf: OPENBLOCKS266_OPT

Log Message:
Assorted spelling/capitalization fixes from Igor Sobrado in PR kern/22595.
Remove multiple njata.
Add uthum, udl, stuirda, uchcom, uberry, u3g, ugensa, uvideo.


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/evbppc/conf/OPENBLOCKS266_OPT

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



CVS commit: src/sys/arch/evbppc/conf

2010-03-10 Thread KIYOHARA Takashi
Module Name:src
Committed By:   kiyohara
Date:   Wed Mar 10 17:40:31 UTC 2010

Modified Files:
src/sys/arch/evbppc/conf: OPENBLOCKS266_OPT

Log Message:
Assorted spelling/capitalization fixes from Igor Sobrado in PR kern/22595.
Remove multiple njata.
Add uthum, udl, stuirda, uchcom, uberry, u3g, ugensa, uvideo.


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/evbppc/conf/OPENBLOCKS266_OPT

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/evbppc/conf/OPENBLOCKS266_OPT
diff -u src/sys/arch/evbppc/conf/OPENBLOCKS266_OPT:1.12 src/sys/arch/evbppc/conf/OPENBLOCKS266_OPT:1.13
--- src/sys/arch/evbppc/conf/OPENBLOCKS266_OPT:1.12	Sun Mar  7 09:39:42 2010
+++ src/sys/arch/evbppc/conf/OPENBLOCKS266_OPT	Wed Mar 10 17:40:31 2010
@@ -1,4 +1,4 @@
-#	$NetBSD: OPENBLOCKS266_OPT,v 1.12 2010/03/07 09:39:42 plunky Exp $
+#	$NetBSD: OPENBLOCKS266_OPT,v 1.13 2010/03/10 17:40:31 kiyohara Exp $
 #
 
 include		"arch/evbppc/conf/OPENBLOCKS266"
@@ -6,13 +6,13 @@
 cbb*	at pci? dev ? function ?
 cardslot* at cbb?
 cardbus* at cardslot?
-pcmcia*	at cardslot?
+pcmcia* at cardslot?
 
 
 # PCMCIA serial interfaces
 com*	at pcmcia? function ?		# Modems and serial cards
 
-pcmcom*	at pcmcia? function ?		# PCMCIA multi-port serial cards
+pcmcom* at pcmcia? function ?		# PCMCIA multi-port serial cards
 com*	at pcmcom? slave ?		# ...and the slave devices
 
 # CardBus serial interfaces
@@ -42,17 +42,15 @@
 uk*	at scsibus? target ? lun ?	# SCSI unknown
 
 
-# CardBus IDE controllers
-#njata*	at cardbus? function ? flags 0x01	# Workbit NinjaATA-32
-
 # PCMCIA IDE controllers
 wdc*	at pcmcia? function ?
 
 # CardBus IDE controllers
-#njata*	at cardbus? function ? flags 0x01	# Workbit NinjaATA-32
+njata*	at cardbus? function ? flags 0x01	# Workbit NinjaATA-32
+siisata* at cardbus? function ?			# SiI SteelVine controllers
 
 # ATA (IDE) bus support
-atabus*	at ata?
+atabus* at ata?
 options ATADEBUG
 
 # IDE drives
@@ -92,42 +90,43 @@
 # CardBus network cards
 ath*	at cardbus? function ?		# Atheros 5210/5211/5212 802.11
 atw*	at cardbus? function ?		# ADMtek ADM8211 (802.11)
-ex*	at cardbus? function ?		# 3Com 3C575TX
+ex*	at cardbus? function ?		# 3Com 3c575TX
 fxp*	at cardbus? function ?		# Intel i8255x
 ral*	at cardbus? function ?		# Ralink Technology RT25x0 802.11a/b/g
+re*	at cardbus? function ?		# Realtek 8139C+/8169/8169S/8110S
 rtk*	at cardbus? function ?		# Realtek 8129/8139
 rtw*	at cardbus? function ?		# Realtek 8180L (802.11)
 tlp*	at cardbus? function ?		# DECchip 21143
 
 # MII/PHY support
 acphy*	at mii? phy ?			# Altima AC101 and AMD Am79c874 PHYs
-amhphy*	at mii? phy ?			# AMD 79c901 Ethernet PHYs
-bmtphy*	at mii? phy ?			# Broadcom BCM5201 and BCM5202 PHYs
-brgphy*	at mii? phy ?			# Broadcom BCM5400-family PHYs
+amhphy* at mii? phy ?			# AMD 79c901 Ethernet PHYs
+bmtphy* at mii? phy ?			# Broadcom BCM5201 and BCM5202 PHYs
+brgphy* at mii? phy ?			# Broadcom BCM5400-family PHYs
 ciphy*	at mii? phy ?			# Cicada CS8201 Gig-E PHYs
 dmphy*	at mii? phy ?			# Davicom DM9101 PHYs
 exphy*	at mii? phy ?			# 3Com internal PHYs
-gentbi*	at mii? phy ?			# Generic Ten-Bit 1000BASE-[CLS]X PHYs
+gentbi* at mii? phy ?			# Generic Ten-Bit 1000BASE-[CLS]X PHYs
 glxtphy* at mii? phy ?			# Level One LXT-1000 PHYs
 gphyter* at mii? phy ?			# NS83861 Gig-E PHY
-icsphy*	at mii? phy ?			# Integrated Circuit Systems ICS189x
+icsphy* at mii? phy ?			# Integrated Circuit Systems ICS189x
 igphy*	at mii? phy ?			# Intel IGP01E1000
 ikphy*	at mii? phy ?			# Intel 82563 PHYs
 inphy*	at mii? phy ?			# Intel 82555 PHYs
 iophy*	at mii? phy ?			# Intel 82553 PHYs
-lxtphy*	at mii? phy ?			# Level One LXT-970 PHYs
-makphy*	at mii? phy ?			# Marvell Semiconductor 88E1000 PHYs
+lxtphy* at mii? phy ?			# Level One LXT-970 PHYs
+makphy* at mii? phy ?			# Marvell Semiconductor 88E1000 PHYs
 nsphy*	at mii? phy ?			# NS83840 PHYs
 nsphyter* at mii? phy ?			# NS83843 PHYs
-pnaphy*	at mii? phy ?			# generic HomePNA PHYs
+pnaphy* at mii? phy ?			# generic HomePNA PHYs
 qsphy*	at mii? phy ?			# Quality Semiconductor QS6612 PHYs
-rgephy*	at mii? phy ?			# Realtek 8169S/8110S internal PHYs
+rgephy* at mii? phy ?			# Realtek 8169S/8110S internal PHYs
 rlphy*	at mii? phy ?			# Realtek 8139/8201L PHYs
 sqphy*	at mii? phy ?			# Seeq 80220/80221/80223 PHYs
 tlphy*	at mii? phy ?			# ThunderLAN PHYs
 tqphy*	at mii? phy ?			# TDK Semiconductor PHYs
 ukphy*	at mii? phy ?			# generic unknown PHYs
-urlphy*	at mii? phy ?			# Realtek RTL8150L internal PHYs
+urlphy* at mii? phy ?			# Realtek RTL8150L internal PHYs
 
 
 # CardBus USB controllers
@@ -135,7 +134,7 @@
 ohci*	at cardbus? function ?		# Open Host Controller
 uhci*	at cardbus? function ?		# Universal Host Controller (Intel)
 
-# PCMCIA USB controllers   
+# PCMCIA USB controllers
 slhci*	at pcmcia? function ?		# ScanLogic SL811HS
 
 # USB bus support
@@ -149,7 +148,7 @@
 uhub*	at uhub? port ?

CVS commit: src/sys/arch/evbppc/conf

2010-03-10 Thread KIYOHARA Takashi
Module Name:src
Committed By:   kiyohara
Date:   Wed Mar 10 17:25:21 UTC 2010

Modified Files:
src/sys/arch/evbppc/conf: OPENBLOCKS266

Log Message:
Assorted spelling/capitalization fixes from Igor Sobrado in PR kern/22595.
=


To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.47 src/sys/arch/evbppc/conf/OPENBLOCKS266

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/evbppc/conf/OPENBLOCKS266
diff -u src/sys/arch/evbppc/conf/OPENBLOCKS266:1.46 src/sys/arch/evbppc/conf/OPENBLOCKS266:1.47
--- src/sys/arch/evbppc/conf/OPENBLOCKS266:1.46	Thu Dec 24 09:29:36 2009
+++ src/sys/arch/evbppc/conf/OPENBLOCKS266	Wed Mar 10 17:25:21 2010
@@ -1,4 +1,4 @@
-#	$NetBSD: OPENBLOCKS266,v 1.46 2009/12/24 09:29:36 kiyohara Exp $
+#	$NetBSD: OPENBLOCKS266,v 1.47 2010/03/10 17:25:21 kiyohara Exp $
 #
 #	GENERIC -- everything that's currently supported
 #
@@ -7,7 +7,7 @@
 
 #options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"OPENBLOCKS266-$Revision: 1.46 $"
+#ident 		"OPENBLOCKS266-$Revision: 1.47 $"
 
 maxusers	32
 
@@ -114,7 +114,7 @@
 
 options 	GATEWAY		# packet forwarding
 options 	INET		# IP + ICMP + TCP + UDP
-options 	INET6		# IPV6
+options 	INET6		# IPv6
 #options 	IPSEC		# IP security
 #options 	IPSEC_ESP	# IP security (encryption part; define w/IPSEC)
 #options 	IPSEC_NAT_T	# IPsec NAT traversal (NAT-T)
@@ -209,8 +209,8 @@
 pseudo-device	tap			# virtual ethernet
 pseudo-device	tun			# network tunneling over tty
 pseudo-device	gre			# generic L3 over IP tunnel
-pseudo-device	gif			# IPv[46] over IPv[46] tunnel (RFC1933)
-#pseudo-device	faith			# IPv[46] tcp relay translation i/f
+pseudo-device	gif			# IPv[46] over IPv[46] tunnel (RFC 1933)
+#pseudo-device	faith			# IPv[46] TCP relay translation i/f
 pseudo-device	stf			# 6to4 IPv6 over IPv4 encapsulation
 pseudo-device	vlan			# IEEE 802.1q encapsulation
 pseudo-device	bridge			# simple inter-network bridging



CVS commit: src/sys/arch/evbppc/conf

2010-03-10 Thread KIYOHARA Takashi
Module Name:src
Committed By:   kiyohara
Date:   Wed Mar 10 17:25:21 UTC 2010

Modified Files:
src/sys/arch/evbppc/conf: OPENBLOCKS266

Log Message:
Assorted spelling/capitalization fixes from Igor Sobrado in PR kern/22595.
=


To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.47 src/sys/arch/evbppc/conf/OPENBLOCKS266

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