Module Name: src
Committed By: matt
Date: Fri Jan 7 02:08:24 UTC 2011
Modified Files:
src/sys/arch/powerpc/conf [matt-nb5-pq3]: Makefile.powerpc
files.powerpc
Log Message:
Add booke support.
To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.40.22.1 src/sys/arch/powerpc/conf/Makefile.powerpc
cvs rdiff -u -r1.69 -r1.69.28.1 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/Makefile.powerpc
diff -u src/sys/arch/powerpc/conf/Makefile.powerpc:1.40 src/sys/arch/powerpc/conf/Makefile.powerpc:1.40.22.1
--- src/sys/arch/powerpc/conf/Makefile.powerpc:1.40 Fri Mar 7 17:10:00 2008
+++ src/sys/arch/powerpc/conf/Makefile.powerpc Fri Jan 7 02:08:24 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.powerpc,v 1.40 2008/03/07 17:10:00 phx Exp $
+# $NetBSD: Makefile.powerpc,v 1.40.22.1 2011/01/07 02:08:24 matt Exp $
#
# Makefile for NetBSD
#
@@ -41,8 +41,9 @@
CWARNFLAGS+= -Wreturn-type
.if ${PPCDIR} == "oea"
CFLAGS+= -mno-strict-align
+CFLAGS+= -Wa,-maltivec
.endif
-CFLAGS+= -msoft-float ${CCPUOPTS} -Wa,-maltivec
+CFLAGS+= -msoft-float ${CCPUOPTS}
AFLAGS+= ${AOPTS}
##
@@ -71,8 +72,10 @@
##
## (5) link settings
##
+KERNLDSCRIPT?= ${POWERPC}/conf/kern.ldscript
TEXTADDR?= 0x100000
-LINKFORMAT= -N
+LINKFORMAT= -N -T ${KERNLDSCRIPT}
+
ENTRYPOINT= __start
.if defined(NEED_SREC)
Index: src/sys/arch/powerpc/conf/files.powerpc
diff -u src/sys/arch/powerpc/conf/files.powerpc:1.69 src/sys/arch/powerpc/conf/files.powerpc:1.69.28.1
--- src/sys/arch/powerpc/conf/files.powerpc:1.69 Tue Feb 5 22:31:49 2008
+++ src/sys/arch/powerpc/conf/files.powerpc Fri Jan 7 02:08:24 2011
@@ -1,13 +1,14 @@
-# $NetBSD: files.powerpc,v 1.69 2008/02/05 22:31:49 garbled Exp $
+# $NetBSD: files.powerpc,v 1.69.28.1 2011/01/07 02:08:24 matt Exp $
defflag opt_altivec.h ALTIVEC K_ALTIVEC
defflag opt_openpic.h OPENPIC OPENPIC_SERIAL_MODE
defparam opt_ppcparam.h L2CR_CONFIG L3CR_CONFIG INTSTK CLOCKBASE
-defflag opt_ppcarch.h PPC_OEA PPC_OEA601 PPC_OEA64 PPC_OEA64_BRIDGE PPC_MPC8XX PPC_IBM4XX PPC_IBM403
+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
file arch/powerpc/powerpc/copystr.c
+file arch/powerpc/powerpc/fixup.c ppc_booke
file arch/powerpc/powerpc/fubyte.c
file arch/powerpc/powerpc/fuswintr.c
file arch/powerpc/powerpc/ipkdb_glue.c ipkdb
@@ -53,6 +54,19 @@
file arch/powerpc/powerpc/fpu.c ppc_oea | ppc_oea64 | ppc_oea64_bridge | ppc_oea601
file arch/powerpc/powerpc/trap.c ppc_oea | ppc_oea64 | ppc_oea64_bridge | ppc_oea601
+# PPC BookE (MPC85xx) Family files
+file arch/powerpc/booke/booke_machdep.c ppc_booke
+file arch/powerpc/booke/booke_cache.c ppc_booke
+file arch/powerpc/booke/booke_pmap.c ppc_booke
+file arch/powerpc/booke/booke_stubs.c ppc_booke
+file arch/powerpc/booke/copyin.c ppc_booke
+file arch/powerpc/booke/copyout.c ppc_booke
+file arch/powerpc/booke/kcopy.c ppc_booke
+file arch/powerpc/booke/trap.c ppc_booke
+file common/pmap/tlb/pmap.c ppc_booke
+file common/pmap/tlb/pmap_segtab.c ppc_booke
+file common/pmap/tlb/pmap_tlb.c ppc_booke
+
# Binary compatibility with previous NetBSD releases (COMPAT_XX)
file arch/powerpc/powerpc/compat_13_machdep.c compat_13
file arch/powerpc/powerpc/compat_16_machdep.c compat_16
