svn commit: r209856 - in projects/ppc64: . include sys/conf
sys/powerpc/aim sys/powerpc/conf sys/powerpc/powermac sys/powerpc64
Nathan Whitehorn
nwhitehorn at FreeBSD.org
Fri Jul 9 15:58:26 UTC 2010
Author: nwhitehorn
Date: Fri Jul 9 15:58:26 2010
New Revision: 209856
URL: http://svn.freebsd.org/changeset/base/209856
Log:
Goodbye MACHINE=powerpc64! Import some minimal bits of the tbemd tree so
that we can have MACHINE=powerpc and MACHINE_ARCH=powerpc64. Now that this
port's build system no longer relies on checking symlinks into svn, this
makes this branch a merge candidate to HEAD.
Note to users of this branch: this transition may be slightly bumpy, and
will require rebuilding world, at least to get a new config(8). Some ports
may behave strangely due to conflation of uname -m and uname -p. Setting
UNAME_m=powerpc64 in your environment may paper over such problems as they
become apparent.
Long ago suggested by: imp
Added:
projects/ppc64/sys/powerpc/conf/GENERIC64
projects/ppc64/sys/powerpc/conf/MAMBO
Deleted:
projects/ppc64/sys/conf/Makefile.powerpc64
projects/ppc64/sys/conf/files.powerpc64
projects/ppc64/sys/conf/options.powerpc64
projects/ppc64/sys/powerpc64/
Modified:
projects/ppc64/Makefile.inc1
projects/ppc64/include/Makefile
projects/ppc64/sys/conf/Makefile.powerpc
projects/ppc64/sys/conf/files.powerpc
projects/ppc64/sys/conf/kern.post.mk
projects/ppc64/sys/conf/kern.pre.mk
projects/ppc64/sys/conf/kmod.mk
projects/ppc64/sys/conf/options.powerpc
projects/ppc64/sys/powerpc/aim/machdep.c
projects/ppc64/sys/powerpc/conf/DEFAULTS
projects/ppc64/sys/powerpc/conf/GENERIC
projects/ppc64/sys/powerpc/conf/MPC85XX
projects/ppc64/sys/powerpc/powermac/grackle.c
Modified: projects/ppc64/Makefile.inc1
==============================================================================
--- projects/ppc64/Makefile.inc1 Fri Jul 9 14:38:06 2010 (r209855)
+++ projects/ppc64/Makefile.inc1 Fri Jul 9 15:58:26 2010 (r209856)
@@ -128,7 +128,7 @@ TARGET= ${TARGET_ARCH}
TARGET?= ${MACHINE}
TARGET_ARCH?= ${MACHINE_ARCH}
-KNOWN_ARCHES?= amd64 arm i386 i386/pc98 ia64 mips powerpc powerpc64 sparc64 sparc64/sun4v
+KNOWN_ARCHES?= amd64 arm i386 i386/pc98 ia64 mips powerpc powerpc64/powerpc sparc64 sparc64/sun4v
.if ${TARGET} == ${TARGET_ARCH}
_t= ${TARGET}
.else
Modified: projects/ppc64/include/Makefile
==============================================================================
--- projects/ppc64/include/Makefile Fri Jul 9 14:38:06 2010 (r209855)
+++ projects/ppc64/include/Makefile Fri Jul 9 15:58:26 2010 (r209856)
@@ -189,7 +189,7 @@ copies:
${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 *.h \
${DESTDIR}${INCLUDEDIR}/machine/pc
.endif
-.if defined(_MARCH)
+.if defined(_MARCH) && exists(${.CURDIR}/../sys/${_MARCH}/include)
${INSTALL} -d -o ${BINOWN} -g ${BINGRP} -m 755 \
${DESTDIR}${INCLUDEDIR}/${_MARCH}; \
cd ${.CURDIR}/../sys/${_MARCH}/include; \
@@ -276,7 +276,7 @@ symlinks:
${DESTDIR}${INCLUDEDIR}/machine/pc; \
done
.endif
-.if defined(_MARCH)
+.if defined(_MARCH) && exists(${.CURDIR}/../sys/${_MARCH}/include)
${INSTALL} -d -o ${BINOWN} -g ${BINGRP} -m 755 \
${DESTDIR}${INCLUDEDIR}/${_MARCH}; \
cd ${.CURDIR}/../sys/${_MARCH}/include; \
Modified: projects/ppc64/sys/conf/Makefile.powerpc
==============================================================================
--- projects/ppc64/sys/conf/Makefile.powerpc Fri Jul 9 14:38:06 2010 (r209855)
+++ projects/ppc64/sys/conf/Makefile.powerpc Fri Jul 9 15:58:26 2010 (r209856)
@@ -17,7 +17,7 @@
#
# Which version of config(8) is required.
-%VERSREQ= 600004
+%VERSREQ= 600010
STD8X16FONT?= iso
@@ -28,6 +28,9 @@ S= ./@
S= ../../..
.endif
.endif
+
+LDSCRIPT_NAME?= ldscript.${MACHINE_ARCH}
+
.include "$S/conf/kern.pre.mk"
CFLAGS+= -msoft-float
Modified: projects/ppc64/sys/conf/files.powerpc
==============================================================================
--- projects/ppc64/sys/conf/files.powerpc Fri Jul 9 14:38:06 2010 (r209855)
+++ projects/ppc64/sys/conf/files.powerpc Fri Jul 9 15:58:26 2010 (r209856)
@@ -35,7 +35,7 @@ dev/ofw/ofw_bus_subr.c optional aim
dev/ofw/ofw_console.c optional aim
dev/ofw/ofw_disk.c optional ofwd aim
dev/ofw/ofw_iicbus.c optional iicbus aim
-dev/ofw/ofw_standard.c optional aim
+dev/ofw/ofw_standard.c optional aim powerpc
dev/powermac_nvram/powermac_nvram.c optional powermac_nvram powermac
dev/quicc/quicc_bfe_ocp.c optional quicc mpc85xx
dev/scc/scc_bfe_macio.c optional scc powermac
@@ -53,36 +53,38 @@ dev/tsec/if_tsec_ocp.c optional tsec mp
dev/uart/uart_bus_ocp.c optional uart mpc85xx
dev/uart/uart_cpu_powerpc.c optional uart
kern/syscalls.c optional ktr
-libkern/ashldi3.c standard
-libkern/ashrdi3.c standard
+libkern/ashldi3.c optional powerpc
+libkern/ashrdi3.c optional powerpc
libkern/bcmp.c standard
-libkern/cmpdi2.c standard
-libkern/divdi3.c standard
+libkern/cmpdi2.c optional powerpc
+libkern/divdi3.c optional powerpc
libkern/ffs.c standard
libkern/ffsl.c standard
libkern/fls.c standard
libkern/flsl.c standard
-libkern/lshrdi3.c standard
+libkern/lshrdi3.c optional powerpc
libkern/memmove.c standard
libkern/memset.c standard
-libkern/moddi3.c standard
-libkern/qdivrem.c standard
-libkern/ucmpdi2.c standard
-libkern/udivdi3.c standard
-libkern/umoddi3.c standard
+libkern/moddi3.c optional powerpc
+libkern/qdivrem.c optional powerpc
+libkern/ucmpdi2.c optional powerpc
+libkern/udivdi3.c optional powerpc
+libkern/umoddi3.c optional powerpc
powerpc/aim/clock.c optional aim
powerpc/aim/copyinout.c optional aim
powerpc/aim/interrupt.c optional aim
powerpc/aim/locore.S optional aim no-obj
powerpc/aim/machdep.c optional aim
-powerpc/aim/mmu_oea.c optional aim
+powerpc/aim/mmu_oea.c optional aim powerpc
powerpc/aim/mmu_oea64.c optional aim
powerpc/aim/mp_cpudep.c optional aim smp
powerpc/aim/nexus.c optional aim
powerpc/aim/ofw_machdep.c optional aim
powerpc/aim/ofwmagic.S optional aim
powerpc/aim/platform_chrp.c optional aim
-powerpc/aim/swtch32.S optional aim
+powerpc/aim/slb.c optional aim powerpc64
+powerpc/aim/swtch32.S optional aim powerpc
+powerpc/aim/swtch64.S optional aim powerpc64
powerpc/aim/trap.c optional aim
powerpc/aim/uma_machdep.c optional aim
powerpc/aim/vm_machdep.c optional aim
@@ -97,6 +99,7 @@ powerpc/booke/pmap.c optional e500
powerpc/booke/swtch.S optional e500
powerpc/booke/trap.c optional e500
powerpc/booke/vm_machdep.c optional e500
+powerpc/cell/celliic.c optional cell
powerpc/cpufreq/dfs.c optional cpufreq
powerpc/cpufreq/pcr.c optional cpufreq aim
powerpc/fpu/fpu_add.c optional fpu_emu
@@ -108,6 +111,11 @@ powerpc/fpu/fpu_implode.c optional fpu_e
powerpc/fpu/fpu_mul.c optional fpu_emu
powerpc/fpu/fpu_sqrt.c optional fpu_emu
powerpc/fpu/fpu_subr.c optional fpu_emu
+powerpc/mambo/mambocall.S optional mambo
+powerpc/mambo/mambo.c optional mambo
+powerpc/mambo/mambo_console.c optional mambo
+powerpc/mambo/mambo_disk.c optional mambo
+powerpc/mambo/mambo_openpic.c optional mambo
powerpc/mpc85xx/atpic.c optional mpc85xx isa
powerpc/mpc85xx/ds1553_bus_lbc.c optional ds1553
powerpc/mpc85xx/ds1553_core.c optional ds1553
@@ -156,7 +164,8 @@ powerpc/powerpc/db_hwwatch.c optional dd
powerpc/powerpc/db_interface.c optional ddb
powerpc/powerpc/db_trace.c optional ddb
powerpc/powerpc/dump_machdep.c standard
-powerpc/powerpc/elf32_machdep.c standard
+powerpc/powerpc/elf32_machdep.c optional powerpc | compat_freebsd32
+powerpc/powerpc/elf64_machdep.c optional powerpc64
powerpc/powerpc/exec_machdep.c standard
powerpc/powerpc/fpu.c optional aim
powerpc/powerpc/fuswintr.c standard
@@ -173,7 +182,8 @@ powerpc/powerpc/platform.c standard
powerpc/powerpc/platform_if.m standard
powerpc/powerpc/sc_machdep.c optional sc
powerpc/powerpc/setjmp.S standard
-powerpc/powerpc/sigcode32.S standard
+powerpc/powerpc/sigcode32.S optional powerpc | compat_freebsd32
+powerpc/powerpc/sigcode64.S optional powerpc64
powerpc/powerpc/stack_machdep.c optional ddb | stack
powerpc/powerpc/suswintr.c standard
powerpc/powerpc/syncicache.c standard
@@ -183,3 +193,10 @@ powerpc/psim/iobus.c optional psim
powerpc/psim/ata_iobus.c optional ata psim
powerpc/psim/openpic_iobus.c optional psim
powerpc/psim/uart_iobus.c optional uart psim
+
+compat/freebsd32/freebsd32_ioctl.c optional compat_freebsd32
+compat/freebsd32/freebsd32_misc.c optional compat_freebsd32
+compat/freebsd32/freebsd32_syscalls.c optional compat_freebsd32
+compat/freebsd32/freebsd32_sysent.c optional compat_freebsd32
+kern/imgact_elf32.c optional compat_freebsd32
+
Modified: projects/ppc64/sys/conf/kern.post.mk
==============================================================================
--- projects/ppc64/sys/conf/kern.post.mk Fri Jul 9 14:38:06 2010 (r209855)
+++ projects/ppc64/sys/conf/kern.post.mk Fri Jul 9 15:58:26 2010 (r209856)
@@ -166,8 +166,8 @@ SRCS= assym.s vnode_if.h ${BEFORE_DEPEND
mv .newdep .depend
_ILINKS= machine
-.if ${MACHINE} != ${MACHINE_ARCH}
-_ILINKS+= ${MACHINE_ARCH}
+.if ${MACHINE} != ${MACHINE_CPUARCH}
+_ILINKS+= ${MACHINE_CPUARCH}
.endif
# Ensure that the link exists without depending on it when it exists.
@@ -181,8 +181,8 @@ ${_ILINKS}:
@case ${.TARGET} in \
machine) \
path=${S}/${MACHINE}/include ;; \
- ${MACHINE_ARCH}) \
- path=${S}/${MACHINE_ARCH}/include ;; \
+ ${MACHINE_CPUARCH}) \
+ path=${S}/${MACHINE_CPUARCH}/include ;; \
esac ; \
${ECHO} ${.TARGET} "->" $$path ; \
ln -s $$path ${.TARGET}
Modified: projects/ppc64/sys/conf/kern.pre.mk
==============================================================================
--- projects/ppc64/sys/conf/kern.pre.mk Fri Jul 9 14:38:06 2010 (r209855)
+++ projects/ppc64/sys/conf/kern.pre.mk Fri Jul 9 15:58:26 2010 (r209856)
@@ -12,7 +12,7 @@ KODIR?= /boot/${KERNEL}
LDSCRIPT_NAME?= ldscript.$M
LDSCRIPT?= $S/conf/${LDSCRIPT_NAME}
-M= ${MACHINE_ARCH}
+M= ${MACHINE_CPUARCH}
AWK?= awk
LINT?= lint
Modified: projects/ppc64/sys/conf/kmod.mk
==============================================================================
--- projects/ppc64/sys/conf/kmod.mk Fri Jul 9 14:38:06 2010 (r209855)
+++ projects/ppc64/sys/conf/kmod.mk Fri Jul 9 15:58:26 2010 (r209856)
@@ -129,7 +129,7 @@ CFLAGS+= ${DEBUG_FLAGS}
CFLAGS+= -fno-omit-frame-pointer
.endif
-.if ${MACHINE_ARCH} == "powerpc" || ${MACHINE_ARCH} == "powerpc64"
+.if ${MACHINE_CPUARCH} == "powerpc"
CFLAGS+= -mlongcall -fno-omit-frame-pointer
.endif
@@ -226,8 +226,8 @@ ${FULLPROG}: ${OBJS}
.endif
_ILINKS=@ machine
-.if ${MACHINE} != ${MACHINE_ARCH}
-_ILINKS+=${MACHINE_ARCH}
+.if ${MACHINE} != ${MACHINE_CPUARCH}
+_ILINKS+=${MACHINE_CPUARCH}
.endif
all: objwarn ${PROG}
@@ -254,8 +254,8 @@ SYSDIR= ${_dir}
${_ILINKS}:
@case ${.TARGET} in \
- ${MACHINE_ARCH}) \
- path=${SYSDIR}/${MACHINE_ARCH}/include ;; \
+ ${MACHINE_CPUARCH}) \
+ path=${SYSDIR}/${MACHINE_CPUARCH}/include ;; \
machine) \
path=${SYSDIR}/${MACHINE}/include ;; \
@) \
@@ -451,11 +451,11 @@ assym.s: @/kern/genassym.sh
.endif
sh @/kern/genassym.sh genassym.o > ${.TARGET}
.if exists(@)
-genassym.o: @/${MACHINE_ARCH}/${MACHINE_ARCH}/genassym.c
+genassym.o: @/${MACHINE_CPUARCH}/${MACHINE_CPUARCH}/genassym.c
.endif
genassym.o: @ machine ${SRCS:Mopt_*.h}
${CC} -c ${CFLAGS:N-fno-common} \
- @/${MACHINE_ARCH}/${MACHINE_ARCH}/genassym.c
+ @/${MACHINE_CPUARCH}/${MACHINE_CPUARCH}/genassym.c
.endif
lint: ${SRCS}
Modified: projects/ppc64/sys/conf/options.powerpc
==============================================================================
--- projects/ppc64/sys/conf/options.powerpc Fri Jul 9 14:38:06 2010 (r209855)
+++ projects/ppc64/sys/conf/options.powerpc Fri Jul 9 15:58:26 2010 (r209856)
@@ -3,15 +3,22 @@
AIM opt_global.h
E500 opt_global.h
+CELL
+
+POWERPC
+POWERPC64
FPU_EMU
+COMPAT_FREEBSD32 opt_compat.h
+
GFB_DEBUG opt_gfb.h
GFB_NO_FONT_LOADING opt_gfb.h
GFB_NO_MODE_CHANGE opt_gfb.h
POWERMAC opt_platform.h
MPC85XX opt_platform.h
+MAMBO opt_platform.h
PSIM
SC_OFWFB opt_ofwfb.h
Modified: projects/ppc64/sys/powerpc/aim/machdep.c
==============================================================================
--- projects/ppc64/sys/powerpc/aim/machdep.c Fri Jul 9 14:38:06 2010 (r209855)
+++ projects/ppc64/sys/powerpc/aim/machdep.c Fri Jul 9 15:58:26 2010 (r209856)
@@ -143,11 +143,7 @@ struct pcpu __pcpu[MAXCPU];
static struct trapframe frame0;
-#ifdef __powerpc64__
-char machine[] = "powerpc64";
-#else
char machine[] = "powerpc";
-#endif
SYSCTL_STRING(_hw, HW_MACHINE, machine, CTLFLAG_RD, machine, 0, "");
static void cpu_startup(void *);
Modified: projects/ppc64/sys/powerpc/conf/DEFAULTS
==============================================================================
--- projects/ppc64/sys/powerpc/conf/DEFAULTS Fri Jul 9 14:38:06 2010 (r209855)
+++ projects/ppc64/sys/powerpc/conf/DEFAULTS Fri Jul 9 15:58:26 2010 (r209856)
@@ -3,8 +3,6 @@
#
# $FreeBSD$
-machine powerpc
-
# Pseudo devices.
device mem # Memory and kernel memory devices
Modified: projects/ppc64/sys/powerpc/conf/GENERIC
==============================================================================
--- projects/ppc64/sys/powerpc/conf/GENERIC Fri Jul 9 14:38:06 2010 (r209855)
+++ projects/ppc64/sys/powerpc/conf/GENERIC Fri Jul 9 15:58:26 2010 (r209856)
@@ -21,6 +21,8 @@
cpu AIM
ident GENERIC
+machine powerpc powerpc
+
makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols
# Platform support
Added: projects/ppc64/sys/powerpc/conf/GENERIC64
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ projects/ppc64/sys/powerpc/conf/GENERIC64 Fri Jul 9 15:58:26 2010 (r209856)
@@ -0,0 +1,174 @@
+#
+# GENERIC -- Generic kernel configuration file for FreeBSD/powerpc
+#
+# For more information on this file, please read the handbook section on
+# Kernel Configuration Files:
+#
+# http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html
+#
+# The handbook is also available locally in /usr/share/doc/handbook
+# if you've installed the doc distribution, otherwise always see the
+# FreeBSD World Wide Web server (http://www.FreeBSD.org/) for the
+# latest information.
+#
+# An exhaustive list of options and more detailed explanations of the
+# device lines is also present in the ../../conf/NOTES and NOTES files.
+# If you are in doubt as to the purpose or necessity of a line, check first
+# in NOTES.
+#
+# $FreeBSD: projects/ppc64/sys/powerpc/conf/GENERIC64 -1 $
+
+cpu AIM
+cpu CELL
+ident GENERIC
+
+machine powerpc powerpc64
+
+#To statically compile in device wiring instead of /boot/device.hints
+#hints "GENERIC.hints"
+
+makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols
+
+# Platform support
+options POWERMAC #NewWorld Apple PowerMacs
+options MAMBO #IBM Systemsim ppc simulator
+
+options SCHED_ULE #ULE scheduler
+options INET #InterNETworking
+options INET6 #IPv6 communications protocols
+options SCTP #Stream Control Transmission Protocol
+options FFS #Berkeley Fast Filesystem
+options SOFTUPDATES #Enable FFS soft updates support
+options UFS_ACL #Support for access control lists
+options UFS_DIRHASH #Improve performance on big directories
+options UFS_GJOURNAL #Enable gjournal-based UFS journaling
+options MD_ROOT #MD is a potential root device
+options NFSCLIENT #Network Filesystem Client
+options NFSSERVER #Network Filesystem Server
+options NFSLOCKD #Network Lock Manager
+options NFS_ROOT #NFS usable as root device
+options MSDOSFS #MSDOS Filesystem
+options CD9660 #ISO 9660 Filesystem
+options PROCFS #Process filesystem (requires PSEUDOFS)
+options PSEUDOFS #Pseudo-filesystem framework
+options GEOM_PART_GPT #GUID Partition Tables.
+options GEOM_LABEL #Provides labelization
+options COMPAT_43TTY #BSD 4.3 TTY compat (sgtty)
+options COMPAT_FREEBSD32 #Compatible with PPC32 binaries
+options COMPAT_FREEBSD5 #Compatible with FreeBSD5
+options COMPAT_FREEBSD6 #Compatible with FreeBSD6
+options COMPAT_FREEBSD7 #Compatible with FreeBSD7
+options SCSI_DELAY=5000 #Delay (in ms) before probing SCSI
+options KTRACE #ktrace(1) syscall trace support
+options STACK #stack(9) support
+options SYSVSHM #SYSV-style shared memory
+options SYSVMSG #SYSV-style message queues
+options SYSVSEM #SYSV-style semaphores
+options P1003_1B_SEMAPHORES # POSIX-style semaphores
+options _KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions
+options HWPMC_HOOKS # Necessary kernel hooks for hwpmc(4)
+options AUDIT # Security event auditing
+options MAC # TrustedBSD MAC Framework
+
+# Debugging for use in -current
+options KDB #Enable the kernel debugger
+options KDB_TRACE
+options DDB #Support DDB
+options INVARIANTS #Enable calls of extra sanity checking
+options INVARIANT_SUPPORT #Extra sanity checks of internal structures, required by INVARIANTS
+options WITNESS #Enable checks to detect deadlocks and cycles
+options WITNESS_SKIPSPIN #Don't run witness on spinlocks for speed
+
+# To make an SMP kernel, the next line is needed
+options SMP # Symmetric MultiProcessor Kernel
+
+# CPU frequency control
+device cpufreq
+
+# Standard busses
+device pci
+
+# ATA and ATAPI devices
+device ata
+device atadisk # ATA disk drives
+device atapicd # ATAPI CDROM drives
+#device atapifd # ATAPI floppy drives
+#device atapist # ATAPI tape drives
+
+# SCSI peripherals
+device scbus # SCSI bus (required for SCSI)
+device da # Direct Access (disks)
+device sa # Sequential Access (tape etc)
+device cd # CD
+device pass # Passthrough device (direct SCSI access)
+
+# syscons is the default console driver, resembling an SCO console
+device sc
+device kbdmux
+options SC_OFWFB # OFW frame buffer
+options SC_DFLT_FONT # compile font in
+makeoptions SC_DFLT_FONT=cp437
+
+# Serial (COM) ports
+device scc
+device uart
+
+# PCI Ethernet NICs that use the common MII bus controller code.
+device miibus # MII bus support
+device bge # Broadcom BCM570xx Gigabit Ethernet
+device gem # Sun GEM/Sun ERI/Apple GMAC
+device dc # DEC/Intel 21143 and various workalikes
+device fxp # Intel EtherExpress PRO/100B (82557, 82558)
+
+# Pseudo devices.
+device loop # Network loopback
+device random # Entropy device
+device ether # Ethernet support
+device tun # Packet tunnel.
+device pty # BSD-style compatibility pseudo ttys
+device md # Memory "disks"
+device ofwd # Open Firmware disks
+device gif # IPv6 and IPv4 tunneling
+device faith # IPv6-to-IPv4 relaying/(translation)
+
+# The `bpf' device enables the Berkeley Packet Filter.
+# Be aware of the administrative consequences of enabling this!
+# Note that 'bpf' is required for DHCP.
+device bpf #Berkeley packet filter
+
+# USB support
+device uhci # UHCI PCI->USB interface
+device ohci # OHCI PCI->USB interface
+device ehci # EHCI PCI->USB interface
+device usb # USB Bus (required)
+device uhid # "Human Interface Devices"
+device ukbd # Keyboard
+options KBD_INSTALL_CDEV # install a CDEV entry in /dev
+device ulpt # Printer
+device umass # Disks/Mass storage - Requires scbus and da0
+device ums # Mouse
+device urio # Diamond Rio 500 MP3 player
+# USB Ethernet
+device aue # ADMtek USB Ethernet
+device axe # ASIX Electronics USB Ethernet
+device cdce # Generic USB over Ethernet
+device cue # CATC USB Ethernet
+device kue # Kawasaki LSI USB Ethernet
+
+# FireWire support
+device firewire # FireWire bus code
+device sbp # SCSI over FireWire (Requires scbus and da)
+device fwe # Ethernet over FireWire (non-standard!)
+
+# Misc
+device powermac_nvram # Open Firmware configuration NVRAM
+device smu # Apple System Management Unit
+
+# ADB support
+device adb
+device pmu
+
+# Powermac I2C support
+device iicbus # I2C bus code
+device kiic # Keywest I2C
+
Added: projects/ppc64/sys/powerpc/conf/MAMBO
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ projects/ppc64/sys/powerpc/conf/MAMBO Fri Jul 9 15:58:26 2010 (r209856)
@@ -0,0 +1,108 @@
+#
+# GENERIC -- Generic kernel configuration file for FreeBSD/powerpc
+#
+# For more information on this file, please read the handbook section on
+# Kernel Configuration Files:
+#
+# http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html
+#
+# The handbook is also available locally in /usr/share/doc/handbook
+# if you've installed the doc distribution, otherwise always see the
+# FreeBSD World Wide Web server (http://www.FreeBSD.org/) for the
+# latest information.
+#
+# An exhaustive list of options and more detailed explanations of the
+# device lines is also present in the ../../conf/NOTES and NOTES files.
+# If you are in doubt as to the purpose or necessity of a line, check first
+# in NOTES.
+#
+# $FreeBSD: projects/ppc64/sys/powerpc/conf/GENERIC64 -1 $
+
+cpu AIM
+cpu CELL
+ident GENERIC
+
+machine powerpc powerpc64
+
+#To statically compile in device wiring instead of /boot/device.hints
+#hints "GENERIC.hints"
+
+makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols
+makeoptions MODULES_OVERRIDE=""
+
+# Platform support
+options POWERMAC #NewWorld Apple PowerMacs
+options MAMBO #IBM Systemsim ppc simulator
+
+options SCHED_ULE #ULE scheduler
+options INET #InterNETworking
+options INET6 #IPv6 communications protocols
+options SCTP #Stream Control Transmission Protocol
+options FFS #Berkeley Fast Filesystem
+options SOFTUPDATES #Enable FFS soft updates support
+options UFS_ACL #Support for access control lists
+options UFS_DIRHASH #Improve performance on big directories
+options UFS_GJOURNAL #Enable gjournal-based UFS journaling
+options MD_ROOT #MD is a potential root device
+options NFSCLIENT #Network Filesystem Client
+options NFSSERVER #Network Filesystem Server
+options NFSLOCKD #Network Lock Manager
+options NFS_ROOT #NFS usable as root device
+options MSDOSFS #MSDOS Filesystem
+options CD9660 #ISO 9660 Filesystem
+options PROCFS #Process filesystem (requires PSEUDOFS)
+options PSEUDOFS #Pseudo-filesystem framework
+options GEOM_PART_GPT #GUID Partition Tables.
+options GEOM_LABEL #Provides labelization
+options COMPAT_43TTY #BSD 4.3 TTY compat (sgtty)
+options COMPAT_FREEBSD32 #Compatible with PPC32 binaries
+options COMPAT_FREEBSD5 #Compatible with FreeBSD5
+options COMPAT_FREEBSD6 #Compatible with FreeBSD6
+options COMPAT_FREEBSD7 #Compatible with FreeBSD7
+options SCSI_DELAY=5000 #Delay (in ms) before probing SCSI
+options KTRACE #ktrace(1) syscall trace support
+options STACK #stack(9) support
+options SYSVSHM #SYSV-style shared memory
+options SYSVMSG #SYSV-style message queues
+options SYSVSEM #SYSV-style semaphores
+options P1003_1B_SEMAPHORES # POSIX-style semaphores
+options _KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions
+options HWPMC_HOOKS # Necessary kernel hooks for hwpmc(4)
+options AUDIT # Security event auditing
+options MAC # TrustedBSD MAC Framework
+
+# Debugging for use in -current
+options KDB #Enable the kernel debugger
+options KDB_TRACE
+options DDB #Support DDB
+options INVARIANTS #Enable calls of extra sanity checking
+options INVARIANT_SUPPORT #Extra sanity checks of internal structures, required by INVARIANTS
+options WITNESS #Enable checks to detect deadlocks and cycles
+options WITNESS_SKIPSPIN #Don't run witness on spinlocks for speed
+
+# To make an SMP kernel, the next line is needed
+options SMP # Symmetric MultiProcessor Kernel
+
+# Standard busses
+device pci
+
+# Pseudo devices.
+device loop # Network loopback
+device random # Entropy device
+device ether # Ethernet support
+device tun # Packet tunnel.
+device pty # BSD-style compatibility pseudo ttys
+device md # Memory "disks"
+device ofwd # Open Firmware disks
+device gif # IPv6 and IPv4 tunneling
+device faith # IPv6-to-IPv4 relaying/(translation)
+
+# The `bpf' device enables the Berkeley Packet Filter.
+# Be aware of the administrative consequences of enabling this!
+# Note that 'bpf' is required for DHCP.
+device bpf #Berkeley packet filter
+
+options KTR
+options KTR_COMPILE=0xffffffff
+#options KTR_MASK=(KTR_SYSC)
+options KTR_VERBOSE
Modified: projects/ppc64/sys/powerpc/conf/MPC85XX
==============================================================================
--- projects/ppc64/sys/powerpc/conf/MPC85XX Fri Jul 9 14:38:06 2010 (r209855)
+++ projects/ppc64/sys/powerpc/conf/MPC85XX Fri Jul 9 15:58:26 2010 (r209856)
@@ -7,6 +7,8 @@
cpu E500
ident MPC85XX
+machine powerpc powerpc
+
makeoptions DEBUG="-Wa,-me500 -g"
makeoptions NO_MODULES=yes
Modified: projects/ppc64/sys/powerpc/powermac/grackle.c
==============================================================================
--- projects/ppc64/sys/powerpc/powermac/grackle.c Fri Jul 9 14:38:06 2010 (r209855)
+++ projects/ppc64/sys/powerpc/powermac/grackle.c Fri Jul 9 15:58:26 2010 (r209856)
@@ -472,7 +472,7 @@ grackle_activate_resource(device_t bus,
start += sc->sc_iostart;
if (bootverbose)
- printf("grackle mapdev: start %x, len %ld\n", start,
+ printf("grackle mapdev: start %lx, len %ld\n", start,
rman_get_size(res));
p = pmap_mapdev(start, (vm_size_t)rman_get_size(res));
More information about the svn-src-projects
mailing list