Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 15 Sep 2012 12:25:02 -0600
From:      Warner Losh <imp@bsdimp.com>
To:        John-Mark Gurney <jmg@funkthat.com>
Cc:        freebsd-arm@FreeBSD.org
Subject:   Re: minor patches to cpsw and arm conf files
Message-ID:  <C33A6281-490E-421F-9CE0-6F438FBBE4EC@bsdimp.com>
In-Reply-To: <20120914180318.GX58312@funkthat.com>
References:  <20120914180318.GX58312@funkthat.com>

next in thread | previous in thread | raw e-mail | index | archive | help
These look good.  Please commit, if you haven't already done so.

Warner

On Sep 14, 2012, at 12:03 PM, John-Mark Gurney wrote:

> The first patch removes some dead code, an incorrect comment, and some
> anoying printf's from TI's cpsw driver.  I left the other printf's in
> the same function since they are clearly there to denote unimplemented
> functionality.
>=20
> The second patch fixes up the conf files such that they follow the
> proper format of options<space><tab>...  This applied for both
> commented out options and uncommented options...  I also fixes a few
> that had "#<space>options" and the like to make it more standard...
>=20
> for people who care, part of it was automated with:
> for i in `grep -l '^#options<tab>' *'; do sed -e =
's/^#options<tab>/options /' < $i > tmp && mv tmp $i; done
> for i in `grep -l '^options<tab>' *'; do sed -e =
's/^options<tab>/options /' < $i > tmp && mv tmp $i; done
>=20
> Anyone have any objections to me committing these?
>=20
> Thanks.
>=20
> Index: ti/cpsw/if_cpsw.c
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> --- ti/cpsw/if_cpsw.c	(revision 240480)
> +++ ti/cpsw/if_cpsw.c	(working copy)
> @@ -713,8 +713,6 @@
> 		sc->cpsw_if_flags =3D ifp->if_flags;
> 		CPSW_GLOBAL_UNLOCK(sc);
> 		break;
> -		printf("%s: SIOCSIFFLAGS\n",__func__);
> -		break;
> 	case SIOCADDMULTI:
> 		printf("%s: SIOCADDMULTI\n",__func__);
> 		break;
> @@ -724,12 +722,10 @@
> 	case SIOCSIFCAP:
> 		printf("%s: SIOCSIFCAP\n",__func__);
> 		break;
> -	case SIOCGIFMEDIA: /* fall through */
> -		printf("%s: SIOCGIFMEDIA\n",__func__);
> +	case SIOCGIFMEDIA:
> 		error =3D ifmedia_ioctl(ifp, ifr, &sc->mii->mii_media, =
command);
> 		break;
> 	case SIOCSIFMEDIA:
> -		printf("%s: SIOCSIFMEDIA\n",__func__);
> 		error =3D ifmedia_ioctl(ifp, ifr, &sc->mii->mii_media, =
command);
> 		break;
> 	default:
>=20
> Index: conf/KB920X
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> --- conf/KB920X	(revision 240480)
> +++ conf/KB920X	(working copy)
> @@ -144,6 +144,6 @@
> device		cdce		# emulate an ethernet
> device		usb_template	# Control of the gadget
>=20
> -options		IEEE80211_SUPPORT_MESH
> +options 	IEEE80211_SUPPORT_MESH
>=20
> -options		AH_SUPPORT_AR5416
> +options 	AH_SUPPORT_AR5416
> Index: conf/QILA9G20
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> --- conf/QILA9G20	(revision 240480)
> +++ conf/QILA9G20	(working copy)
> @@ -51,7 +51,7 @@
>=20
> options 	ROOTDEVNAME=3D\"ufs:/dev/mmcsd0s1a\"
>=20
> -options		ALT_BREAK_TO_DEBUGGER
> +options 	ALT_BREAK_TO_DEBUGGER
>=20
> #options 	MSDOSFS			#MSDOS Filesystem
> #options 	CD9660			#ISO 9660 Filesystem
> Index: conf/SAM9X25EK
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> --- conf/SAM9X25EK	(revision 240480)
> +++ conf/SAM9X25EK	(working copy)
> @@ -51,7 +51,7 @@
>=20
> options 	ROOTDEVNAME=3D\"ufs:/dev/mmcsd0s1a\"
>=20
> -options		ALT_BREAK_TO_DEBUGGER
> +options 	ALT_BREAK_TO_DEBUGGER
>=20
> #options 	MSDOSFS			#MSDOS Filesystem
> #options 	CD9660			#ISO 9660 Filesystem
> Index: conf/SN9G45
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> --- conf/SN9G45	(revision 240480)
> +++ conf/SN9G45	(working copy)
> @@ -50,7 +50,7 @@
>=20
> options 	ROOTDEVNAME=3D\"ufs:/dev/da0s1\"
>=20
> -options		ALT_BREAK_TO_DEBUGGER
> +options 	ALT_BREAK_TO_DEBUGGER
>=20
> #options 	MSDOSFS			#MSDOS Filesystem
> #options 	CD9660			#ISO 9660 Filesystem
> Index: conf/PANDABOARD
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> --- conf/PANDABOARD	(revision 240480)
> +++ conf/PANDABOARD	(working copy)
> @@ -46,15 +46,15 @@
> options 	UFS_DIRHASH		#Improve performance on big =
directories
> options 	NFSCLIENT		#Network Filesystem Client
> device		snp
> -#options		NFSCL
> +#options 	NFSCL
> #options 	NFSSERVER		#Network Filesystem Server
> options 	NFS_ROOT		#NFS usable as /, requires =
NFSCLIENT
> -options		BREAK_TO_DEBUGGER
> -options		BOOTP_NFSROOT
> -options		BOOTP_COMPAT
> -options		BOOTP
> -options		BOOTP_NFSV3
> -options		BOOTP_WIRED_TO=3Due0
> +options 	BREAK_TO_DEBUGGER
> +options 	BOOTP_NFSROOT
> +options 	BOOTP_COMPAT
> +options 	BOOTP
> +options 	BOOTP_NFSV3
> +options 	BOOTP_WIRED_TO=3Due0
> options 	MSDOSFS			#MSDOS Filesystem
> #options 	CD9660			#ISO 9660 Filesystem
> #options 	PROCFS			#Process filesystem (requires =
PSEUDOFS)
> @@ -93,7 +93,7 @@
>=20
> device		pl310			#  PL310 L2 cache =
controller
> # Debugging for use in -current
> -#options		VERBOSE_SYSINIT		#Enable verbose sysinit =
messages
> +#options 	VERBOSE_SYSINIT		#Enable verbose sysinit messages
> options 	KDB
> options 	DDB			#Enable the kernel debugger
> #options 	INVARIANTS		#Enable calls of extra sanity =
checking
> @@ -106,16 +106,16 @@
>=20
> # The following enables MFS as root, this seems similar to an =
initramfs or initrd
> # as used in Linux.
> -# options		MD_ROOT
> -# options		MD_ROOT_SIZE=3D7560
> +#options 	MD_ROOT
> +#options 	MD_ROOT_SIZE=3D7560
>=20
> device		random		# Entropy device
>=20
> # USB support
> device		usb
> options 	USB_DEBUG
> -#options	USB_REQ_DEBUG
> -#options		USB_VERBOSE
> +#options 	USB_REQ_DEBUG
> +#options 	USB_VERBOSE
> device		ohci
> device		ehci
> device		umass
> @@ -125,7 +125,7 @@
>=20
> # USB Ethernet support, requires miibus
> device		miibus
> -# device		axe			# ASIX Electronics USB =
Ethernet
> +#device		axe			# ASIX Electronics USB =
Ethernet
> device		smsc		# SMSC LAN95xx USB Ethernet
>=20
>=20
> @@ -140,5 +140,5 @@
> options         FDT_DTB_STATIC
> makeoptions     FDT_DTS_FILE=3Dpandaboard.dts
>=20
> -# device		vfp			# vfp/neon
> -# options		ARM_VFP_SUPPORT		# vfp/neon
> +#device		vfp			# vfp/neon
> +#options 	ARM_VFP_SUPPORT		# vfp/neon
> Index: conf/ARMADAXP
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> --- conf/ARMADAXP	(revision 240480)
> +++ conf/ARMADAXP	(working copy)
> @@ -92,8 +92,8 @@
> device		mii
> device		e1000phy
> device		bpf
> -options		HZ=3D1000
> -options		DEVICE_POLLING
> +options 	HZ=3D1000
> +options 	DEVICE_POLLING
> device		vlan
>=20
> #FDT
> Index: conf/SHEEVAPLUG
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> --- conf/SHEEVAPLUG	(revision 240480)
> +++ conf/SHEEVAPLUG	(working copy)
> @@ -56,8 +56,8 @@
> device		mii
> device		e1000phy
> device		bpf
> -options		HZ=3D1000
> -options		DEVICE_POLLING
> +options 	HZ=3D1000
> +options 	DEVICE_POLLING
> device		vlan
>=20
> device		cesa			# Marvell security =
engine
> @@ -78,5 +78,5 @@
>=20
> # Flattened Device Tree
> options 	FDT
> -options		FDT_DTB_STATIC
> +options 	FDT_DTB_STATIC
> makeoptions	FDT_DTS_FILE=3Dsheevaplug.dts
> Index: conf/TS7800
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> --- conf/TS7800	(revision 240480)
> +++ conf/TS7800	(working copy)
> @@ -74,6 +74,6 @@
>=20
> # Flattened Device Tree
> options 	FDT
> -options		FDT_DTB_STATIC
> +options 	FDT_DTB_STATIC
> makeoptions	FDT_DTS_FILE=3Dts7800.dts
>=20
> Index: conf/GUMSTIX-QEMU
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> --- conf/GUMSTIX-QEMU	(revision 240480)
> +++ conf/GUMSTIX-QEMU	(working copy)
> @@ -21,5 +21,5 @@
>=20
> ident		GUMSTIX-QEMU
>=20
> -options		QEMU_WORKAROUNDS
> +options 	QEMU_WORKAROUNDS
> nooptions	ARM_CACHE_LOCK_ENABLE	# QEMU does not implement this
> Index: conf/CNS11XXNAS
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> --- conf/CNS11XXNAS	(revision 240480)
> +++ conf/CNS11XXNAS	(working copy)
> @@ -47,9 +47,9 @@
> #options 	DIAGNOSTIC
>=20
>=20
> -#options		COMPAT_FREEBSD5
> -#options		COMPAT_FREEBSD6
> -#options		COMPAT_FREEBSD7
> +#options 	COMPAT_FREEBSD5
> +#options 	COMPAT_FREEBSD6
> +#options 	COMPAT_FREEBSD7
>=20
>=20
> options 	SCHED_ULE		#ULE scheduler
> @@ -121,4 +121,4 @@
> device		geom_journal
> device 		geom_part_bsd
>=20
> -options		ROOTDEVNAME=3D\"ufs:da0s1a\"
> +options 	ROOTDEVNAME=3D\"ufs:da0s1a\"
> Index: conf/BEAGLEBONE
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> --- conf/BEAGLEBONE	(revision 240480)
> +++ conf/BEAGLEBONE	(working copy)
> @@ -25,52 +25,52 @@
> makeoptions	MODULES_OVERRIDE=3D""
> makeoptions	WITHOUT_MODULES=3D"ahc"
>=20
> -options		HZ=3D100
> -options		SCHED_4BSD		#4BSD scheduler
> -options		INET			#InterNETworking
> -options		INET6			#IPv6 communications =
protocols
> -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		MSDOSFS			#MSDOS Filesystem
> -options		CD9660			#ISO 9660 Filesystem
> -options		PROCFS			#Process filesystem =
(requires PSEUDOFS)
> -options		PSEUDOFS		#Pseudo-filesystem =
framework
> -options		COMPAT_43		#Compatible with BSD 4.3 =
[KEEP THIS!]
> -options		SCSI_DELAY=3D5000		#Delay (in ms) =
before probing SCSI
> -options		KTRACE			#ktrace(1) support
> -options		SYSVSHM			#SYSV-style shared =
memory
> -options		SYSVMSG			#SYSV-style message =
queues
> -options		SYSVSEM			#SYSV-style semaphores
> -options		_KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B =
real-time extensions
> -options		KBD_INSTALL_CDEV	# install a CDEV entry =
in /dev
> -options		PREEMPTION
> +options 	HZ=3D100
> +options 	SCHED_4BSD		#4BSD scheduler
> +options 	INET			#InterNETworking
> +options 	INET6			#IPv6 communications protocols
> +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 	MSDOSFS			#MSDOS Filesystem
> +options 	CD9660			#ISO 9660 Filesystem
> +options 	PROCFS			#Process filesystem (requires =
PSEUDOFS)
> +options 	PSEUDOFS		#Pseudo-filesystem framework
> +options 	COMPAT_43		#Compatible with BSD 4.3 [KEEP =
THIS!]
> +options 	SCSI_DELAY=3D5000		#Delay (in ms) before =
probing SCSI
> +options 	KTRACE			#ktrace(1) support
> +options 	SYSVSHM			#SYSV-style shared memory
> +options 	SYSVMSG			#SYSV-style message queues
> +options 	SYSVSEM			#SYSV-style semaphores
> +options 	_KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time =
extensions
> +options 	KBD_INSTALL_CDEV	# install a CDEV entry in /dev
> +options 	PREEMPTION
>=20
> # Debugging
> makeoptions	DEBUG=3D-g		#Build kernel with gdb(1) debug =
symbols
> -options		BREAK_TO_DEBUGGER
> -#options	VERBOSE_SYSINIT		#Enable verbose sysinit messages
> -options		KDB
> -options		DDB			#Enable the kernel =
debugger
> -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
> -#options	DIAGNOSTIC
> +options 	BREAK_TO_DEBUGGER
> +#options 	VERBOSE_SYSINIT		#Enable verbose sysinit messages
> +options 	KDB
> +options 	DDB			#Enable the kernel debugger
> +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
> +#options 	DIAGNOSTIC
>=20
> # NFS support
> -#options	NFSCL
> -#options	NFSSERVER		#Network Filesystem Server
> -#options	NFSCLIENT		#Network Filesystem Client
> +#options 	NFSCL
> +#options 	NFSSERVER		#Network Filesystem Server
> +#options 	NFSCLIENT		#Network Filesystem Client
>=20
> # Uncomment this for NFS root
> -#options	NFS_ROOT		#NFS usable as /, requires =
NFSCLIENT
> -#options	BOOTP_NFSROOT
> -#options	BOOTP_COMPAT
> -#options	BOOTP
> -#options	BOOTP_NFSV3
> -#options	BOOTP_WIRED_TO=3Dcpsw0
> +#options 	NFS_ROOT		#NFS usable as /, requires =
NFSCLIENT
> +#options 	BOOTP_NFSROOT
> +#options 	BOOTP_COMPAT
> +#options 	BOOTP
> +#options 	BOOTP_NFSV3
> +#options 	BOOTP_WIRED_TO=3Dcpsw0
>=20
>=20
> # MMC/SD/SDIO card slot support
> @@ -78,7 +78,7 @@
> device		mmcsd			# mmc/sd flash cards
>=20
> # Boot device is 2nd slice on MMC/SD card
> -options		ROOTDEVNAME=3D\"ufs:mmcsd0s2\"
> +options 	ROOTDEVNAME=3D\"ufs:mmcsd0s2\"
>=20
> # Console and misc
> device		uart
> @@ -99,9 +99,9 @@
>=20
> # USB support
> device		usb
> -options		USB_DEBUG
> -#options	USB_REQ_DEBUG
> -#options	USB_VERBOSE
> +options 	USB_DEBUG
> +#options 	USB_REQ_DEBUG
> +#options 	USB_VERBOSE
> device		musb
> device		umass
> device		scbus			# SCSI bus (required for =
SCSI)
> Index: conf/HL201
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> --- conf/HL201	(revision 240480)
> +++ conf/HL201	(working copy)
> @@ -49,7 +49,7 @@
> #options 	BOOTP_WIRED_TO=3Date0
> options 	BOOTP_COMPAT
>=20
> -options		ALT_BREAK_TO_DEBUGGER
> +options 	ALT_BREAK_TO_DEBUGGER
>=20
> #options 	MSDOSFS			#MSDOS Filesystem
> #options 	CD9660			#ISO 9660 Filesystem
> @@ -128,5 +128,5 @@
> #device		wlan_ccmp	# 802.11 CCMP support
> #device		wlan_tkip	# 802.11 TKIP support
> #device		wlan_amrr	# AMRR transmit rate control =
algorithm
> -options		ROOTDEVNAME=3D\"ufs:da0s1a\"
> +options 	ROOTDEVNAME=3D\"ufs:da0s1a\"
>=20
> Index: conf/EA3250
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> --- conf/EA3250	(revision 240480)
> +++ conf/EA3250	(working copy)
> @@ -65,7 +65,7 @@
> device		lpe
>=20
> # USB
> -options		USB_DEBUG
> +options 	USB_DEBUG
> device		usb
> device		ohci
> device		umass
> Index: conf/SAM9G20EK
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> --- conf/SAM9G20EK	(revision 240480)
> +++ conf/SAM9G20EK	(working copy)
> @@ -50,7 +50,7 @@
>=20
> options 	ROOTDEVNAME=3D\"ufs:/dev/mmcsd0s1a\"
>=20
> -options		ALT_BREAK_TO_DEBUGGER
> +options 	ALT_BREAK_TO_DEBUGGER
>=20
> #options 	MSDOSFS			#MSDOS Filesystem
> #options 	CD9660			#ISO 9660 Filesystem
> Index: conf/LN2410SBC
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> --- conf/LN2410SBC	(revision 240480)
> +++ conf/LN2410SBC	(working copy)
> @@ -40,7 +40,7 @@
> #options 	UFS_DIRHASH		#Improve performance on big =
directories
> #options 	MD_ROOT			#MD is a potential root device
> #options 	MD_ROOT_SIZE=3D4096	# 4MB ram disk
> -options		ROOTDEVNAME=3D\"ufs:da0s1\"
> +options 	ROOTDEVNAME=3D\"ufs:da0s1\"
>=20
> #options 	BOOTP
> #options 	BOOTP_NFSROOT	# NFS mount root filesystem using BOOTP =
info
> Index: conf/RPI-B
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> --- conf/RPI-B	(revision 240480)
> +++ conf/RPI-B	(working copy)
> @@ -24,12 +24,12 @@
> files		"../broadcom/bcm2835/files.bcm2835"
> makeoptions	MODULES_OVERRIDE=3D""
>=20
> -options		KERNVIRTADDR=3D0xc0100000
> +options 	KERNVIRTADDR=3D0xc0100000
> makeoptions	KERNVIRTADDR=3D0xc0100000
> -options		KERNPHYSADDR=3D0x00100000
> +options 	KERNPHYSADDR=3D0x00100000
> makeoptions	KERNPHYSADDR=3D0x00100000
> -options		PHYSADDR=3D0x00000000
> -options		STARTUP_PAGETABLE_ADDR=3D0x01000000
> +options 	PHYSADDR=3D0x00000000
> +options 	STARTUP_PAGETABLE_ADDR=3D0x01000000
>=20
> makeoptions	DEBUG=3D-g		#Build kernel with gdb(1) debug =
symbols
> options 	HZ=3D100
> @@ -42,13 +42,13 @@
> options 	UFS_DIRHASH		#Improve performance on big =
directories
> device		snp
>=20
> -# options 	NFSCL		#Network Filesystem Client
> -# options 	NFS_ROOT		#NFS usable as /, requires =
NFSCLIENT
> -# options		BOOTP_NFSROOT
> -# options		BOOTP_COMPAT
> -# options		BOOTP
> -# options		BOOTP_NFSV3
> -# options		BOOTP_WIRED_TO=3Due0
> +#options 	NFSCL			#Network Filesystem Client
> +#options 	NFS_ROOT		#NFS usable as /, requires =
NFSCLIENT
> +#options 	BOOTP_NFSROOT
> +#options 	BOOTP_COMPAT
> +#options 	BOOTP
> +#options 	BOOTP_NFSV3
> +#options 	BOOTP_WIRED_TO=3Due0
>=20
> options 	PSEUDOFS		#Pseudo-filesystem framework
> options 	COMPAT_43		#Compatible with BSD 4.3 [KEEP =
THIS!]
> Index: conf/DOCKSTAR
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> --- conf/DOCKSTAR	(revision 240480)
> +++ conf/DOCKSTAR	(working copy)
> @@ -56,8 +56,8 @@
> device		mge			# Marvell Gigabit =
Ethernet controller
> device		mii
> device		bpf
> -options		HZ=3D1000
> -options		DEVICE_POLLING
> +options 	HZ=3D1000
> +options 	DEVICE_POLLING
> device		vlan
>=20
> # USB
> @@ -71,5 +71,5 @@
>=20
> # Flattened Device Tree
> options 	FDT
> -options		FDT_DTB_STATIC
> +options 	FDT_DTB_STATIC
> makeoptions	FDT_DTS_FILE=3Ddockstar.dts
>=20
> --=20
>  John-Mark Gurney				Voice: +1 415 225 5579
>=20
>     "All that I will do, has been done, All that I have, has not."
> _______________________________________________
> freebsd-arm@freebsd.org mailing list
> http://lists.freebsd.org/mailman/listinfo/freebsd-arm
> To unsubscribe, send any mail to "freebsd-arm-unsubscribe@freebsd.org"




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?C33A6281-490E-421F-9CE0-6F438FBBE4EC>