Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 16 May 2015 10:27:28 +0000 (UTC)
From:      "Bjoern A. Zeeb" <bz@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r283005 - head/sys/arm/conf
Message-ID:  <201505161027.t4GARSw3079633@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: bz
Date: Sat May 16 10:27:27 2015
New Revision: 283005
URL: https://svnweb.freebsd.org/changeset/base/283005

Log:
  tr -d '\r' makes config a lot more happy.

Modified:
  head/sys/arm/conf/ALPINE

Modified: head/sys/arm/conf/ALPINE
==============================================================================
--- head/sys/arm/conf/ALPINE	Sat May 16 09:13:56 2015	(r283004)
+++ head/sys/arm/conf/ALPINE	Sat May 16 10:27:27 2015	(r283005)
@@ -1,83 +1,83 @@
-# Kernel configuration for Alpine Board.
-#
-# For more information on this file, please read the config(5) manual page,
-# and/or 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$
-
-ident		ALPINE
-
-include		"std.armv6"
-include		"../annapurna/alpine/std.alpine"
-
-makeoptions	MODULES_OVERRIDE=""
-makeoptions	WERROR="-Werror"
-
-options 	HZ=100
-options 	SCHED_4BSD		# 4BSD scheduler
-options 	SMP			# Enable multiple cores
-
-# Debugging
-makeoptions	DEBUG=-g		#Build kernel with gdb(1) debug symbols
-options 	BREAK_TO_DEBUGGER
-options 	KDB
-options 	DDB			#Enable the kernel debugger
-
-# NFS support
-options 	NFSCL			#Network Filesystem Client
-options 	NFSLOCKD		#Network Lock Manager
-options 	NFS_ROOT		#NFS usable as /, requires NFSCLIENT
-
-# Interrupt controller
-device		gic
-
-# Pseudo devices
-device		loop
-device		random
-device		pty
-device		md
-device		gpio
-
-# ATA controllers
-device		ahci		# AHCI-compatible SATA controllers
-device		ata		# Legacy ATA/SATA controllers
-options 	ATA_STATIC_ID	# Static device numbering
-
-# ATA/SCSI peripherals
-device		scbus		# SCSI bus (required for ATA/SCSI)
-device		ch		# SCSI media changers
-device		da		# Direct Access (disks)
-device		sa		# Sequential Access (tape etc)
-device		cd		# CD
-device		pass		# Passthrough device (direct ATA/SCSI access)
-device		ses		# Enclosure Services (SES and SAF-TE)
-#device		ctl		# CAM Target Layer
-
-# Serial ports
-device		uart
-
-# Ethernet
-device		ether
-device		mii
-device		bpf
-options 	DEVICE_POLLING
-
-# USB ethernet support, requires miibus
-device		miibus
-
-#FDT
-options 	FDT
-options 	FDT_DTB_STATIC
-makeoptions	FDT_DTS_FILE=annapurna-alpine.dts
+# Kernel configuration for Alpine Board.
+#
+# For more information on this file, please read the config(5) manual page,
+# and/or 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$
+
+ident		ALPINE
+
+include		"std.armv6"
+include		"../annapurna/alpine/std.alpine"
+
+makeoptions	MODULES_OVERRIDE=""
+makeoptions	WERROR="-Werror"
+
+options 	HZ=100
+options 	SCHED_4BSD		# 4BSD scheduler
+options 	SMP			# Enable multiple cores
+
+# Debugging
+makeoptions	DEBUG=-g		#Build kernel with gdb(1) debug symbols
+options 	BREAK_TO_DEBUGGER
+options 	KDB
+options 	DDB			#Enable the kernel debugger
+
+# NFS support
+options 	NFSCL			#Network Filesystem Client
+options 	NFSLOCKD		#Network Lock Manager
+options 	NFS_ROOT		#NFS usable as /, requires NFSCLIENT
+
+# Interrupt controller
+device		gic
+
+# Pseudo devices
+device		loop
+device		random
+device		pty
+device		md
+device		gpio
+
+# ATA controllers
+device		ahci		# AHCI-compatible SATA controllers
+device		ata		# Legacy ATA/SATA controllers
+options 	ATA_STATIC_ID	# Static device numbering
+
+# ATA/SCSI peripherals
+device		scbus		# SCSI bus (required for ATA/SCSI)
+device		ch		# SCSI media changers
+device		da		# Direct Access (disks)
+device		sa		# Sequential Access (tape etc)
+device		cd		# CD
+device		pass		# Passthrough device (direct ATA/SCSI access)
+device		ses		# Enclosure Services (SES and SAF-TE)
+#device		ctl		# CAM Target Layer
+
+# Serial ports
+device		uart
+
+# Ethernet
+device		ether
+device		mii
+device		bpf
+options 	DEVICE_POLLING
+
+# USB ethernet support, requires miibus
+device		miibus
+
+#FDT
+options 	FDT
+options 	FDT_DTB_STATIC
+makeoptions	FDT_DTS_FILE=annapurna-alpine.dts



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201505161027.t4GARSw3079633>