4 files changed, 3 insertions, 246 deletions

diff --git a/sys/powerpc/conf/QORIQ64 b/sys/powerpc/conf/QORIQ64
index c64d015c37d1..d1f4f3401d23 100644
--- a/sys/powerpc/conf/QORIQ64
+++ b/sys/powerpc/conf/QORIQ64
@@ -10,7 +10,6 @@ ident		QORIQ64
 
 machine		powerpc	powerpc64
 
-include 	"dpaa/config.dpaa"
 makeoptions	DEBUG=-g		#Build kernel with gdb(1) debug symbols
 makeoptions	WITH_CTF=1
 #makeoptions	WERROR="-Werror -Wno-format"
@@ -22,6 +21,7 @@ options 	_KPOSIX_PRIORITY_SCHEDULING
 options 	ALT_BREAK_TO_DEBUGGER
 options 	BREAK_TO_DEBUGGER
 options 	BOOTP
+#options 	BOOTP_WIRED_TO=memac0
 options 	BOOTP_NFSROOT
 #options 	BOOTP_NFSV3
 options 	CD9660
@@ -134,3 +134,5 @@ device		uinput			# install /dev/uinput cdev
 options 	HID_DEBUG	# enable debug msgs
 device		hid		# Generic HID support
 device		hidbus		# Generic HID bus
+
+options		BOOTVERBOSE
diff --git a/sys/powerpc/conf/dpaa/DPAA b/sys/powerpc/conf/dpaa/DPAA
deleted file mode 100644
index 323c71048c12..000000000000
--- a/sys/powerpc/conf/dpaa/DPAA
+++ /dev/null
@@ -1,99 +0,0 @@
-#
-# Common kernel config for Freescale QorIQ DPAA development boards like the
-# P2041RDB, P3041DS and P5020DS.
-#
-# This is not standalone kernel config. Use it only for including
-# purposes.
-#
-
-cpu		BOOKE
-cpu		BOOKE_E500
-
-machine		powerpc powerpc
-#makeoptions	DEBUG=-g		#Build kernel with gdb(1) debug symbols
-#makeoptions	WERROR="-Werror -Wno-format"
-makeoptions	NO_MODULES=yes
-
-# Platform support
-options		MPC85XX			#Freescale SoC family
-
-options		SMP			#Symmetric Multi Processing
-
-#options		SCHED_4BSD		#4BSD scheduler
-options		INET			#InterNETworking
-options		INET6			#IPv6 communications protocols
-options		FFS			#Berkeley Fast Filesystem
-options		NFSCL			#New Network Filesystem Client
-options		SOFTUPDATES		#Enable FFS soft updates support
-options		PROCFS			#Process filesystem (requires PSEUDOFS)
-options		PSEUDOFS		#Pseudo-filesystem framework
-options		GEOM_PART_GPT		#GUID Partition Tables.
-options		GEOM_LABEL
-options		COMPAT_43		#Compatible with BSD 4.3 [KEEP THIS!]
-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		KDB			#Enable the kernel debugger
-options		DDB			#Support DDB
-options		GDB
-
-options		ALT_BREAK_TO_DEBUGGER
-options		BREAK_TO_DEBUGGER
-options		DIAGNOSTIC
-options		INVARIANTS		#Enable calls of extra sanity checking
-options		INVARIANT_SUPPORT	#Extra sanity checks of internal structures, required by INVARIANTS
-
-options 	KTR
-options 	KTR_COMPILE=0xffffffff
-options 	KTR_MASK=KTR_PMAP
-options		KTR_ENTRIES=8192
-
-options		WITNESS			#Enable checks to detect deadlocks and cycles
-#options		WITNESS_KDB
-
-# RamFS Root
-#options		GEOM_UZIP
-#options		MD_ROOT
-#options		MD_ROOT_SIZE=10240
-
-# Netbooting
-options		BOOTP
-options		BOOTP_NFSROOT
-options		BOOTP_NFSV3
-options		BOOTP_WIRED_TO=dtsec3
-options		NFS_ROOT
-
-# Block devices
-device		mmc
-device		mmcsd
-device		sdhci
-
-# Network devices
-device		miibus		# MII bus support
-device		iflib
-device		em
-
-
-# I2C support
-device		iicbus
-device		iic
-
-device		uart
-device		ehci
-device		usb
-device		scbus
-device		da
-device		umass
-device		pty
-device		cfi
-
-device		pci
-
-# Pseudo devices
-device		ether		# Ethernet support
-device		loop		# Network loopback
-device		bpf		# Berkeley packet filter
-device		md		# Memory "disks"
-
diff --git a/sys/powerpc/conf/dpaa/config.dpaa b/sys/powerpc/conf/dpaa/config.dpaa
deleted file mode 100644
index 0b7c8fcf3b29..000000000000
--- a/sys/powerpc/conf/dpaa/config.dpaa
+++ /dev/null
@@ -1,24 +0,0 @@
-
-files		"dpaa/files.dpaa"
-
-makeoptions DPAA_COMPILE_CMD="${LINUXKPI_C} ${DPAAWARNFLAGS} \
-	-Wno-cast-qual -Wno-unused-function -Wno-init-self \
-	-include $S/contrib/ncsw/build/dflags.h \
-	-Wno-error=missing-prototypes \
-	-I$S/contrib/ncsw/build/ \
-	-I$S/contrib/ncsw/inc \
-	-I$S/contrib/ncsw/inc/cores \
-	-I$S/contrib/ncsw/inc/etc \
-	-I$S/contrib/ncsw/inc/Peripherals \
-	-I$S/contrib/ncsw/etc \
-	-I$S/contrib/ncsw/Peripherals/BM \
-	-I$S/contrib/ncsw/Peripherals/FM \
-	-I$S/contrib/ncsw/Peripherals/FM/HC \
-	-I$S/contrib/ncsw/Peripherals/FM/inc \
-	-I$S/contrib/ncsw/Peripherals/FM/MAC \
-	-I$S/contrib/ncsw/Peripherals/FM/Pcd \
-	-I$S/contrib/ncsw/Peripherals/FM/Port \
-	-I$S/contrib/ncsw/Peripherals/FM/Rtc \
-	-I$S/contrib/ncsw/Peripherals/QM \
-	-I$S/contrib/ncsw/inc/flib \
-	-I$S/contrib/ncsw/inc/integrations"
diff --git a/sys/powerpc/conf/dpaa/files.dpaa b/sys/powerpc/conf/dpaa/files.dpaa
deleted file mode 100644
index 4af0f896d883..000000000000
--- a/sys/powerpc/conf/dpaa/files.dpaa
+++ /dev/null
@@ -1,122 +0,0 @@
-
-# NetCommSw drivers
-contrib/ncsw/etc/error.c				optional dpaa	\
-	no-depend compile-with "${DPAA_COMPILE_CMD}"
-contrib/ncsw/etc/ncsw_list.c				optional dpaa	\
-	no-depend compile-with "${DPAA_COMPILE_CMD}"
-contrib/ncsw/etc/memcpy.c				optional dpaa	\
-	no-depend compile-with "${DPAA_COMPILE_CMD}"
-contrib/ncsw/etc/mm.c					optional dpaa	\
-	no-depend compile-with "${DPAA_COMPILE_CMD}"
-contrib/ncsw/etc/ncsw_mem.c				optional dpaa	\
-	no-depend compile-with "${DPAA_COMPILE_CMD}"
-contrib/ncsw/etc/sprint.c				optional dpaa	\
-	no-depend compile-with "${DPAA_COMPILE_CMD}"
-contrib/ncsw/Peripherals/BM/bm.c			optional dpaa	\
-	no-depend compile-with "${DPAA_COMPILE_CMD}"
-contrib/ncsw/Peripherals/BM/bman_low.c			optional dpaa	\
-	no-depend compile-with "${DPAA_COMPILE_CMD}"
-contrib/ncsw/Peripherals/BM/bm_pool.c			optional dpaa	\
-	no-depend compile-with "${DPAA_COMPILE_CMD}"
-contrib/ncsw/Peripherals/BM/bm_portal.c			optional dpaa	\
-	no-depend compile-with "${DPAA_COMPILE_CMD}"
-contrib/ncsw/Peripherals/FM/SP/fm_sp.c			optional dpaa	\
-	no-depend compile-with "${DPAA_COMPILE_CMD}"
-contrib/ncsw/Peripherals/FM/Rtc/fm_rtc.c		optional dpaa	\
-	no-depend compile-with "${DPAA_COMPILE_CMD}"
-contrib/ncsw/Peripherals/FM/Rtc/fman_rtc.c		optional dpaa	\
-	no-depend compile-with "${DPAA_COMPILE_CMD}"
-contrib/ncsw/Peripherals/FM/Port/fman_port.c		optional dpaa	\
-	no-depend compile-with "${DPAA_COMPILE_CMD}"
-contrib/ncsw/Peripherals/FM/Port/fm_port.c		optional dpaa	\
-	no-depend compile-with "${DPAA_COMPILE_CMD}"
-contrib/ncsw/Peripherals/FM/Port/fm_port_im.c		optional dpaa	\
-	no-depend compile-with "${DPAA_COMPILE_CMD}"
-contrib/ncsw/Peripherals/FM/Pcd/fm_cc.c			optional dpaa	\
-	no-depend compile-with "${DPAA_COMPILE_CMD}"
-contrib/ncsw/Peripherals/FM/Pcd/fm_kg.c			optional dpaa	\
-	no-depend compile-with "${DPAA_COMPILE_CMD}"
-contrib/ncsw/Peripherals/FM/Pcd/fman_kg.c		optional dpaa	\
-	no-depend compile-with "${DPAA_COMPILE_CMD}"
-contrib/ncsw/Peripherals/FM/Pcd/fm_manip.c		optional dpaa	\
-	no-depend compile-with "${DPAA_COMPILE_CMD}"
-contrib/ncsw/Peripherals/FM/Pcd/fm_pcd.c		optional dpaa	\
-	no-depend compile-with "${DPAA_COMPILE_CMD}"
-contrib/ncsw/Peripherals/FM/Pcd/fm_plcr.c		optional dpaa	\
-	no-depend compile-with "${DPAA_COMPILE_CMD}"
-contrib/ncsw/Peripherals/FM/Pcd/fm_prs.c		optional dpaa	\
-	no-depend compile-with "${DPAA_COMPILE_CMD}"
-contrib/ncsw/Peripherals/FM/Pcd/fman_prs.c		optional dpaa	\
-	no-depend compile-with "${DPAA_COMPILE_CMD}"
-contrib/ncsw/Peripherals/FM/MAC/dtsec.c			optional dpaa	\
-	no-depend compile-with "${DPAA_COMPILE_CMD}"
-contrib/ncsw/Peripherals/FM/MAC/dtsec_mii_acc.c		optional dpaa	\
-	no-depend compile-with "${DPAA_COMPILE_CMD}"
-contrib/ncsw/Peripherals/FM/MAC/fman_dtsec.c		optional dpaa	\
-	no-depend compile-with "${DPAA_COMPILE_CMD}"
-contrib/ncsw/Peripherals/FM/MAC/fman_dtsec_mii_acc.c	optional dpaa	\
-	no-depend compile-with "${DPAA_COMPILE_CMD}"
-contrib/ncsw/Peripherals/FM/MAC/fm_mac.c		optional dpaa	\
-	no-depend compile-with "${DPAA_COMPILE_CMD}"
-contrib/ncsw/Peripherals/FM/MAC/fman_dtsec.c		optional dpaa	\
-	no-depend compile-with "${DPAA_COMPILE_CMD}"
-contrib/ncsw/Peripherals/FM/MAC/tgec.c			optional dpaa	\
-	no-depend compile-with "${DPAA_COMPILE_CMD}"
-contrib/ncsw/Peripherals/FM/MAC/tgec_mii_acc.c		optional dpaa	\
-	no-depend compile-with "${DPAA_COMPILE_CMD}"
-contrib/ncsw/Peripherals/FM/MAC/fman_tgec.c		optional dpaa	\
-	no-depend compile-with "${DPAA_COMPILE_CMD}"
-contrib/ncsw/Peripherals/FM/HC/hc.c			optional dpaa	\
-	no-depend compile-with "${DPAA_COMPILE_CMD}"
-contrib/ncsw/Peripherals/FM/fm_muram.c			optional dpaa	\
-	no-depend compile-with "${DPAA_COMPILE_CMD}"
-contrib/ncsw/Peripherals/FM/fm_ncsw.c			optional dpaa	\
-	no-depend compile-with "${DPAA_COMPILE_CMD}"
-contrib/ncsw/Peripherals/FM/fman_ncsw.c			optional dpaa	\
-	no-depend compile-with "${DPAA_COMPILE_CMD} ${NO_WMISLEADING_INDENTATION}"
-contrib/ncsw/Peripherals/QM/qm.c			optional dpaa	\
-	no-depend compile-with "${DPAA_COMPILE_CMD}"
-contrib/ncsw/Peripherals/QM/qm_portal_fqr.c		optional dpaa	\
-	no-depend compile-with "${DPAA_COMPILE_CMD}"
-contrib/ncsw/user/env/stdlib.c				optional dpaa	\
-	no-depend compile-with "${DPAA_COMPILE_CMD}"
-contrib/ncsw/user/env/xx.c				optional dpaa	\
-	no-depend compile-with "${DPAA_COMPILE_CMD}"
-contrib/ncsw/user/env/core.c				optional dpaa	\
-	no-depend compile-with "${DPAA_COMPILE_CMD}"
-
-# FreeBSD Wrappers
-dev/dpaa/portals_common.c			optional dpaa		\
-	no-depend compile-with "${DPAA_COMPILE_CMD}"
-dev/dpaa/bman_portals.c				optional dpaa fdt	\
-	no-depend compile-with "${DPAA_COMPILE_CMD}"
-dev/dpaa/bman.c					optional dpaa		\
-	no-depend compile-with "${DPAA_COMPILE_CMD}"
-dev/dpaa/bman_fdt.c				optional dpaa fdt	\
-	no-depend compile-with "${DPAA_COMPILE_CMD}"
-dev/dpaa/qman_portals.c				optional dpaa fdt	\
-	no-depend compile-with "${DPAA_COMPILE_CMD}"
-dev/dpaa/qman.c					optional dpaa		\
-	no-depend compile-with "${DPAA_COMPILE_CMD}"
-dev/dpaa/qman_fdt.c				optional dpaa fdt	\
-	no-depend compile-with "${DPAA_COMPILE_CMD}"
-dev/dpaa/fman.c				optional dpaa fdt			\
-	no-depend compile-with "${DPAA_COMPILE_CMD}"
-dev/dpaa/fman_mdio.c			optional dpaa fdt			\
-	no-depend compile-with "${DPAA_COMPILE_CMD}"
-dev/dpaa/fman_fdt.c				optional dpaa fdt			\
-	no-depend compile-with "${DPAA_COMPILE_CMD}"
-dev/dpaa/if_dtsec.c				optional dpaa			\
-	no-depend compile-with "${DPAA_COMPILE_CMD}"
-dev/dpaa/if_dtsec_im.c			optional dpaa			\
-	no-depend compile-with "${DPAA_COMPILE_CMD}"
-dev/dpaa/if_dtsec_rm.c			optional dpaa			\
-	no-depend compile-with "${DPAA_COMPILE_CMD}"
-dev/dpaa/if_dtsec_fdt.c			optional dpaa			\
-	no-depend compile-with "${DPAA_COMPILE_CMD}"
-
-# Examples
-dev/dpaa/bman-example.c			optional bman_example dpaa	\
-	no-depend compile-with "${DPAA_COMPILE_CMD}"
-dev/dpaa/qman-example.c			optional qman_example dpaa	\
-	no-depend compile-with "${DPAA_COMPILE_CMD}"