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

2020-02-19 Thread Rin Okuyama
Module Name:src
Committed By:   rin
Date:   Thu Feb 20 05:03:54 UTC 2020

Modified Files:
src/sys/arch/powerpc/conf: files.powerpc

Log Message:
Add PPC_IBM440 flag as 440 is significantly different from 40x processors.
(It may be more easily supported by booke than by ibm4xx.)


To generate a diff of this commit:
cvs rdiff -u -r1.92 -r1.93 src/sys/arch/powerpc/conf/files.powerpc

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/powerpc/conf/files.powerpc
diff -u src/sys/arch/powerpc/conf/files.powerpc:1.92 src/sys/arch/powerpc/conf/files.powerpc:1.93
--- src/sys/arch/powerpc/conf/files.powerpc:1.92	Sat Apr  6 03:06:26 2019
+++ src/sys/arch/powerpc/conf/files.powerpc	Thu Feb 20 05:03:54 2020
@@ -1,9 +1,9 @@
-#	$NetBSD: files.powerpc,v 1.92 2019/04/06 03:06:26 thorpej Exp $
+#	$NetBSD: files.powerpc,v 1.93 2020/02/20 05:03:54 rin Exp $
 
 defflag	opt_altivec.h	ALTIVEC K_ALTIVEC PPC_HAVE_SPE
 defflag	opt_openpic.h	OPENPIC_DISTRIBUTE
 defparam opt_ppcparam.h	L2CR_CONFIG L3CR_CONFIG INTSTK CLOCKBASE VERBOSE_INITPPC
-defflag	opt_ppcarch.h	PPC_OEA PPC_OEA601 PPC_OEA64 PPC_OEA64_BRIDGE PPC_MPC8XX PPC_IBM4XX PPC_IBM403 PPC_BOOKE
+defflag	opt_ppcarch.h	PPC_OEA PPC_OEA601 PPC_OEA64 PPC_OEA64_BRIDGE PPC_MPC8XX PPC_IBM4XX PPC_IBM403 PPC_IBM440 PPC_BOOKE
 defflag opt_ppccache.h	CACHE_PROTO_MEI
 defflag opt_pmap.h	PMAPDEBUG PMAPCHECK PMAPCOUNTERS PMAP_MINIMALTLB
 defparam opt_pmap.h	PTEGCOUNT PMAP_MEMLIMIT



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

2016-02-27 Thread Joerg Sonnenberger
Module Name:src
Committed By:   joerg
Date:   Sat Feb 27 21:48:34 UTC 2016

Modified Files:
src/sys/arch/powerpc/conf: Makefile.powerpc

Log Message:
clang now supports normal soft float.


To generate a diff of this commit:
cvs rdiff -u -r1.59 -r1.60 src/sys/arch/powerpc/conf/Makefile.powerpc

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/powerpc/conf/Makefile.powerpc
diff -u src/sys/arch/powerpc/conf/Makefile.powerpc:1.59 src/sys/arch/powerpc/conf/Makefile.powerpc:1.60
--- src/sys/arch/powerpc/conf/Makefile.powerpc:1.59	Mon Aug 24 14:04:25 2015
+++ src/sys/arch/powerpc/conf/Makefile.powerpc	Sat Feb 27 21:48:34 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.powerpc,v 1.59 2015/08/24 14:04:25 uebayasi Exp $
+#	$NetBSD: Makefile.powerpc,v 1.60 2016/02/27 21:48:34 joerg Exp $
 #
 # Makefile for NetBSD
 #
@@ -48,8 +48,8 @@ DEFCOPTS=	-O2
 CFLAGS+=	-fstack-protector
 CFLAGS+=	${${ACTIVE_CC} == "gcc":? -misel :}
 .endif
-CFLAGS+=	${${ACTIVE_CC} == "gcc":? -msdata=none -msoft-float :}
-CFLAGS+=	${${ACTIVE_CC} == "clang":? -mllvm -disable-ppc-float-in-variadic=true :}
+CFLAGS+=	${${ACTIVE_CC} == "gcc":? -msdata=none :}
+CFLAGS+=	-msoft-float
 CFLAGS+=	${CCPUOPTS}
 AFLAGS+=	${AOPTS} -D_NOREGNAMES
 



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

2014-11-15 Thread Masao Uebayashi
Module Name:src
Committed By:   uebayasi
Date:   Sat Nov 15 12:36:42 UTC 2014

Modified Files:
src/sys/arch/powerpc/conf: Makefile.powerpc

Log Message:
Use LINKSCRIPT.


To generate a diff of this commit:
cvs rdiff -u -r1.57 -r1.58 src/sys/arch/powerpc/conf/Makefile.powerpc

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/powerpc/conf/Makefile.powerpc
diff -u src/sys/arch/powerpc/conf/Makefile.powerpc:1.57 src/sys/arch/powerpc/conf/Makefile.powerpc:1.58
--- src/sys/arch/powerpc/conf/Makefile.powerpc:1.57	Sun Aug 10 17:44:26 2014
+++ src/sys/arch/powerpc/conf/Makefile.powerpc	Sat Nov 15 12:36:42 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.powerpc,v 1.57 2014/08/10 17:44:26 joerg Exp $
+#	$NetBSD: Makefile.powerpc,v 1.58 2014/11/15 12:36:42 uebayasi Exp $
 #
 # Makefile for NetBSD
 #
@@ -84,7 +84,8 @@ ${SYSTEM_FIRST_OBJ}: ${SYSTEM_FIRST_SFIL
 ##
 KERNLDSCRIPT?=	${POWERPC}/conf/kern.ldscript
 TEXTADDR?=	0x10
-LINKFORMAT=	-N -T ${KERNLDSCRIPT}
+LINKFORMAT=	-N
+LINKSCRIPT=	-T ${KERNLDSCRIPT}
 
 ENTRYPOINT=	__start
 



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

2014-03-06 Thread Matt Thomas
Module Name:src
Committed By:   matt
Date:   Thu Mar  6 09:24:07 UTC 2014

Modified Files:
src/sys/arch/powerpc/conf: Makefile.powerpc

Log Message:
When building a DEBUG kernel, mdsetimage into the .gdb as well (so if it's
used with gxemul, it has the md image in it.)


To generate a diff of this commit:
cvs rdiff -u -r1.53 -r1.54 src/sys/arch/powerpc/conf/Makefile.powerpc

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/powerpc/conf/Makefile.powerpc
diff -u src/sys/arch/powerpc/conf/Makefile.powerpc:1.53 src/sys/arch/powerpc/conf/Makefile.powerpc:1.54
--- src/sys/arch/powerpc/conf/Makefile.powerpc:1.53	Fri Feb 28 05:48:22 2014
+++ src/sys/arch/powerpc/conf/Makefile.powerpc	Thu Mar  6 09:24:07 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.powerpc,v 1.53 2014/02/28 05:48:22 matt Exp $
+#	$NetBSD: Makefile.powerpc,v 1.54 2014/03/06 09:24:07 matt Exp $
 #
 # Makefile for NetBSD
 #
@@ -93,6 +93,11 @@ SYSTEM_DEP+=	${RAMDISKDIR}/ramdisk.fs
 SYSTEM_LD_TAIL_EXTRA+=; \
 	echo ${TOOL_MDSETIMAGE} -s $@ ${RAMDISKDIR}/ramdisk.fs; \
 	${TOOL_MDSETIMAGE} -s $@ ${RAMDISKDIR}/ramdisk.fs
+.if !empty(DEBUG:M-g*)
+SYSTEM_LD_TAIL_EXTRA+=; \
+	echo ${TOOL_MDSETIMAGE} -s $@.gdb ${RAMDISKDIR}/ramdisk.fs; \
+	${TOOL_MDSETIMAGE} -s $@.gdb ${RAMDISKDIR}/ramdisk.fs
+.endif
 .endif
 
 .if defined(NEED_SREC)  ${NEED_SREC} != no



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

2014-03-04 Thread Matt Thomas
Module Name:src
Committed By:   matt
Date:   Tue Mar  4 08:25:11 UTC 2014

Modified Files:
src/sys/arch/powerpc/conf: files.powerpc

Log Message:
compat16 - compat_16


To generate a diff of this commit:
cvs rdiff -u -r1.88 -r1.89 src/sys/arch/powerpc/conf/files.powerpc

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/powerpc/conf/files.powerpc
diff -u src/sys/arch/powerpc/conf/files.powerpc:1.88 src/sys/arch/powerpc/conf/files.powerpc:1.89
--- src/sys/arch/powerpc/conf/files.powerpc:1.88	Fri Feb 28 05:49:21 2014
+++ src/sys/arch/powerpc/conf/files.powerpc	Tue Mar  4 08:25:11 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: files.powerpc,v 1.88 2014/02/28 05:49:21 matt Exp $
+#	$NetBSD: files.powerpc,v 1.89 2014/03/04 08:25:11 matt Exp $
 
 defflag	opt_altivec.h	ALTIVEC K_ALTIVEC PPC_HAVE_SPE
 defflag	opt_openpic.h	OPENPIC_DISTRIBUTE
@@ -23,7 +23,7 @@ file	arch/powerpc/powerpc/powerpc_machde
 file	arch/powerpc/powerpc/process_machdep.c
 file	arch/powerpc/powerpc/setfault.S
 file	arch/powerpc/powerpc/sig_machdep.c
-file	arch/powerpc/powerpc/sigcode.S			compat16
+file	arch/powerpc/powerpc/sigcode.S			compat_16
 file	arch/powerpc/powerpc/softint_machdep.c
 file	arch/powerpc/powerpc/subyte.c
 file	arch/powerpc/powerpc/suword.c
@@ -68,6 +68,18 @@ file	arch/powerpc/booke/copyout.c			ppc_
 file	arch/powerpc/booke/kcopy.c			ppc_booke
 file	arch/powerpc/booke/spe.c			ppc_booke
 file	arch/powerpc/booke/trap.c			ppc_booke
+
+# MPC8xx (Power QUICC 1) Family files
+file	arch/powerpc/mpc8xx/mpc8xx_machdep.c		ppc_mpc8xx
+file	arch/powerpc/mpc8xx/mpc8xx_cache.c		ppc_mpc8xx
+file	arch/powerpc/mpc8xx/mpc8xx_pmap.c		ppc_mpc8xx
+file	arch/powerpc/mpc8xx/mpc8xx_stubs.c		ppc_mpc8xx
+file	arch/powerpc/mpc8xx/copyin.c			ppc_mpc8xx
+file	arch/powerpc/mpc8xx/copyout.c			ppc_mpc8xx
+file	arch/powerpc/mpc8xx/kcopy.c			ppc_mpc8xx
+file	arch/powerpc/mpc8xx/trap.c			ppc_mpc8xx
+
+# Common PMAP files
 file	uvm/pmap/pmap.c	ppc_booke
 file	uvm/pmap/pmap_segtab.cppc_booke
 file	uvm/pmap/pmap_tlb.cppc_booke



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

2014-02-27 Thread Matt Thomas
Module Name:src
Committed By:   matt
Date:   Fri Feb 28 05:48:22 UTC 2014

Modified Files:
src/sys/arch/powerpc/conf: Makefile.powerpc

Log Message:
Don't hardcode MACHINE_ARCH


To generate a diff of this commit:
cvs rdiff -u -r1.52 -r1.53 src/sys/arch/powerpc/conf/Makefile.powerpc

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/powerpc/conf/Makefile.powerpc
diff -u src/sys/arch/powerpc/conf/Makefile.powerpc:1.52 src/sys/arch/powerpc/conf/Makefile.powerpc:1.53
--- src/sys/arch/powerpc/conf/Makefile.powerpc:1.52	Fri Aug 23 06:25:02 2013
+++ src/sys/arch/powerpc/conf/Makefile.powerpc	Fri Feb 28 05:48:22 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.powerpc,v 1.52 2013/08/23 06:25:02 matt Exp $
+#	$NetBSD: Makefile.powerpc,v 1.53 2014/02/28 05:48:22 matt Exp $
 #
 # Makefile for NetBSD
 #
@@ -17,7 +17,7 @@
 #
 #	makeoptions DEBUGLIST=uvm* trap if_*
 
-MACHINE_ARCH=powerpc
+MACHINE_ARCH?=powerpc
 USETOOLS?=	no
 NEED_OWN_INSTALL_TARGET?=no
 .include bsd.own.mk



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

2014-02-27 Thread Matt Thomas
Module Name:src
Committed By:   matt
Date:   Fri Feb 28 05:49:21 UTC 2014

Modified Files:
src/sys/arch/powerpc/conf: files.powerpc

Log Message:
sigcode is dependant on compat_16


To generate a diff of this commit:
cvs rdiff -u -r1.87 -r1.88 src/sys/arch/powerpc/conf/files.powerpc

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/powerpc/conf/files.powerpc
diff -u src/sys/arch/powerpc/conf/files.powerpc:1.87 src/sys/arch/powerpc/conf/files.powerpc:1.88
--- src/sys/arch/powerpc/conf/files.powerpc:1.87	Sun Nov 17 14:34:12 2013
+++ src/sys/arch/powerpc/conf/files.powerpc	Fri Feb 28 05:49:21 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: files.powerpc,v 1.87 2013/11/17 14:34:12 alnsn Exp $
+#	$NetBSD: files.powerpc,v 1.88 2014/02/28 05:49:21 matt Exp $
 
 defflag	opt_altivec.h	ALTIVEC K_ALTIVEC PPC_HAVE_SPE
 defflag	opt_openpic.h	OPENPIC_DISTRIBUTE
@@ -23,7 +23,7 @@ file	arch/powerpc/powerpc/powerpc_machde
 file	arch/powerpc/powerpc/process_machdep.c
 file	arch/powerpc/powerpc/setfault.S
 file	arch/powerpc/powerpc/sig_machdep.c
-file	arch/powerpc/powerpc/sigcode.S
+file	arch/powerpc/powerpc/sigcode.S			compat16
 file	arch/powerpc/powerpc/softint_machdep.c
 file	arch/powerpc/powerpc/subyte.c
 file	arch/powerpc/powerpc/suword.c
@@ -71,6 +71,7 @@ file	arch/powerpc/booke/trap.c			ppc_boo
 file	uvm/pmap/pmap.c	ppc_booke
 file	uvm/pmap/pmap_segtab.cppc_booke
 file	uvm/pmap/pmap_tlb.cppc_booke
+#file	uvm/pmap/pmap_pv.cppc_booke
 
 # Binary compatibility with previous NetBSD releases (COMPAT_XX)
 file	arch/powerpc/powerpc/compat_13_machdep.c	compat_13
@@ -79,7 +80,7 @@ file	arch/powerpc/powerpc/compat_16_mach
 include compat/freebsd/files.freebsd 
 
 include compat/netbsd32/files.netbsd32
-file	arch/powerpc/powerpc/netbsd32_sigcode.S		compat_netbsd32
+file	arch/powerpc/powerpc/netbsd32_sigcode.S		compat_16  compat_netbsd32
 
 # OSS audio driver compatibility
 include compat/ossaudio/files.ossaudio	



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

2014-01-18 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Sun Jan 19 02:32:21 UTC 2014

Modified Files:
src/sys/arch/powerpc/conf: kern.ldscript

Log Message:
make this look more like the latest elf32ppc.x.  tested on pegasosII.


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

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/powerpc/conf/kern.ldscript
diff -u src/sys/arch/powerpc/conf/kern.ldscript:1.5 src/sys/arch/powerpc/conf/kern.ldscript:1.6
--- src/sys/arch/powerpc/conf/kern.ldscript:1.5	Sat Nov 16 12:00:21 2013
+++ src/sys/arch/powerpc/conf/kern.ldscript	Sun Jan 19 02:32:21 2014
@@ -1,7 +1,9 @@
-/* $NetBSD: kern.ldscript,v 1.5 2013/11/16 12:00:21 mrg Exp $ */
+/* $NetBSD: kern.ldscript,v 1.6 2014/01/19 02:32:21 mrg Exp $ */
 
-/*  ldscript for NetBSD/powerpc kernels and LKMs */
-OUTPUT_ARCH(powerpc)
+/*  ldscript for NetBSD/powerpc kernels and LKMs, based on elf32ppc.x */
+OUTPUT_FORMAT(elf32-powerpc, elf32-powerpc,
+	  elf32-powerpc)
+OUTPUT_ARCH(powerpc:common)
 ENTRY(_start)
 SEARCH_DIR(/lib);
 /* Do we need any of these?
@@ -14,29 +16,45 @@ SECTIONS
   .text  :
   {
 _ftext = . ;
+PROVIDE_HIDDEN (__eprol = .);
 *(.text)
-*(.text.startup)
-*(.text.unlikely)
+*(.text.unlikely .text.*_unlikely)
+*(.text.exit .text.exit.*)
+*(.text.startup .text.startup.*)
+*(.text.hot .text.hot.*)
+*(.text.* .gnu.linkonce.t.*)
 __stub_start = .;
 *(.stub)
 __stub_end = .;
 __stub_pmap_start = .;
 *(.stub.pmap)
 __stub_pmap_end = .;
+/* .gnu.warning sections are handled specially by elf32.em.  */
 *(.gnu.warning)
+*(.glink)
   } =0
   _etext = .;
+  PROVIDE (__etext = .);
+  PROVIDE (_etext = .);
   PROVIDE (etext = .);
-  .rodata: { *(.rodata) *(.rodata.*) }
+  .rodata : { *(.rodata .rodata.* .gnu.linkonce.r.*) }
+  .rodata1: { *(.rodata1) }
+  .sdata2 :
+  {
+PROVIDE (_SDA2_BASE_ = 32768);
+*(.sdata2 .sdata2.* .gnu.linkonce.s2.*)
+  }
+  .sbss2  : { *(.sbss2 .sbss2.* .gnu.linkonce.sb2.*) }
+  /*.jcr: { KEEP (*(.jcr)) } */ /* XXX??? */
   .reginfo : { *(.reginfo) }
 /*  . = . + 0x1000; */
-  .data:
+  .data   :
   {
 _fdata = . ;
-*(.data)
-CONSTRUCTORS
+*(.data .data.* .gnu.linkonce.d.*)
+SORT(CONSTRUCTORS)
   }
-  .data1			: { *(.data1) }
+  .data1  : { *(.data1) }
   . = ALIGN(32);	/* COHERENCY UNIT */
   .data.cacheline_aligned	: { *(.data.cacheline_aligned) }
   . = ALIGN(32);	/* COHERENCY UNIT */
@@ -45,32 +63,79 @@ SECTIONS
   _gp = ALIGN(16) + 0x7ff0;
   .lit8 : { *(.lit8) }
   .lit4 : { *(.lit4) }
-  .sdata : { *(.sdata) }
-  _edata  =  .;
-  PROVIDE (edata = .);
+  .sdata  :
+  {
+PROVIDE (_SDA_BASE_ = 32768);
+*(.sdata .sdata.* .gnu.linkonce.s.*)
+  }
+  _edata = .; PROVIDE (edata = .);
+  . = .;
   __bss_start = .;
   _fbss = .;
-  .sbss  : { *(.sbss) *(.scommon) }
-  .bss   :
+  .sbss   :
   {
-   *(.bss)
+PROVIDE (__sbss_start = .); PROVIDE (___sbss_start = .);
+*(.dynsbss)
+*(.sbss .sbss.* .gnu.linkonce.sb.*)
+*(.scommon)
+PROVIDE (__sbss_end = .); PROVIDE (___sbss_end = .);
+  }
+  .bss:
+  {
+   *(.dynbss)
+   *(.bss .bss.* .gnu.linkonce.b.*)
*(COMMON)
+   /* Align here to ensure that the .bss section occupies space up to
+  _end.  Align after .bss to ensure correct alignment even if the
+  .bss section disappears because there are no input sections.
+  FIXME: Why do we need it? When there is no .bss section, we don't
+  pad the .data section.  */
+   . = ALIGN(. != 0 ? 32 / 8 : 1);
   }
-  _end = . ;
-  PROVIDE (end = .);
-  /* These are needed for ELF backends which have not yet been
- converted to the new style linker.  */
-  .stab 0 : { *(.stab) }
-  .stabstr 0 : { *(.stabstr) }
+  . = ALIGN(32 / 8);
+  . = ALIGN(32 / 8);
+  __end = .;
+  _end = .; PROVIDE (end = .);
+  /* . = DATA_SEGMENT_END (.); */
+  /* Stabs debugging sections.  */
+  .stab  0 : { *(.stab) }
+  .stabstr   0 : { *(.stabstr) }
+  .stab.excl 0 : { *(.stab.excl) }
+  .stab.exclstr  0 : { *(.stab.exclstr) }
+  .stab.index0 : { *(.stab.index) }
+  .stab.indexstr 0 : { *(.stab.indexstr) }
+  .comment   0 : { *(.comment) }
   /* DWARF debug sections.
- Symbols in the .debug DWARF section are relative to the beginning of the
- section so we begin .debug at 0.  It's not clear yet what needs to happen
- for the others.   */
+ Symbols in the DWARF debugging sections are relative to the beginning
+ of the section so we begin them at 0.  */
+  /* DWARF 1 */
   .debug  0 : { *(.debug) }
+  .line   0 : { *(.line) }
+  /* GNU DWARF 1 extensions */
   .debug_srcinfo  0 : { *(.debug_srcinfo) }
+  .debug_sfnames  0 : { *(.debug_sfnames) }
+  /* DWARF 1.1 and 

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

2013-11-16 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Sat Nov 16 12:00:21 UTC 2013

Modified Files:
src/sys/arch/powerpc/conf: kern.ldscript

Log Message:
make sure that .text.startup and .text.unlikely end up in the
text section.  GCC 4.8 ofppc kernels now boot, though they are
unable to load the symbol table correctly.

also tested with GCC 4.5 and ofppc (pegasosII.)


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

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/powerpc/conf/kern.ldscript
diff -u src/sys/arch/powerpc/conf/kern.ldscript:1.4 src/sys/arch/powerpc/conf/kern.ldscript:1.5
--- src/sys/arch/powerpc/conf/kern.ldscript:1.4	Sat Feb 12 18:23:09 2011
+++ src/sys/arch/powerpc/conf/kern.ldscript	Sat Nov 16 12:00:21 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: kern.ldscript,v 1.4 2011/02/12 18:23:09 matt Exp $ */
+/* $NetBSD: kern.ldscript,v 1.5 2013/11/16 12:00:21 mrg Exp $ */
 
 /*  ldscript for NetBSD/powerpc kernels and LKMs */
 OUTPUT_ARCH(powerpc)
@@ -15,6 +15,8 @@ SECTIONS
   {
 _ftext = . ;
 *(.text)
+*(.text.startup)
+*(.text.unlikely)
 __stub_start = .;
 *(.stub)
 __stub_end = .;



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

2013-09-19 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Thu Sep 19 23:29:25 UTC 2013

Modified Files:
src/sys/arch/powerpc/conf: files.powerpc

Log Message:
remove unused OPENPIC flags.


To generate a diff of this commit:
cvs rdiff -u -r1.85 -r1.86 src/sys/arch/powerpc/conf/files.powerpc

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/powerpc/conf/files.powerpc
diff -u src/sys/arch/powerpc/conf/files.powerpc:1.85 src/sys/arch/powerpc/conf/files.powerpc:1.86
--- src/sys/arch/powerpc/conf/files.powerpc:1.85	Sat Oct 20 10:42:15 2012
+++ src/sys/arch/powerpc/conf/files.powerpc	Thu Sep 19 19:29:25 2013
@@ -1,7 +1,7 @@
-#	$NetBSD: files.powerpc,v 1.85 2012/10/20 14:42:15 kiyohara Exp $
+#	$NetBSD: files.powerpc,v 1.86 2013/09/19 23:29:25 christos Exp $
 
 defflag	opt_altivec.h	ALTIVEC K_ALTIVEC PPC_HAVE_SPE
-defflag	opt_openpic.h	OPENPIC OPENPIC_SERIAL_MODE OPENPIC_DISTRIBUTE
+defflag	opt_openpic.h	OPENPIC_DISTRIBUTE
 defparam opt_ppcparam.h	L2CR_CONFIG L3CR_CONFIG INTSTK CLOCKBASE VERBOSE_INITPPC
 defflag	opt_ppcarch.h	PPC_OEA PPC_OEA601 PPC_OEA64 PPC_OEA64_BRIDGE PPC_MPC8XX PPC_IBM4XX PPC_IBM403 PPC_BOOKE
 defflag opt_ppccache.h	CACHE_PROTO_MEI



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

2012-03-29 Thread Matt Thomas
Module Name:src
Committed By:   matt
Date:   Thu Mar 29 15:42:16 UTC 2012

Added Files:
src/sys/arch/powerpc/conf: kern-mb.ldscript

Log Message:
Add ldscript which aligns .data to a 1MB boundary. (used for testing)


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/sys/arch/powerpc/conf/kern-mb.ldscript

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/powerpc/conf/kern-mb.ldscript
diff -u /dev/null src/sys/arch/powerpc/conf/kern-mb.ldscript:1.1
--- /dev/null	Thu Mar 29 15:42:16 2012
+++ src/sys/arch/powerpc/conf/kern-mb.ldscript	Thu Mar 29 15:42:15 2012
@@ -0,0 +1,76 @@
+/* $NetBSD: kern-mb.ldscript,v 1.1 2012/03/29 15:42:15 matt Exp $ */
+
+/*  ldscript for NetBSD/powerpc kernels and LKMs */
+OUTPUT_ARCH(powerpc)
+ENTRY(_start)
+SEARCH_DIR(/lib);
+/* Do we need any of these?
+   __DYNAMIC = 0;*/
+_DYNAMIC_LINK = 0;
+SECTIONS
+{
+  /*  Read-only sections, merged into text segment.  Assumes the
+  kernel Makefile sets the start address via -Ttext.  */
+  .text  :
+  {
+_ftext = . ;
+*(.text)
+__stub_start = .;
+*(.stub)
+__stub_end = .;
+__stub_pmap_start = .;
+*(.stub.pmap)
+__stub_pmap_end = .;
+*(.gnu.warning)
+  } =0
+  _etext = .;
+  PROVIDE (etext = .);
+  .rodata: { *(.rodata) *(.rodata.*) }
+  .reginfo : { *(.reginfo) }
+  . = ALIGN(0x10);
+  .data:
+  {
+_fdata = . ;
+*(.data)
+CONSTRUCTORS
+  }
+  .data1			: { *(.data1) }
+  . = ALIGN(32);	/* COHERENCY UNIT */
+  .data.cacheline_aligned	: { *(.data.cacheline_aligned) }
+  . = ALIGN(32);	/* COHERENCY UNIT */
+  .data.read_mostly		: { *(.data.read_mostly) }
+  . = ALIGN(32);	/* COHERENCY UNIT */
+  _gp = ALIGN(16) + 0x7ff0;
+  .lit8 : { *(.lit8) }
+  .lit4 : { *(.lit4) }
+  .sdata : { *(.sdata) }
+  _edata  =  .;
+  PROVIDE (edata = .);
+  __bss_start = .;
+  _fbss = .;
+  .sbss  : { *(.sbss) *(.scommon) }
+  .bss   :
+  {
+   *(.bss)
+   *(COMMON)
+  }
+  _end = . ;
+  PROVIDE (end = .);
+  /* These are needed for ELF backends which have not yet been
+ converted to the new style linker.  */
+  .stab 0 : { *(.stab) }
+  .stabstr 0 : { *(.stabstr) }
+  /* DWARF debug sections.
+ Symbols in the .debug DWARF section are relative to the beginning of the
+ section so we begin .debug at 0.  It's not clear yet what needs to happen
+ for the others.   */
+  .debug  0 : { *(.debug) }
+  .debug_srcinfo  0 : { *(.debug_srcinfo) }
+  .debug_aranges  0 : { *(.debug_aranges) }
+  .debug_pubnames 0 : { *(.debug_pubnames) }
+  .debug_sfnames  0 : { *(.debug_sfnames) }
+  .line   0 : { *(.line) }
+  /* These must appear regardless of  .  */
+  .gptab.sdata : { *(.gptab.data) *(.gptab.sdata) }
+  .gptab.sbss : { *(.gptab.bss) *(.gptab.sbss) }
+}



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

2012-03-29 Thread Matt Thomas
Module Name:src
Committed By:   matt
Date:   Thu Mar 29 15:42:59 UTC 2012

Modified Files:
src/sys/arch/powerpc/conf: files.powerpc

Log Message:
Add PMAP_MINIMALTLB defflag


To generate a diff of this commit:
cvs rdiff -u -r1.82 -r1.83 src/sys/arch/powerpc/conf/files.powerpc

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/powerpc/conf/files.powerpc
diff -u src/sys/arch/powerpc/conf/files.powerpc:1.82 src/sys/arch/powerpc/conf/files.powerpc:1.83
--- src/sys/arch/powerpc/conf/files.powerpc:1.82	Wed Jun 29 06:02:43 2011
+++ src/sys/arch/powerpc/conf/files.powerpc	Thu Mar 29 15:42:59 2012
@@ -1,10 +1,10 @@
-#	$NetBSD: files.powerpc,v 1.82 2011/06/29 06:02:43 matt Exp $
+#	$NetBSD: files.powerpc,v 1.83 2012/03/29 15:42:59 matt Exp $
 
 defflag	opt_altivec.h	ALTIVEC K_ALTIVEC PPC_HAVE_SPE
 defflag	opt_openpic.h	OPENPIC OPENPIC_SERIAL_MODE OPENPIC_DISTRIBUTE
 defparam opt_ppcparam.h	L2CR_CONFIG L3CR_CONFIG INTSTK CLOCKBASE VERBOSE_INITPPC
 defflag	opt_ppcarch.h	PPC_OEA PPC_OEA601 PPC_OEA64 PPC_OEA64_BRIDGE PPC_MPC8XX PPC_IBM4XX PPC_IBM403 PPC_BOOKE
-defflag opt_pmap.h	PMAPDEBUG PMAPCHECK PMAPCOUNTERS
+defflag opt_pmap.h	PMAPDEBUG PMAPCHECK PMAPCOUNTERS PMAP_MINIMALTLB
 defparam opt_pmap.h	PTEGCOUNT PMAP_MEMLIMIT
 
 file	arch/powerpc/powerpc/copystr.c



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

2012-03-21 Thread Matt Thomas
Module Name:src
Committed By:   matt
Date:   Wed Mar 21 22:29:21 UTC 2012

Modified Files:
src/sys/arch/powerpc/conf: Makefile.powerpc

Log Message:
For BookE kernels, use -mmultiple and -misel and enable -fstack-protector


To generate a diff of this commit:
cvs rdiff -u -r1.49 -r1.50 src/sys/arch/powerpc/conf/Makefile.powerpc

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/powerpc/conf/Makefile.powerpc
diff -u src/sys/arch/powerpc/conf/Makefile.powerpc:1.49 src/sys/arch/powerpc/conf/Makefile.powerpc:1.50
--- src/sys/arch/powerpc/conf/Makefile.powerpc:1.49	Wed Feb  1 21:46:02 2012
+++ src/sys/arch/powerpc/conf/Makefile.powerpc	Wed Mar 21 22:29:21 2012
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.powerpc,v 1.49 2012/02/01 21:46:02 matt Exp $
+#	$NetBSD: Makefile.powerpc,v 1.50 2012/03/21 22:29:21 matt Exp $
 #
 # Makefile for NetBSD
 #
@@ -43,6 +43,11 @@ CWARNFLAGS+=	-Wreturn-type
 CFLAGS+=	-mno-strict-align
 CFLAGS+=	-Wa,-maltivec
 .endif
+.if ${PPCDIR} == booke
+DEFCOPTS=	-O2
+CFLAGS+=	-fstack-protector
+CFLAGS+=	-mmultiple -misel
+.endif
 CFLAGS+=	-msdata=none
 CFLAGS+=	-msoft-float ${CCPUOPTS}
 AFLAGS+=	${AOPTS} -D_NOREGNAMES



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

2011-07-25 Thread Matt Thomas
Module Name:src
Committed By:   matt
Date:   Mon Jul 25 23:26:03 UTC 2011

Modified Files:
src/sys/arch/powerpc/conf: files.booke

Log Message:
nflash is dead.  remove it.


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

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/powerpc/conf/files.booke
diff -u src/sys/arch/powerpc/conf/files.booke:1.4 src/sys/arch/powerpc/conf/files.booke:1.5
--- src/sys/arch/powerpc/conf/files.booke:1.4	Fri Jul 15 19:19:56 2011
+++ src/sys/arch/powerpc/conf/files.booke	Mon Jul 25 23:26:03 2011
@@ -1,4 +1,4 @@
-#	$NetBSD: files.booke,v 1.4 2011/07/15 19:19:56 cliff Exp $
+#	$NetBSD: files.booke,v 1.5 2011/07/25 23:26:03 matt Exp $
 #
 # PPC BookE specific configuration info
 
@@ -66,10 +66,6 @@
 attach	nandfcm at obio with pq3nandfcm
 file	arch/powerpc/booke/dev/pq3nandfcm.c	pq3nandfcm
 
-device	nflash
-attach	nflash at obio with pq3flash
-file	arch/powerpc/booke/dev/pq3flash.c	pq3flash
-
 device	rng
 attach	rng at cpunode with pq3rng
 file	arch/powerpc/booke/dev/pq3rng.c		pq3rng



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

2011-06-30 Thread Matt Thomas
Module Name:src
Committed By:   matt
Date:   Thu Jun 30 18:17:11 UTC 2011

Modified Files:
src/sys/arch/powerpc/conf: Makefile.powerpc

Log Message:
Get rid of local TOOL_GZIP definition that now bsd.own.mk does it for us.


To generate a diff of this commit:
cvs rdiff -u -r1.47 -r1.48 src/sys/arch/powerpc/conf/Makefile.powerpc

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/powerpc/conf/Makefile.powerpc
diff -u src/sys/arch/powerpc/conf/Makefile.powerpc:1.47 src/sys/arch/powerpc/conf/Makefile.powerpc:1.48
--- src/sys/arch/powerpc/conf/Makefile.powerpc:1.47	Sat Jun 25 02:26:53 2011
+++ src/sys/arch/powerpc/conf/Makefile.powerpc	Thu Jun 30 18:17:11 2011
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.powerpc,v 1.47 2011/06/25 02:26:53 matt Exp $
+#	$NetBSD: Makefile.powerpc,v 1.48 2011/06/30 18:17:11 matt Exp $
 #
 # Makefile for NetBSD
 #
@@ -106,10 +106,6 @@
 MKUBOOTIMAGEARGS+=  -a ${TEXTADDR:C/$//} -e $(TEXTADDR)
 MKUBOOTIMAGEARGS+=  -n NetBSD/$(MACHINE) ${_OSRELEASE} ($(KERNEL_BUILD:T))
 
-.if defined(USE_PIGZGZIP)  ${USE_PIGZGZIP} != no
-TOOL_GZIP?=		${TOOL_PIGZ}
-.endif
-TOOL_GZIP?=		gzip
 SYSTEM_LD_TAIL_EXTRA+=; \
 	echo ${TOOL_GZIP} -9cn $@.bin '' $@.bin.gz; \
 	${TOOL_GZIP} -9cn $@.bin  $@.bin.gz; \



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

2011-06-29 Thread Matt Thomas
Module Name:src
Committed By:   matt
Date:   Wed Jun 29 06:02:43 UTC 2011

Modified Files:
src/sys/arch/powerpc/conf: files.powerpc

Log Message:
Add VERBOSE_INITPPC flag


To generate a diff of this commit:
cvs rdiff -u -r1.81 -r1.82 src/sys/arch/powerpc/conf/files.powerpc

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/powerpc/conf/files.powerpc
diff -u src/sys/arch/powerpc/conf/files.powerpc:1.81 src/sys/arch/powerpc/conf/files.powerpc:1.82
--- src/sys/arch/powerpc/conf/files.powerpc:1.81	Sat Jun 18 20:35:05 2011
+++ src/sys/arch/powerpc/conf/files.powerpc	Wed Jun 29 06:02:43 2011
@@ -1,8 +1,8 @@
-#	$NetBSD: files.powerpc,v 1.81 2011/06/18 20:35:05 matt Exp $
+#	$NetBSD: files.powerpc,v 1.82 2011/06/29 06:02:43 matt Exp $
 
 defflag	opt_altivec.h	ALTIVEC K_ALTIVEC PPC_HAVE_SPE
 defflag	opt_openpic.h	OPENPIC OPENPIC_SERIAL_MODE OPENPIC_DISTRIBUTE
-defparam opt_ppcparam.h	L2CR_CONFIG L3CR_CONFIG INTSTK CLOCKBASE
+defparam opt_ppcparam.h	L2CR_CONFIG L3CR_CONFIG INTSTK CLOCKBASE VERBOSE_INITPPC
 defflag	opt_ppcarch.h	PPC_OEA PPC_OEA601 PPC_OEA64 PPC_OEA64_BRIDGE PPC_MPC8XX PPC_IBM4XX PPC_IBM403 PPC_BOOKE
 defflag opt_pmap.h	PMAPDEBUG PMAPCHECK PMAPCOUNTERS
 defparam opt_pmap.h	PTEGCOUNT PMAP_MEMLIMIT



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

2011-06-18 Thread Matt Thomas
Module Name:src
Committed By:   matt
Date:   Sat Jun 18 20:35:06 UTC 2011

Modified Files:
src/sys/arch/powerpc/conf: files.powerpc

Log Message:
Unconditionally build fixup.c


To generate a diff of this commit:
cvs rdiff -u -r1.80 -r1.81 src/sys/arch/powerpc/conf/files.powerpc

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/powerpc/conf/files.powerpc
diff -u src/sys/arch/powerpc/conf/files.powerpc:1.80 src/sys/arch/powerpc/conf/files.powerpc:1.81
--- src/sys/arch/powerpc/conf/files.powerpc:1.80	Wed Jun 15 15:22:56 2011
+++ src/sys/arch/powerpc/conf/files.powerpc	Sat Jun 18 20:35:05 2011
@@ -1,4 +1,4 @@
-#	$NetBSD: files.powerpc,v 1.80 2011/06/15 15:22:56 matt Exp $
+#	$NetBSD: files.powerpc,v 1.81 2011/06/18 20:35:05 matt Exp $
 
 defflag	opt_altivec.h	ALTIVEC K_ALTIVEC PPC_HAVE_SPE
 defflag	opt_openpic.h	OPENPIC OPENPIC_SERIAL_MODE OPENPIC_DISTRIBUTE
@@ -9,7 +9,7 @@
 
 file	arch/powerpc/powerpc/copystr.c
 file	arch/powerpc/powerpc/core_machdep.c		coredump
-file	arch/powerpc/powerpc/fixup.c			ppc_booke | (ppc_oea  ppc_oea64) | (ppc_oea  ppc_oea64_bridge) | (ppc_oea64  ppc_oea64_bridge)
+file	arch/powerpc/powerpc/fixup.c
 file	arch/powerpc/powerpc/fubyte.c
 file	arch/powerpc/powerpc/fuswintr.c
 file	arch/powerpc/powerpc/ipkdb_glue.c		ipkdb



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

2011-06-04 Thread Matt Thomas
Module Name:src
Committed By:   matt
Date:   Sat Jun  4 17:51:09 UTC 2011

Modified Files:
src/sys/arch/powerpc/conf: Makefile.powerpc

Log Message:
Make sure the kernel is compiled with -msdata=none since it uses %r2 and %r13
for other uses.


To generate a diff of this commit:
cvs rdiff -u -r1.44 -r1.45 src/sys/arch/powerpc/conf/Makefile.powerpc

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/powerpc/conf/Makefile.powerpc
diff -u src/sys/arch/powerpc/conf/Makefile.powerpc:1.44 src/sys/arch/powerpc/conf/Makefile.powerpc:1.45
--- src/sys/arch/powerpc/conf/Makefile.powerpc:1.44	Tue Jan 18 01:02:53 2011
+++ src/sys/arch/powerpc/conf/Makefile.powerpc	Sat Jun  4 17:51:09 2011
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.powerpc,v 1.44 2011/01/18 01:02:53 matt Exp $
+#	$NetBSD: Makefile.powerpc,v 1.45 2011/06/04 17:51:09 matt Exp $
 #
 # Makefile for NetBSD
 #
@@ -43,6 +43,7 @@
 CFLAGS+=	-mno-strict-align
 CFLAGS+=	-Wa,-maltivec
 .endif
+CFLAGS+=	-msdata=none
 CFLAGS+=	-msoft-float ${CCPUOPTS}
 AFLAGS+=	${AOPTS} -D_NOREGNAMES
 



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

2011-05-01 Thread Matt Thomas
Module Name:src
Committed By:   matt
Date:   Mon May  2 01:48:05 UTC 2011

Modified Files:
src/sys/arch/powerpc/conf: files.booke

Log Message:
Add nandfcm device glue


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/powerpc/conf/files.booke

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/powerpc/conf/files.booke
diff -u src/sys/arch/powerpc/conf/files.booke:1.2 src/sys/arch/powerpc/conf/files.booke:1.3
--- src/sys/arch/powerpc/conf/files.booke:1.2	Tue Jan 18 01:02:53 2011
+++ src/sys/arch/powerpc/conf/files.booke	Mon May  2 01:48:05 2011
@@ -1,4 +1,4 @@
-#	$NetBSD: files.booke,v 1.2 2011/01/18 01:02:53 matt Exp $
+#	$NetBSD: files.booke,v 1.3 2011/05/02 01:48:05 matt Exp $
 #
 # PPC BookE specific configuration info
 
@@ -58,6 +58,10 @@
 attach	obio at cpunode with pq3obio
 file	arch/powerpc/booke/dev/pq3obio.c	pq3obio
 
+device	nandfcm: nandbus
+attach	nandfcm at obio with pq3nandfcm
+file	arch/powerpc/booke/dev/pq3nandfcm.c	pq3nandfcm
+
 device	nflash
 attach	nflash at obio with pq3flash
 file	arch/powerpc/booke/dev/pq3flash.c	pq3flash



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

2011-01-23 Thread Matt Thomas
Module Name:src
Committed By:   matt
Date:   Sun Jan 23 17:38:37 UTC 2011

Modified Files:
src/sys/arch/powerpc/conf: kern.ldscript

Log Message:
Add support for __read_mostly and __cacheline_aligned (using 32 bytes as
the cacheline as its the most prevalent sized used even though IBM970 has
a 128 byte cacheline).


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/powerpc/conf/kern.ldscript

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/powerpc/conf/kern.ldscript
diff -u src/sys/arch/powerpc/conf/kern.ldscript:1.2 src/sys/arch/powerpc/conf/kern.ldscript:1.3
--- src/sys/arch/powerpc/conf/kern.ldscript:1.2	Tue Jan 18 01:02:53 2011
+++ src/sys/arch/powerpc/conf/kern.ldscript	Sun Jan 23 17:38:37 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: kern.ldscript,v 1.2 2011/01/18 01:02:53 matt Exp $ */
+/* $NetBSD: kern.ldscript,v 1.3 2011/01/23 17:38:37 matt Exp $ */
 
 /*  ldscript for NetBSD/powerpc kernels and LKMs */
 OUTPUT_ARCH(powerpc)
@@ -31,6 +31,12 @@
 *(.data)
 CONSTRUCTORS
   }
+  .data1			: { *(.data1) }
+  . = ALIGN(32);	/* COHERENCY UNIT */
+  .data.cacheline_aligned	: { *(.data.cacheline_aligned) }
+  . = ALIGN(32);	/* COHERENCY UNIT */
+  .data.read_mostly		: { *(.data.read_mostly) }
+  . = ALIGN(32);	/* COHERENCY UNIT */
   _gp = ALIGN(16) + 0x7ff0;
   .lit8 : { *(.lit8) }
   .lit4 : { *(.lit4) }



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

2010-05-29 Thread Frank Wille
Module Name:src
Committed By:   phx
Date:   Sat May 29 22:48:57 UTC 2010

Modified Files:
src/sys/arch/powerpc/conf: majors.powerpc

Log Message:
sysmon_power is needed to be able to use powerd(8).


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

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/powerpc/conf/majors.powerpc
diff -u src/sys/arch/powerpc/conf/majors.powerpc:1.5 src/sys/arch/powerpc/conf/majors.powerpc:1.6
--- src/sys/arch/powerpc/conf/majors.powerpc:1.5	Sat Mar  6 23:45:40 2010
+++ src/sys/arch/powerpc/conf/majors.powerpc	Sat May 29 22:48:57 2010
@@ -1,4 +1,4 @@
-#	$NetBSD: majors.powerpc,v 1.5 2010/03/06 23:45:40 plunky Exp $
+#	$NetBSD: majors.powerpc,v 1.6 2010/05/29 22:48:57 phx Exp $
 #
 # Device majors for shared PowerPC
 #
@@ -68,7 +68,7 @@
 
 device-major	pci		char 60			pci
 device-major	clockctl	char 61			clockctl
-device-major	sysmon		char 62			sysmon_envsys | sysmon_wdog
+device-major	sysmon		char 62			sysmon_envsys | sysmon_wdog | sysmon_power
 device-major	apm		char 64			apm
 device-major	kttcp		char 65			kttcp
 device-major	cgd		char 66  block 14	cgd