From 6a443d53089daa6f66dfd4e33fdd812d62cf009b Mon Sep 17 00:00:00 2001
From: Robert Millan <rmh@FreeBSD.org>
Date: Sun, 12 Feb 2012 14:55:27 +0000
Subject: [PATCH] Move WITHOUT_SOURCELESS_* files to sys/conf/ in order to
 avoid "universe" target processing them as if they were standalone kernel
 config files.

Approved by:	kib (mentor)
MFC after:	5 days
---
 sys/{amd64 => }/conf/WITHOUT_SOURCELESS       |  0
 sys/{amd64 => }/conf/WITHOUT_SOURCELESS_HOST  |  0
 sys/{amd64 => }/conf/WITHOUT_SOURCELESS_UCODE |  0
 sys/i386/conf/WITHOUT_SOURCELESS              |  7 ----
 sys/i386/conf/WITHOUT_SOURCELESS_HOST         | 10 -----
 sys/i386/conf/WITHOUT_SOURCELESS_UCODE        | 41 -------------------
 6 files changed, 58 deletions(-)
 rename sys/{amd64 => }/conf/WITHOUT_SOURCELESS (100%)
 rename sys/{amd64 => }/conf/WITHOUT_SOURCELESS_HOST (100%)
 rename sys/{amd64 => }/conf/WITHOUT_SOURCELESS_UCODE (100%)
 delete mode 100644 sys/i386/conf/WITHOUT_SOURCELESS
 delete mode 100644 sys/i386/conf/WITHOUT_SOURCELESS_HOST
 delete mode 100644 sys/i386/conf/WITHOUT_SOURCELESS_UCODE

diff --git a/sys/amd64/conf/WITHOUT_SOURCELESS b/sys/conf/WITHOUT_SOURCELESS
similarity index 100%
rename from sys/amd64/conf/WITHOUT_SOURCELESS
rename to sys/conf/WITHOUT_SOURCELESS
diff --git a/sys/amd64/conf/WITHOUT_SOURCELESS_HOST b/sys/conf/WITHOUT_SOURCELESS_HOST
similarity index 100%
rename from sys/amd64/conf/WITHOUT_SOURCELESS_HOST
rename to sys/conf/WITHOUT_SOURCELESS_HOST
diff --git a/sys/amd64/conf/WITHOUT_SOURCELESS_UCODE b/sys/conf/WITHOUT_SOURCELESS_UCODE
similarity index 100%
rename from sys/amd64/conf/WITHOUT_SOURCELESS_UCODE
rename to sys/conf/WITHOUT_SOURCELESS_UCODE
diff --git a/sys/i386/conf/WITHOUT_SOURCELESS b/sys/i386/conf/WITHOUT_SOURCELESS
deleted file mode 100644
index 3425dda64487..000000000000
--- a/sys/i386/conf/WITHOUT_SOURCELESS
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# WITHOUT_SOURCELESS -- Disable drivers that include sourceless code.
-#
-# $FreeBSD$
-
-include WITHOUT_SOURCELESS_HOST
-include WITHOUT_SOURCELESS_UCODE
diff --git a/sys/i386/conf/WITHOUT_SOURCELESS_HOST b/sys/i386/conf/WITHOUT_SOURCELESS_HOST
deleted file mode 100644
index 6261a3db1fa7..000000000000
--- a/sys/i386/conf/WITHOUT_SOURCELESS_HOST
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# WITHOUT_SOURCELESS_UCODE -- Disable drivers that include sourceless
-# native code for host CPU.
-#
-# $FreeBSD$
-
-nodevice	hpt27xx
-nodevice	hptmv
-nodevice	hptrr
-nodevice	nve
diff --git a/sys/i386/conf/WITHOUT_SOURCELESS_UCODE b/sys/i386/conf/WITHOUT_SOURCELESS_UCODE
deleted file mode 100644
index 3d02c21257d7..000000000000
--- a/sys/i386/conf/WITHOUT_SOURCELESS_UCODE
+++ /dev/null
@@ -1,41 +0,0 @@
-#
-# WITHOUT_SOURCELESS_UCODE -- Disable drivers that include sourceless
-# microcode.
-#
-# $FreeBSD$
-
-nodevice	adw
-nodevice	bce
-nodevice	fatm
-nodevice	fxp
-nodevice	ispfw
-nodevice	mwlfw
-nodevice	ralfw
-nodevice	runfw
-nodevice	sf
-nodevice	sn
-nodevice	ti
-nodevice	txp
-nodevice	ce
-nodevice	cp
-nodevice	ctau
-nodevice	ipwfw
-nodevice	iwifw
-nodevice	iwnfw
-nodevice	wpifw
-
-# drm
-nodevice	mga
-nodevice	r128
-nodevice	radeon
-
-# sound
-nodevice	csa
-nodevice	ds1
-nodevice	maestro3
-
-# usb
-nodevice	rum
-nodevice	uath
-nodevice	zyd
-nodevice	kue