Index: head/sys/arm/allwinner/a20/files.a20
===================================================================
--- head/sys/arm/allwinner/a20/files.a20	(revision 280825)
+++ head/sys/arm/allwinner/a20/files.a20	(revision 280826)
@@ -1,21 +1,20 @@
 # $FreeBSD$
 kern/kern_clocksource.c 		standard
 
 arm/arm/bus_space_asm_generic.S 	standard
 arm/arm/bus_space_generic.c		standard
-arm/arm/cpufunc_asm_arm11.S		standard
 arm/arm/cpufunc_asm_armv7.S		standard
 arm/arm/gic.c				standard
 
 arm/allwinner/a20/a20_cpu_cfg.c 	standard
 arm/allwinner/a10_clk.c 		standard
 arm/allwinner/a10_sramc.c		standard
 arm/allwinner/a10_gpio.c		optional	gpio
 arm/allwinner/a10_ehci.c		optional	ehci
 arm/allwinner/if_emac.c			optional	emac
 arm/allwinner/a10_wdog.c		standard
 arm/allwinner/timer.c			standard
 arm/arm/bus_space_base.c		standard
 arm/allwinner/a10_common.c		standard
 arm/allwinner/a10_machdep.c		standard
 arm/allwinner/a20/a20_mp.c		optional	smp
Index: head/sys/arm/allwinner/files.a10
===================================================================
--- head/sys/arm/allwinner/files.a10	(revision 280825)
+++ head/sys/arm/allwinner/files.a10	(revision 280826)
@@ -1,21 +1,20 @@
 # $FreeBSD$
 kern/kern_clocksource.c			standard
 
 arm/arm/bus_space_asm_generic.S		standard
 arm/arm/bus_space_generic.c		standard
-arm/arm/cpufunc_asm_arm11.S		standard
 arm/arm/cpufunc_asm_armv7.S		standard
 
 arm/allwinner/a10_clk.c			standard
 arm/allwinner/a10_common.c		standard
 arm/allwinner/a10_gpio.c		optional	gpio
 arm/allwinner/a10_ehci.c		optional	ehci
 arm/allwinner/a10_machdep.c		standard
 arm/allwinner/a10_sramc.c		standard
 arm/allwinner/a10_wdog.c		standard
 arm/allwinner/a20/a20_cpu_cfg.c 	standard
 arm/allwinner/aintc.c			standard
 arm/allwinner/if_emac.c			optional	emac
 arm/allwinner/timer.c			standard
 arm/arm/bus_space_base.c		standard
 #arm/allwinner/console.c		standard
Index: head/sys/arm/altera/socfpga/files.socfpga
===================================================================
--- head/sys/arm/altera/socfpga/files.socfpga	(revision 280825)
+++ head/sys/arm/altera/socfpga/files.socfpga	(revision 280826)
@@ -1,30 +1,29 @@
 # $FreeBSD$
 
 kern/kern_clocksource.c				standard
 
 arm/arm/bus_space_generic.c			standard
 arm/arm/bus_space_asm_generic.S			standard
-arm/arm/cpufunc_asm_arm11.S			standard
 arm/arm/cpufunc_asm_armv7.S			standard
 
 arm/arm/bus_space_base.c			standard
 arm/arm/gic.c					standard
 arm/arm/mpcore_timer.c				standard
 
 arm/altera/socfpga/socfpga_common.c		standard
 arm/altera/socfpga/socfpga_machdep.c		standard
 arm/altera/socfpga/socfpga_manager.c		standard
 arm/altera/socfpga/socfpga_rstmgr.c		standard
 arm/altera/socfpga/socfpga_mp.c			optional smp
 arm/altera/socfpga/socfpga_gpio.c		optional gpio
 
 dev/dwc/if_dwc.c				optional dwc
 dev/mii/micphy.c				optional micphy
 dev/mmc/host/dwmmc.c				optional dwmmc
 
 # BERI specific
 dev/beri/beri_ring.c				optional beri_ring
 dev/beri/beri_mem.c				optional beri_mem
 dev/beri/virtio/virtio.c			optional beri_vtblk | vtbe
 dev/beri/virtio/virtio_block.c			optional beri_vtblk
 dev/beri/virtio/network/if_vtbe.c		optional vtbe
Index: head/sys/arm/freescale/imx/files.imx51
===================================================================
--- head/sys/arm/freescale/imx/files.imx51	(revision 280825)
+++ head/sys/arm/freescale/imx/files.imx51	(revision 280826)
@@ -1,51 +1,50 @@
 # $FreeBSD$
 arm/arm/bus_space_asm_generic.S		standard
 arm/arm/bus_space_generic.c		standard
-arm/arm/cpufunc_asm_arm11.S		standard
 arm/arm/cpufunc_asm_armv7.S		standard
 kern/kern_clocksource.c			standard
 
 # Init
 arm/freescale/imx/imx_common.c		standard
 arm/freescale/imx/imx_machdep.c		standard
 arm/freescale/imx/imx51_machdep.c	standard
 arm/arm/bus_space_base.c		standard
 
 # Dummy serial console
 #arm/freescale/imx/console.c		standard
 
 # TrustZone Interrupt Controller
 arm/freescale/imx/tzic.c		standard
 
 # IOMUX - external pins multiplexor
 arm/freescale/imx/imx_iomux.c		standard
 
 # GPIO
 arm/freescale/imx/imx_gpio.c		optional gpio
 
 # Generic Periodic Timer
 arm/freescale/imx/imx_gpt.c		standard
 
 # Clock Configuration Manager
 arm/freescale/imx/imx51_ccm.c		standard
 
 # i.MX5xx PATA controller
 dev/ata/chipsets/ata-fsl.c		optional imxata
 
 # UART driver
 dev/uart/uart_dev_imx.c			optional uart
 
 # USB OH3 controller (1 OTG, 3 EHCI)
 arm/freescale/imx/imx_nop_usbphy.c	optional ehci
 dev/usb/controller/ehci_imx.c		optional ehci
 
 # Watchdog
 arm/freescale/imx/imx_wdog.c		optional imxwdt
 
 # i2c
 arm/freescale/imx/imx_i2c.c		optional fsliic
 
 # IPU - Image Processing Unit (frame buffer also)
 arm/freescale/imx/imx51_ipuv3.c		optional sc
 arm/freescale/imx/imx51_ipuv3_fbd.c	optional vt
 dev/vt/hw/fb/vt_early_fb.c		optional vt
Index: head/sys/arm/freescale/imx/files.imx53
===================================================================
--- head/sys/arm/freescale/imx/files.imx53	(revision 280825)
+++ head/sys/arm/freescale/imx/files.imx53	(revision 280826)
@@ -1,58 +1,57 @@
 # $FreeBSD$
 arm/arm/bus_space_asm_generic.S		standard
 arm/arm/bus_space_generic.c		standard
-arm/arm/cpufunc_asm_arm11.S		standard
 arm/arm/cpufunc_asm_armv7.S		standard
 kern/kern_clocksource.c			standard
 
 # Init
 arm/freescale/imx/imx_common.c		standard
 arm/freescale/imx/imx_machdep.c		standard
 arm/freescale/imx/imx53_machdep.c	standard
 arm/arm/bus_space_base.c		standard
 
 # Special serial console for debuging early boot code
 #arm/freescale/imx/console.c		standard
 
 # UART driver (includes serial console support)
 dev/uart/uart_dev_imx.c 		optional uart
 
 # TrustZone Interrupt Controller
 arm/freescale/imx/tzic.c		standard
 
 # IOMUX - external pins multiplexor
 arm/freescale/imx/imx_iomux.c		standard
 
 # GPIO
 arm/freescale/imx/imx_gpio.c		optional gpio
 
 # Generic Periodic Timer
 arm/freescale/imx/imx_gpt.c		standard
 
 # Clock Configuration Manager
 arm/freescale/imx/imx51_ccm.c		standard
 
 # i.MX5xx PATA controller
 dev/ata/chipsets/ata-fsl.c		optional imxata
 
 # SDHCI/MMC
 arm/freescale/imx/imx_sdhci.c		optional sdhci
 
 # USB OH3 controller (1 OTG, 3 EHCI)
 arm/freescale/imx/imx_nop_usbphy.c	optional ehci
 dev/usb/controller/ehci_imx.c		optional ehci
 
 # Watchdog
 arm/freescale/imx/imx_wdog.c		optional imxwdt
 
 # i2c
 arm/freescale/imx/imx_i2c.c		optional fsliic
 
 # IPU - Image Processing Unit (frame buffer also)
 arm/freescale/imx/imx51_ipuv3.c		optional sc
 arm/freescale/imx/imx51_ipuv3_fbd.c	optional vt
 dev/vt/hw/fb/vt_early_fb.c		optional vt
 
 # Fast Ethernet Controller
 dev/ffec/if_ffec.c 			optional ffec
 
Index: head/sys/arm/freescale/imx/files.imx6
===================================================================
--- head/sys/arm/freescale/imx/files.imx6	(revision 280825)
+++ head/sys/arm/freescale/imx/files.imx6	(revision 280826)
@@ -1,72 +1,71 @@
 # $FreeBSD$
 
 #
 # Standard ARM support.
 #
 arm/arm/bus_space_asm_generic.S		standard
 arm/arm/bus_space_generic.c		standard
-arm/arm/cpufunc_asm_arm11.S		standard
 arm/arm/cpufunc_asm_armv7.S		standard
 kern/kern_clocksource.c			standard
 
 #
 # Standard imx6 devices and support.
 #
 arm/arm/gic.c				standard
 arm/arm/pl310.c				standard
 arm/arm/bus_space_base.c		standard
 arm/arm/mpcore_timer.c			standard
 arm/freescale/fsl_ocotp.c		standard
 arm/freescale/imx/imx6_anatop.c		standard
 arm/freescale/imx/imx6_ccm.c		standard
 arm/freescale/imx/imx6_machdep.c	standard
 arm/freescale/imx/imx6_mp.c		optional smp
 arm/freescale/imx/imx6_pl310.c		standard
 arm/freescale/imx/imx_iomux.c		standard
 arm/freescale/imx/imx_machdep.c		standard
 arm/freescale/imx/imx_gpt.c		standard
 arm/freescale/imx/imx_gpio.c		optional gpio
 arm/freescale/imx/imx_i2c.c		optional fsliic
 arm/freescale/imx/imx6_sdma.c		optional sdma
 arm/freescale/imx/imx6_audmux.c		optional sound
 arm/freescale/imx/imx6_ssi.c		optional sound
 
 #
 # Optional devices.
 #
 arm/freescale/imx/imx_sdhci.c		optional sdhci
 
 arm/freescale/imx/imx_wdog.c		optional imxwdt
 
 dev/ffec/if_ffec.c			optional ffec
 
 dev/uart/uart_dev_imx.c			optional uart
 
 dev/usb/controller/ehci_imx.c		optional ehci
 arm/freescale/imx/imx6_usbphy.c		optional ehci
 
 #
 # Low-level serial console for debugging early kernel startup.
 #
 #arm/freescale/imx/console.c  		standard
 
 #
 # Not ready yet...
 #
 #arm/freescale/imx/imx51_ipuv3.c  	optional sc
 
 # SDMA firmware
 sdma_fw.c				optional sdma_fw		\
 	compile-with	"${AWK} -f $S/tools/fw_stub.awk sdma-imx6q-to1.bin:sdma_fw -msdma -c${.TARGET}" \
 	no-implicit-rule before-depend local				\
 	clean		"sdma_fw.c"
 sdma-imx6q-to1.fwo			optional sdma_fw		\
 	dependency	"sdma-imx6q-to1.bin"				\
 	compile-with	"${LD} -b binary -d -warn-common -r -d -o ${.TARGET} sdma-imx6q-to1.bin" \
 	no-implicit-rule						\
 	clean		"sdma-imx6q-to1.fwo"
 sdma-imx6q-to1.bin			optional sdma_fw		\
 	dependency	"$S/contrib/dev/imx/sdma-imx6q-to1.bin.uu"	\
 	compile-with	"uudecode < $S/contrib/dev/imx/sdma-imx6q-to1.bin.uu" \
 	no-obj no-implicit-rule						\
 	clean		"sdma-imx6q-to1.bin"
Index: head/sys/arm/freescale/vybrid/files.vybrid
===================================================================
--- head/sys/arm/freescale/vybrid/files.vybrid	(revision 280825)
+++ head/sys/arm/freescale/vybrid/files.vybrid	(revision 280826)
@@ -1,34 +1,33 @@
 # $FreeBSD$
 
 kern/kern_clocksource.c				standard
 
 arm/arm/bus_space_generic.c			standard
 arm/arm/bus_space_asm_generic.S			standard
-arm/arm/cpufunc_asm_arm11.S			standard
 arm/arm/cpufunc_asm_armv7.S			standard
 
 arm/arm/bus_space_base.c			standard
 arm/arm/gic.c					standard
 arm/arm/mpcore_timer.c				standard
 
 arm/freescale/vybrid/vf_machdep.c		standard
 arm/freescale/vybrid/vf_common.c		standard
 arm/freescale/vybrid/vf_ccm.c			standard
 arm/freescale/vybrid/vf_anadig.c		standard
 arm/freescale/vybrid/vf_iomuxc.c		standard
 arm/freescale/vybrid/vf_mscm.c			standard
 arm/freescale/vybrid/vf_src.c			standard
 arm/freescale/vybrid/vf_edma.c			standard
 arm/freescale/vybrid/vf_dmamux.c		standard
 arm/freescale/vybrid/vf_port.c			standard
 arm/freescale/vybrid/vf_adc.c			standard
 arm/freescale/vybrid/vf_i2c.c			optional	iicbus
 arm/freescale/vybrid/vf_tcon.c			optional	vt
 arm/freescale/vybrid/vf_dcu4.c			optional	vt
 arm/freescale/vybrid/vf_nfc.c			optional	nand
 arm/freescale/vybrid/vf_ehci.c			optional	ehci
 arm/freescale/vybrid/vf_gpio.c			optional	gpio
 arm/freescale/vybrid/vf_uart.c			optional	uart
 arm/freescale/vybrid/vf_sai.c			optional	sound
 arm/freescale/vybrid/vf_spi.c			optional	vf_spi
 dev/ffec/if_ffec.c				optional	ffec
Index: head/sys/arm/rockchip/files.rk30xx
===================================================================
--- head/sys/arm/rockchip/files.rk30xx	(revision 280825)
+++ head/sys/arm/rockchip/files.rk30xx	(revision 280826)
@@ -1,21 +1,20 @@
 # $FreeBSD$
 kern/kern_clocksource.c			standard
 
 arm/arm/bus_space_asm_generic.S		standard
 arm/arm/bus_space_generic.c		standard
-arm/arm/cpufunc_asm_arm11.S		standard
 arm/arm/cpufunc_asm_armv7.S		standard
 
 arm/arm/gic.c				standard
 arm/arm/mpcore_timer.c			standard
 
 arm/arm/bus_space_base.c		standard
 arm/rockchip/rk30xx_common.c		standard
 arm/rockchip/rk30xx_machdep.c		standard
 arm/rockchip/rk30xx_pmu.c		standard
 arm/rockchip/rk30xx_grf.c		standard
 arm/rockchip/rk30xx_wdog.c		standard
 arm/rockchip/rk30xx_gpio.c		optional	gpio
 arm/rockchip/rk30xx_mp.c		optional	smp
 
 dev/mmc/host/dwmmc.c			optional	dwmmc
Index: head/sys/arm/samsung/exynos/files.exynos5
===================================================================
--- head/sys/arm/samsung/exynos/files.exynos5	(revision 280825)
+++ head/sys/arm/samsung/exynos/files.exynos5	(revision 280826)
@@ -1,34 +1,33 @@
 # $FreeBSD$
 
 kern/kern_clocksource.c				standard
 
 arm/arm/bus_space_generic.c			standard
 arm/arm/bus_space_asm_generic.S			standard
-arm/arm/cpufunc_asm_arm11.S			standard
 arm/arm/cpufunc_asm_armv7.S			standard
 
 arm/arm/bus_space_base.c			standard
 arm/arm/gic.c					standard
 arm/arm/generic_timer.c				standard
 
 arm/samsung/exynos/exynos5_mct.c		standard
 arm/samsung/exynos/exynos5_mp.c			optional	smp
 arm/samsung/exynos/exynos5_common.c		standard
 arm/samsung/exynos/exynos5_machdep.c		standard
 arm/samsung/exynos/exynos5_combiner.c		standard
 arm/samsung/exynos/exynos5_pad.c		optional	gpio
 arm/samsung/exynos/exynos_uart.c		optional	uart
 arm/samsung/exynos/exynos5_ehci.c		optional	ehci
 arm/samsung/exynos/exynos5_xhci.c		optional	xhci
 arm/samsung/exynos/exynos5_fimd.c		optional	vt
 arm/samsung/exynos/exynos5_i2c.c		optional	iicbus
 arm/samsung/exynos/exynos5_usb_phy.c		standard
 arm/samsung/exynos/exynos5_pmu.c		standard
 arm/samsung/exynos/exynos5_spi.c		optional	exynos_spi
 
 # chromebook drivers
 arm/samsung/exynos/chrome_ec.c			optional	chrome_ec_i2c
 arm/samsung/exynos/chrome_ec_spi.c		optional	chrome_ec_spi
 arm/samsung/exynos/chrome_kb.c			optional	chrome_kb
 
 dev/mmc/host/dwmmc.c				optional	dwmmc
Index: head/sys/arm/ti/files.ti
===================================================================
--- head/sys/arm/ti/files.ti	(revision 280825)
+++ head/sys/arm/ti/files.ti	(revision 280826)
@@ -1,29 +1,28 @@
 #$FreeBSD$
 
 kern/kern_clocksource.c				standard
 
 arm/arm/bus_space_base.c			standard
 arm/arm/bus_space_generic.c			standard
 arm/arm/bus_space_asm_generic.S			standard
-arm/arm/cpufunc_asm_arm11.S			standard
 arm/arm/cpufunc_asm_armv7.S			standard
 arm/arm/pmu.c					optional	hwpmc
 
 arm/ti/ti_common.c				standard
 arm/ti/ti_cpuid.c				standard
 arm/ti/ti_machdep.c				standard
 arm/ti/ti_prcm.c				standard
 arm/ti/ti_scm.c					standard
 dev/mbox/mbox_if.m				optional	ti_mbox
 arm/ti/ti_mbox.c				optional	ti_mbox
 arm/ti/ti_pruss.c				optional	ti_pruss
 arm/ti/ti_wdt.c					optional	ti_wdt
 arm/ti/ti_adc.c					optional	ti_adc
 arm/ti/ti_gpio.c				optional	gpio
 arm/ti/ti_gpio_if.m				optional	gpio
 arm/ti/ti_i2c.c					optional	ti_i2c
 arm/ti/ti_sdhci.c	 			optional	sdhci
 
 dev/uart/uart_dev_ti8250.c			optional	uart
 dev/uart/uart_dev_ns8250.c			optional	uart
 
Index: head/sys/arm/xilinx/files.zynq7
===================================================================
--- head/sys/arm/xilinx/files.zynq7	(revision 280825)
+++ head/sys/arm/xilinx/files.zynq7	(revision 280826)
@@ -1,29 +1,28 @@
 #
 # files.zynq7
 #
 # $FreeBSD$
 
 kern/kern_clocksource.c				standard
 
 arm/arm/bus_space_base.c			standard
 arm/arm/bus_space_generic.c			standard
 arm/arm/bus_space_asm_generic.S			standard
-arm/arm/cpufunc_asm_arm11.S			standard
 arm/arm/cpufunc_asm_armv7.S			standard
 
 arm/arm/gic.c					standard
 arm/arm/mpcore_timer.c				standard
 arm/arm/pl310.c					standard
 
 arm/xilinx/zy7_machdep.c			standard
 arm/xilinx/zy7_l2cache.c			standard
 arm/xilinx/zy7_slcr.c				standard
 arm/xilinx/zy7_devcfg.c				standard
 arm/xilinx/zy7_mp.c				optional smp
 
 dev/cadence/if_cgem.c				optional cgem
 dev/sdhci/sdhci_fdt.c				optional sdhci
 arm/xilinx/zy7_ehci.c 				optional ehci
 arm/xilinx/uart_dev_cdnc.c			optional uart
 arm/xilinx/zy7_gpio.c				optional gpio