diff --git a/sys/powerpc/conf/MPC85XX b/sys/powerpc/conf/MPC85XX
index ed0dd5f8e587..e1978ba3e831 100644
--- a/sys/powerpc/conf/MPC85XX
+++ b/sys/powerpc/conf/MPC85XX
@@ -1,125 +1,126 @@
 #
 # Custom kernel for Freescale MPC85XX development boards like the CDS etc.
 #
 # $FreeBSD$
 #
 
 cpu		BOOKE
 cpu		BOOKE_E500
 ident		MPC85XX
 
 machine		powerpc	powerpc
 
 include 	"dpaa/config.dpaa"
 makeoptions	DEBUG=-g		#Build kernel with gdb(1) debug symbols
 makeoptions	WITH_CTF=1
 
 options 	FPU_EMU
+options 	MAXCPU=32
 
 options 	_KPOSIX_PRIORITY_SCHEDULING
 options 	ALT_BREAK_TO_DEBUGGER
 options 	BREAK_TO_DEBUGGER
 options 	BOOTP
 options 	BOOTP_NFSROOT
 #options 	BOOTP_NFSV3
 options 	CD9660
 options 	COMPAT_43
 options 	DDB
 #options 	DEADLKRES
 options 	DEVICE_POLLING
 #options 	DIAGNOSTIC
 options 	FDT
 #makeoptions	FDT_DTS_FILE=mpc8555cds.dts
 options 	FFS
 options 	GDB
 options 	GEOM_PART_GPT
 options         GEOM_LABEL              # Provides labelization
 options 	INET
 options 	INET6
 options 	TCP_HHOOK		# hhook(9) framework for TCP
 options 	INVARIANTS
 options 	INVARIANT_SUPPORT
 options 	KDB
 options 	KTRACE
 options 	MD_ROOT
 options 	MPC85XX
 options 	MSDOSFS
 options 	NFS_ROOT
 options 	NFSCL
 options 	NFSLOCKD
 options 	PRINTF_BUFR_SIZE=128	# Prevent printf output being interspersed.
 options 	PROCFS
 options 	PSEUDOFS
 options 	SCHED_ULE
 options 	CAPABILITIES
 options 	CAPABILITY_MODE
 options 	SMP
 options 	SYSVMSG
 options 	SYSVSEM
 options 	SYSVSHM
 options 	WITNESS
 options 	WITNESS_SKIPSPIN
 options 	COMPAT_FREEBSD10
 options 	COMPAT_FREEBSD11
 options 	COMPAT_FREEBSD12
 options 	COMPAT_FREEBSD13
 options 	HWPMC_HOOKS
 options 	KDTRACE_HOOKS		# Kernel DTrace hooks
 options 	DDB_CTF			# Kernel ELF linker loads CTF data
 
 device		ata
 device		bpf
 device		cfi
 device  	cpufreq
 device		crypto
 device		cryptodev
 device		da
 device  	ds1307
 device		ds1553
 device		iflib
 device		em
 device		alc
 device		ether
 device		fxp
 device  	gpio
 device  	gpiopower
 device		iic
 device		iicbus
 #device		isa
 device		loop
 device		md
 device		miibus
 device  	mmc
 device  	mmcsd
 device		pass
 device		pci
 device		quicc
 #device		rl
 device		scbus
 device		scc
 device  	sdhci
 device		sec
 device  	spibus
 device  	spigen
 device		tsec
 device  	dpaa
 device		tuntap
 device		uart
 options 	USB_DEBUG	# enable debug msgs
 #device		uhci
 device		ehci
 device  	ukbd
 device  	ums
 device		umass
 device		usb
 device		vlan
 
 # P1022 DIU
 device  	diu
 device  	videomode
 device  	vt
 device  	fbd
 
 # HID support
 options 	HID_DEBUG	# enable debug msgs
 device		hid		# Generic HID support
diff --git a/sys/powerpc/conf/QORIQ64 b/sys/powerpc/conf/QORIQ64
index 5db473c5393b..e1ef972d88eb 100644
--- a/sys/powerpc/conf/QORIQ64
+++ b/sys/powerpc/conf/QORIQ64
@@ -1,126 +1,127 @@
 #
 # Custom kernel for Freescale QorIQ (P5xxx, Txxxx) based boards, like
 # AmigaOne X5000
 #
 # $FreeBSD$
 #
 
 cpu		BOOKE
 cpu		BOOKE_E500
 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"
 
 options 	FPU_EMU
+options 	MAXCPU=32
 
 options 	_KPOSIX_PRIORITY_SCHEDULING
 options 	ALT_BREAK_TO_DEBUGGER
 options 	BREAK_TO_DEBUGGER
 options 	BOOTP
 options 	BOOTP_NFSROOT
 #options 	BOOTP_NFSV3
 options 	CD9660
 #options 	COMPAT_43
 options 	COMPAT_FREEBSD32	#Compatible with FreeBSD/powerpc binaries
 options 	DDB
 #options 	DEADLKRES
 options 	DEVICE_POLLING
 #options 	DIAGNOSTIC
 options 	FDT
 #makeoptions	FDT_DTS_FILE=mpc8555cds.dts
 options 	FFS			#Berkeley Fast Filesystem
 options 	SOFTUPDATES		#Enable FFS soft updates support
 options 	UFS_ACL			#Support for access control lists
 options 	UFS_DIRHASH		#Improve performance on big directories
 options 	UFS_GJOURNAL		#Enable gjournal-based UFS journaling
 options 	QUOTA			#Enable disk quotas for UFS
 options 	GDB
 options 	GEOM_PART_GPT
 options 	GEOM_LABEL		#Provides labelization
 options 	INET
 options 	INET6
 options 	TCP_HHOOK		# hhook(9) framework for TCP
 options 	INVARIANTS
 options 	INVARIANT_SUPPORT
 options 	KDB
 options 	KDB_TRACE		# Print a stack trace for a panic.
 options 	KTRACE
 options 	MD_ROOT
 options 	MPC85XX
 options 	MSDOSFS
 options 	NFS_ROOT
 options 	NFSCL
 options 	NFSLOCKD
 options 	PRINTF_BUFR_SIZE=128	# Prevent printf output being interspersed.
 options 	PROCFS
 options 	PSEUDOFS
 options 	SCHED_ULE
 options 	CAPABILITIES
 options 	CAPABILITY_MODE
 options 	SMP
 options 	STACK			#stack(9) support
 options 	SYSVMSG
 options 	SYSVSEM
 options 	SYSVSHM
 options 	WITNESS
 options 	WITNESS_SKIPSPIN
 options 	HWPMC_HOOKS
 options 	KDTRACE_HOOKS		# Kernel DTrace hooks
 options 	DDB_CTF			# Kernel ELF linker loads CTF data
 
 device		ata
 device		bpf
 device		cfi
 device		crypto
 device		cryptodev
 device		da
 device  	ds1307
 device		ds1553
 device		iflib
 device		em
 device		alc
 device  	dpaa
 device		ether
 device		fxp
 device  	gpio
 device  	gpiopower
 device		iic
 device		iicbus
 #device		isa
 device		loop
 device		md
 device		miibus
 device  	mmc
 device  	mmcsd
 device		pass
 device		pci
 #device		rl
 device		scbus
 device		scc
 device  	sdhci
 device  	spibus
 device  	spigen
 device		tuntap
 device		uart
 options 	USB_DEBUG	# enable debug msgs
 #device		uhci
 device		ehci
 device		umass
 device		usb
 device		vlan
 
 # Desktop related
 device  	vt
 device  	fbd
 options 	KBD_INSTALL_CDEV
 device  	ukbd
 device  	ums
 
 # HID support
 options 	HID_DEBUG	# enable debug msgs
 device		hid		# Generic HID support