7 files changed, 3 insertions, 43 deletions
diff --git a/sys/powerpc/conf/dpaa/config.dpaa b/sys/powerpc/conf/dpaa/config.dpaa
index bc68498..1eafce9 100644
--- a/sys/powerpc/conf/dpaa/config.dpaa
+++ b/sys/powerpc/conf/dpaa/config.dpaa
@@ -1,6 +1,8 @@
 # $FreeBSD$
 
-makeoptions DPAA_COMPILE_CMD_COMMON="${NORMAL_C} \
+files		"dpaa/files.dpaa"
+
+makeoptions DPAA_COMPILE_CMD="${NORMAL_C} \
 	-Wno-cast-qual -Wno-unused-function -Wno-init-self -fms-extensions \
 	-include $S/contrib/ncsw/build/dflags.h \
 	-I$S/contrib/ncsw/build/ \
diff --git a/sys/powerpc/conf/dpaa/config.p2041 b/sys/powerpc/conf/dpaa/config.p2041
deleted file mode 100644
index 4e7bec1..0000000
--- a/sys/powerpc/conf/dpaa/config.p2041
+++ /dev/null
@@ -1,11 +0,0 @@
-# $FreeBSD$
-
-files		"dpaa/files.dpaa"
-files		"dpaa/files.p2041"
-
-include		"dpaa/config.dpaa"
-
-makeoptions DPAA_COMPILE_CMD="${DPAA_COMPILE_CMD_COMMON} \
-	-I$S/contrib/ncsw/inc/integrations/P2041"
-
-device		dpaa
diff --git a/sys/powerpc/conf/dpaa/config.p3041 b/sys/powerpc/conf/dpaa/config.p3041
deleted file mode 100644
index 9334de6..0000000
--- a/sys/powerpc/conf/dpaa/config.p3041
+++ /dev/null
@@ -1,11 +0,0 @@
-# $FreeBSD$
-
-files		"dpaa/files.dpaa"
-files		"dpaa/files.p3041"
-
-include		"dpaa/config.dpaa"
-
-makeoptions DPAA_COMPILE_CMD="${DPAA_COMPILE_CMD_COMMON} \
-	-I$S/contrib/ncsw/inc/integrations/P3041"
-
-device		dpaa
diff --git a/sys/powerpc/conf/dpaa/config.p5020 b/sys/powerpc/conf/dpaa/config.p5020
deleted file mode 100644
index 28eaeba..0000000
--- a/sys/powerpc/conf/dpaa/config.p5020
+++ /dev/null
@@ -1,11 +0,0 @@
-# $FreeBSD$
-
-files		"dpaa/files.dpaa"
-files		"dpaa/files.p5020"
-
-include		"dpaa/config.dpaa"
-
-makeoptions DPAA_COMPILE_CMD="${DPAA_COMPILE_CMD_COMMON} \
-	-I$S/contrib/ncsw/inc/integrations/P5020"
-
-device		dpaa
diff --git a/sys/powerpc/conf/dpaa/files.p2041 b/sys/powerpc/conf/dpaa/files.p2041
deleted file mode 100644
index dfb4afc..0000000
--- a/sys/powerpc/conf/dpaa/files.p2041
+++ /dev/null
@@ -1,3 +0,0 @@
-# $FreeBSD$
-
-contrib/ncsw/integrations/P2041/module_strings.c	optional dpaa
diff --git a/sys/powerpc/conf/dpaa/files.p3041 b/sys/powerpc/conf/dpaa/files.p3041
deleted file mode 100644
index 89bb35c..0000000
--- a/sys/powerpc/conf/dpaa/files.p3041
+++ /dev/null
@@ -1,3 +0,0 @@
-# $FreeBSD$
-
-contrib/ncsw/integrations/P3041/module_strings.c	optional dpaa
diff --git a/sys/powerpc/conf/dpaa/files.p5020 b/sys/powerpc/conf/dpaa/files.p5020
deleted file mode 100644
index b442d2e..0000000
--- a/sys/powerpc/conf/dpaa/files.p5020
+++ /dev/null
@@ -1,3 +0,0 @@
-# $FreeBSD$
-
-contrib/ncsw/integrations/P5020/module_strings.c	optional dpaa