svn commit: r211483 - in head/sys: conf powerpc/conf

[Nathan Whitehorn]

Author: nwhitehorn
Date: Thu Aug 19 03:19:26 2010
New Revision: 211483
URL: http://svn.freebsd.org/changeset/base/211483

Log:
  Unbreak the LINT kernel on powerpc64. Note that the LINT kernel
  configuration is TARGET_ARCH specific and must be generated with
  TARGET_ARCH set.
  
  Reviewed by:	imp

Modified:
  head/sys/conf/makeLINT.mk
  head/sys/powerpc/conf/Makefile
  head/sys/powerpc/conf/NOTES

Modified: head/sys/conf/makeLINT.mk
==============================================================================
--- head/sys/conf/makeLINT.mk	Thu Aug 19 02:15:39 2010	(r211482)
+++ head/sys/conf/makeLINT.mk	Thu Aug 19 03:19:26 2010	(r211483)
@@ -17,3 +17,6 @@ LINT: ${NOTES} ../../conf/makeLINT.sed
 	echo "ident ${.TARGET}-VIMAGE"	>> ${.TARGET}-VIMAGE
 	echo "options VIMAGE"		>> ${.TARGET}-VIMAGE
 .endif
+.if ${TARGET} == "powerpc"
+	echo "machine	${TARGET} ${TARGET_ARCH}" >> ${.TARGET}
+.endif

Modified: head/sys/powerpc/conf/Makefile
==============================================================================
--- head/sys/powerpc/conf/Makefile	Thu Aug 19 02:15:39 2010	(r211482)
+++ head/sys/powerpc/conf/Makefile	Thu Aug 19 03:19:26 2010	(r211483)
@@ -1,5 +1,8 @@
 # $FreeBSD$
 
 TARGET=powerpc
+.if ${MACHINE_ARCH} == powerpc || ${MACHINE_ARCH} == powerpc64
+TARGET_ARCH?=${MACHINE_ARCH}
+.endif
 
 .include "${.CURDIR}/../../conf/makeLINT.mk"

Modified: head/sys/powerpc/conf/NOTES
==============================================================================
--- head/sys/powerpc/conf/NOTES	Thu Aug 19 02:15:39 2010	(r211482)
+++ head/sys/powerpc/conf/NOTES	Thu Aug 19 03:19:26 2010	(r211483)
@@ -8,7 +8,8 @@
 #####################################################################
 # CPU OPTIONS
 
-machine		powerpc powerpc
+# You must specify a machine directive to choose powerpc or powerpc64
+#machine		powerpc powerpc[64]
 
 #
 # You must specify at least one CPU (the one you intend to run on).
@@ -44,6 +45,7 @@ device		snd_davbus	# Apple Davbus Audio
 #####################################################################
 # Devices we don't want to deal with
 
+nodevice	bktr
 nodevice	fdc
 nodevice	ppc
 nodevice	splash