Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 29 Mar 2015 22:43:40 +0000 (UTC)
From:      Andrew Turner <andrew@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r280831 - in head/sys: arm/allwinner arm/allwinner/a20 arm/altera/socfpga arm/at91 arm/broadcom/bcm2835 arm/cavium/cns11xx arm/freescale/imx arm/freescale/vybrid arm/lpc arm/mv arm/rock...
Message-ID:  <201503292243.t2TMhemK081667@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: andrew
Date: Sun Mar 29 22:43:39 2015
New Revision: 280831
URL: https://svnweb.freebsd.org/changeset/base/280831

Log:
  Build the cpufunc_asm_* files based on the cpu type, not which config file
  we happen to be building.

Modified:
  head/sys/arm/allwinner/a20/files.a20
  head/sys/arm/allwinner/files.a10
  head/sys/arm/altera/socfpga/files.socfpga
  head/sys/arm/at91/files.at91
  head/sys/arm/broadcom/bcm2835/files.bcm2835
  head/sys/arm/broadcom/bcm2835/files.bcm2836
  head/sys/arm/broadcom/bcm2835/files.bcm283x
  head/sys/arm/cavium/cns11xx/files.econa
  head/sys/arm/freescale/imx/files.imx51
  head/sys/arm/freescale/imx/files.imx53
  head/sys/arm/freescale/imx/files.imx6
  head/sys/arm/freescale/vybrid/files.vybrid
  head/sys/arm/lpc/files.lpc
  head/sys/arm/mv/files.mv
  head/sys/arm/rockchip/files.rk30xx
  head/sys/arm/samsung/exynos/files.exynos5
  head/sys/arm/samsung/s3c2xx0/files.s3c2xx0
  head/sys/arm/ti/files.ti
  head/sys/arm/versatile/files.versatile
  head/sys/arm/xilinx/files.zynq7
  head/sys/arm/xscale/i80321/files.i80219
  head/sys/arm/xscale/i80321/files.i80321
  head/sys/arm/xscale/i8134x/files.i81342
  head/sys/arm/xscale/ixp425/files.ixp425
  head/sys/arm/xscale/pxa/files.pxa
  head/sys/conf/files.arm

Modified: head/sys/arm/allwinner/a20/files.a20
==============================================================================
--- head/sys/arm/allwinner/a20/files.a20	Sun Mar 29 22:00:24 2015	(r280830)
+++ head/sys/arm/allwinner/a20/files.a20	Sun Mar 29 22:43:39 2015	(r280831)
@@ -3,7 +3,6 @@ kern/kern_clocksource.c 		standard
 
 arm/arm/bus_space_asm_generic.S 	standard
 arm/arm/bus_space_generic.c		standard
-arm/arm/cpufunc_asm_armv7.S		standard
 arm/arm/gic.c				standard
 
 arm/allwinner/a20/a20_cpu_cfg.c 	standard

Modified: head/sys/arm/allwinner/files.a10
==============================================================================
--- head/sys/arm/allwinner/files.a10	Sun Mar 29 22:00:24 2015	(r280830)
+++ head/sys/arm/allwinner/files.a10	Sun Mar 29 22:43:39 2015	(r280831)
@@ -3,7 +3,6 @@ kern/kern_clocksource.c			standard
 
 arm/arm/bus_space_asm_generic.S		standard
 arm/arm/bus_space_generic.c		standard
-arm/arm/cpufunc_asm_armv7.S		standard
 
 arm/allwinner/a10_clk.c			standard
 arm/allwinner/a10_common.c		standard

Modified: head/sys/arm/altera/socfpga/files.socfpga
==============================================================================
--- head/sys/arm/altera/socfpga/files.socfpga	Sun Mar 29 22:00:24 2015	(r280830)
+++ head/sys/arm/altera/socfpga/files.socfpga	Sun Mar 29 22:43:39 2015	(r280831)
@@ -4,7 +4,6 @@ kern/kern_clocksource.c				standard
 
 arm/arm/bus_space_generic.c			standard
 arm/arm/bus_space_asm_generic.S			standard
-arm/arm/cpufunc_asm_armv7.S			standard
 
 arm/arm/bus_space_base.c			standard
 arm/arm/gic.c					standard

Modified: head/sys/arm/at91/files.at91
==============================================================================
--- head/sys/arm/at91/files.at91	Sun Mar 29 22:00:24 2015	(r280830)
+++ head/sys/arm/at91/files.at91	Sun Mar 29 22:43:39 2015	(r280831)
@@ -1,6 +1,5 @@
 # $FreeBSD$
 arm/arm/bus_space_generic.c	standard
-arm/arm/cpufunc_asm_arm9.S	standard
 arm/at91/at91_machdep.c		standard
 arm/at91/at91_aic.c		standard
 arm/at91/at91.c			standard

Modified: head/sys/arm/broadcom/bcm2835/files.bcm2835
==============================================================================
--- head/sys/arm/broadcom/bcm2835/files.bcm2835	Sun Mar 29 22:00:24 2015	(r280830)
+++ head/sys/arm/broadcom/bcm2835/files.bcm2835	Sun Mar 29 22:43:39 2015	(r280831)
@@ -1,6 +1,3 @@
 # $FreeBSD$
 
 arm/broadcom/bcm2835/bcm2835_systimer.c		standard
-
-arm/arm/cpufunc_asm_arm11.S                     standard
-arm/arm/cpufunc_asm_arm11x6.S                   standard

Modified: head/sys/arm/broadcom/bcm2835/files.bcm2836
==============================================================================
--- head/sys/arm/broadcom/bcm2835/files.bcm2836	Sun Mar 29 22:00:24 2015	(r280830)
+++ head/sys/arm/broadcom/bcm2835/files.bcm2836	Sun Mar 29 22:43:39 2015	(r280831)
@@ -1,6 +1,5 @@
 # $FreeBSD$
 
-arm/arm/cpufunc_asm_armv7.S			standard
 arm/arm/generic_timer.c				standard
 
 arm/broadcom/bcm2835/bcm2836.c			standard

Modified: head/sys/arm/broadcom/bcm2835/files.bcm283x
==============================================================================
--- head/sys/arm/broadcom/bcm2835/files.bcm283x	Sun Mar 29 22:00:24 2015	(r280830)
+++ head/sys/arm/broadcom/bcm2835/files.bcm283x	Sun Mar 29 22:43:39 2015	(r280831)
@@ -18,7 +18,6 @@ arm/broadcom/bcm2835/bcm283x_dwc_fdt.c		
 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_armv6.S                     standard
 
 kern/kern_clocksource.c                         standard
 

Modified: head/sys/arm/cavium/cns11xx/files.econa
==============================================================================
--- head/sys/arm/cavium/cns11xx/files.econa	Sun Mar 29 22:00:24 2015	(r280830)
+++ head/sys/arm/cavium/cns11xx/files.econa	Sun Mar 29 22:43:39 2015	(r280831)
@@ -1,5 +1,4 @@
 # $FreeBSD$
-arm/arm/cpufunc_asm_fa526.S	standard
 arm/cavium/cns11xx/econa_machdep.c		standard
 arm/cavium/cns11xx/econa.c			standard
 arm/cavium/cns11xx/timer.c			standard

Modified: head/sys/arm/freescale/imx/files.imx51
==============================================================================
--- head/sys/arm/freescale/imx/files.imx51	Sun Mar 29 22:00:24 2015	(r280830)
+++ head/sys/arm/freescale/imx/files.imx51	Sun Mar 29 22:43:39 2015	(r280831)
@@ -1,7 +1,6 @@
 # $FreeBSD$
 arm/arm/bus_space_asm_generic.S		standard
 arm/arm/bus_space_generic.c		standard
-arm/arm/cpufunc_asm_armv7.S		standard
 kern/kern_clocksource.c			standard
 
 # Init

Modified: head/sys/arm/freescale/imx/files.imx53
==============================================================================
--- head/sys/arm/freescale/imx/files.imx53	Sun Mar 29 22:00:24 2015	(r280830)
+++ head/sys/arm/freescale/imx/files.imx53	Sun Mar 29 22:43:39 2015	(r280831)
@@ -1,7 +1,6 @@
 # $FreeBSD$
 arm/arm/bus_space_asm_generic.S		standard
 arm/arm/bus_space_generic.c		standard
-arm/arm/cpufunc_asm_armv7.S		standard
 kern/kern_clocksource.c			standard
 
 # Init

Modified: head/sys/arm/freescale/imx/files.imx6
==============================================================================
--- head/sys/arm/freescale/imx/files.imx6	Sun Mar 29 22:00:24 2015	(r280830)
+++ head/sys/arm/freescale/imx/files.imx6	Sun Mar 29 22:43:39 2015	(r280831)
@@ -5,7 +5,6 @@
 #
 arm/arm/bus_space_asm_generic.S		standard
 arm/arm/bus_space_generic.c		standard
-arm/arm/cpufunc_asm_armv7.S		standard
 kern/kern_clocksource.c			standard
 
 #

Modified: head/sys/arm/freescale/vybrid/files.vybrid
==============================================================================
--- head/sys/arm/freescale/vybrid/files.vybrid	Sun Mar 29 22:00:24 2015	(r280830)
+++ head/sys/arm/freescale/vybrid/files.vybrid	Sun Mar 29 22:43:39 2015	(r280831)
@@ -4,7 +4,6 @@ kern/kern_clocksource.c				standard
 
 arm/arm/bus_space_generic.c			standard
 arm/arm/bus_space_asm_generic.S			standard
-arm/arm/cpufunc_asm_armv7.S			standard
 
 arm/arm/bus_space_base.c			standard
 arm/arm/gic.c					standard

Modified: head/sys/arm/lpc/files.lpc
==============================================================================
--- head/sys/arm/lpc/files.lpc	Sun Mar 29 22:00:24 2015	(r280830)
+++ head/sys/arm/lpc/files.lpc	Sun Mar 29 22:43:39 2015	(r280831)
@@ -1,7 +1,6 @@
 # $FreeBSD$
 arm/arm/bus_space_base.c		standard
 arm/arm/bus_space_generic.c		standard
-arm/arm/cpufunc_asm_arm9.S		standard
 arm/lpc/lpc_machdep.c			standard
 arm/lpc/lpc_pwr.c			standard
 arm/lpc/lpc_intc.c			standard

Modified: head/sys/arm/mv/files.mv
==============================================================================
--- head/sys/arm/mv/files.mv	Sun Mar 29 22:00:24 2015	(r280830)
+++ head/sys/arm/mv/files.mv	Sun Mar 29 22:43:39 2015	(r280831)
@@ -14,12 +14,6 @@
 #
 arm/arm/bus_space_base.c	standard
 arm/arm/bus_space_generic.c	standard
-arm/arm/cpufunc_asm_arm10.S	standard
-arm/arm/cpufunc_asm_arm11.S	standard
-arm/arm/cpufunc_asm_armv5_ec.S	standard
-arm/arm/cpufunc_asm_armv7.S	standard
-arm/arm/cpufunc_asm_sheeva.S	standard
-arm/arm/cpufunc_asm_pj4b.S	standard
 
 arm/mv/gpio.c			standard
 arm/mv/mv_common.c		standard

Modified: head/sys/arm/rockchip/files.rk30xx
==============================================================================
--- head/sys/arm/rockchip/files.rk30xx	Sun Mar 29 22:00:24 2015	(r280830)
+++ head/sys/arm/rockchip/files.rk30xx	Sun Mar 29 22:43:39 2015	(r280831)
@@ -3,7 +3,6 @@ kern/kern_clocksource.c			standard
 
 arm/arm/bus_space_asm_generic.S		standard
 arm/arm/bus_space_generic.c		standard
-arm/arm/cpufunc_asm_armv7.S		standard
 
 arm/arm/gic.c				standard
 arm/arm/mpcore_timer.c			standard

Modified: head/sys/arm/samsung/exynos/files.exynos5
==============================================================================
--- head/sys/arm/samsung/exynos/files.exynos5	Sun Mar 29 22:00:24 2015	(r280830)
+++ head/sys/arm/samsung/exynos/files.exynos5	Sun Mar 29 22:43:39 2015	(r280831)
@@ -4,7 +4,6 @@ kern/kern_clocksource.c				standard
 
 arm/arm/bus_space_generic.c			standard
 arm/arm/bus_space_asm_generic.S			standard
-arm/arm/cpufunc_asm_armv7.S			standard
 
 arm/arm/bus_space_base.c			standard
 arm/arm/gic.c					standard

Modified: head/sys/arm/samsung/s3c2xx0/files.s3c2xx0
==============================================================================
--- head/sys/arm/samsung/s3c2xx0/files.s3c2xx0	Sun Mar 29 22:00:24 2015	(r280830)
+++ head/sys/arm/samsung/s3c2xx0/files.s3c2xx0	Sun Mar 29 22:43:39 2015	(r280831)
@@ -2,7 +2,6 @@
 arm/arm/bus_space_base.c	standard
 arm/arm/bus_space_asm_generic.S	standard
 arm/arm/bus_space_generic.c	standard
-arm/arm/cpufunc_asm_arm9.S	standard
 arm/samsung/s3c2xx0/board_ln2410sbc.c	optional	board_ln2410sbc
 arm/samsung/s3c2xx0/s3c24x0_rtc.c	standard
 arm/samsung/s3c2xx0/s3c24x0_machdep.c	standard

Modified: head/sys/arm/ti/files.ti
==============================================================================
--- head/sys/arm/ti/files.ti	Sun Mar 29 22:00:24 2015	(r280830)
+++ head/sys/arm/ti/files.ti	Sun Mar 29 22:43:39 2015	(r280831)
@@ -5,7 +5,6 @@ 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_armv7.S			standard
 arm/arm/pmu.c					optional	hwpmc
 
 arm/ti/ti_common.c				standard

Modified: head/sys/arm/versatile/files.versatile
==============================================================================
--- head/sys/arm/versatile/files.versatile	Sun Mar 29 22:00:24 2015	(r280830)
+++ head/sys/arm/versatile/files.versatile	Sun Mar 29 22:43:39 2015	(r280831)
@@ -3,9 +3,6 @@
 arm/arm/bus_space_base.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_arm11x6.S			standard
-arm/arm/cpufunc_asm_armv6.S                     standard
 
 arm/versatile/pl050.c				optional sc
 arm/versatile/sp804.c				standard

Modified: head/sys/arm/xilinx/files.zynq7
==============================================================================
--- head/sys/arm/xilinx/files.zynq7	Sun Mar 29 22:00:24 2015	(r280830)
+++ head/sys/arm/xilinx/files.zynq7	Sun Mar 29 22:43:39 2015	(r280831)
@@ -8,7 +8,6 @@ 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_armv7.S			standard
 
 arm/arm/gic.c					standard
 arm/arm/mpcore_timer.c				standard

Modified: head/sys/arm/xscale/i80321/files.i80219
==============================================================================
--- head/sys/arm/xscale/i80321/files.i80219	Sun Mar 29 22:00:24 2015	(r280830)
+++ head/sys/arm/xscale/i80321/files.i80219	Sun Mar 29 22:43:39 2015	(r280831)
@@ -4,7 +4,6 @@
 # 
 arm/arm/bus_space_base.c		standard
 arm/arm/bus_space_generic.c		standard
-arm/arm/cpufunc_asm_xscale.S		standard
 arm/xscale/i80321/i80321.c		standard
 arm/xscale/i80321/i80321_dma.c		optional	dma
 arm/xscale/i80321/i80321_mcu.c		standard

Modified: head/sys/arm/xscale/i80321/files.i80321
==============================================================================
--- head/sys/arm/xscale/i80321/files.i80321	Sun Mar 29 22:00:24 2015	(r280830)
+++ head/sys/arm/xscale/i80321/files.i80321	Sun Mar 29 22:43:39 2015	(r280831)
@@ -1,7 +1,6 @@
 #$FreeBSD$
 arm/arm/bus_space_base.c		standard
 arm/arm/bus_space_generic.c		standard
-arm/arm/cpufunc_asm_xscale.S		standard
 arm/xscale/i80321/i80321.c		standard
 arm/xscale/i80321/i80321_aau.c		optional	aau
 arm/xscale/i80321/i80321_dma.c		optional	dma

Modified: head/sys/arm/xscale/i8134x/files.i81342
==============================================================================
--- head/sys/arm/xscale/i8134x/files.i81342	Sun Mar 29 22:00:24 2015	(r280830)
+++ head/sys/arm/xscale/i8134x/files.i81342	Sun Mar 29 22:43:39 2015	(r280831)
@@ -1,8 +1,6 @@
 # $FreeBSD$
 arm/arm/bus_space_base.c		standard
 arm/arm/bus_space_generic.c		standard
-arm/arm/cpufunc_asm_xscale.S		standard
-arm/arm/cpufunc_asm_xscale_c3.S		standard
 arm/xscale/i80321/i80321_timer.c	standard
 arm/xscale/i80321/i80321_wdog.c		optional	iopwdog
 arm/xscale/i8134x/i81342.c		standard

Modified: head/sys/arm/xscale/ixp425/files.ixp425
==============================================================================
--- head/sys/arm/xscale/ixp425/files.ixp425	Sun Mar 29 22:00:24 2015	(r280830)
+++ head/sys/arm/xscale/ixp425/files.ixp425	Sun Mar 29 22:43:39 2015	(r280831)
@@ -1,6 +1,5 @@
 #$FreeBSD$
 arm/arm/bus_space_generic.c		standard
-arm/arm/cpufunc_asm_xscale.S		standard
 arm/xscale/ixp425/ixp425.c		standard
 arm/xscale/ixp425/ixp425_mem.c		standard
 arm/xscale/ixp425/ixp425_space.c	standard

Modified: head/sys/arm/xscale/pxa/files.pxa
==============================================================================
--- head/sys/arm/xscale/pxa/files.pxa	Sun Mar 29 22:00:24 2015	(r280830)
+++ head/sys/arm/xscale/pxa/files.pxa	Sun Mar 29 22:43:39 2015	(r280831)
@@ -1,7 +1,6 @@
 # $FreeBSD$
 
 arm/arm/bus_space_generic.c		standard
-arm/arm/cpufunc_asm_xscale.S		standard
 
 arm/xscale/pxa/pxa_gpio.c		standard
 arm/xscale/pxa/pxa_icu.c		standard

Modified: head/sys/conf/files.arm
==============================================================================
--- head/sys/conf/files.arm	Sun Mar 29 22:00:24 2015	(r280830)
+++ head/sys/conf/files.arm	Sun Mar 29 22:43:39 2015	(r280831)
@@ -9,7 +9,19 @@ arm/arm/busdma_machdep-v6.c 	optional	ar
 arm/arm/copystr.S		standard
 arm/arm/cpufunc.c		standard
 arm/arm/cpufunc_asm.S		standard
+arm/arm/cpufunc_asm_arm9.S 	optional	cpu_arm9
+arm/arm/cpufunc_asm_arm10.S 	optional	cpu_arm9e
+arm/arm/cpufunc_asm_arm11.S	optional	cpu_arm1176
+arm/arm/cpufunc_asm_arm11x6.S	optional	cpu_arm1176
 arm/arm/cpufunc_asm_armv4.S 	standard
+arm/arm/cpufunc_asm_armv5_ec.S 	optional	cpu_arm9e
+arm/arm/cpufunc_asm_armv6.S 	optional	cpu_arm1176
+arm/arm/cpufunc_asm_armv7.S	optional	cpu_cortexa | cpu_krait | cpu_mv_pj4b
+arm/arm/cpufunc_asm_fa526.S	optional	cpu_fa526
+arm/arm/cpufunc_asm_pj4b.S	optional	cpu_mv_pj4b
+arm/arm/cpufunc_asm_sheeva.S 	optional	cpu_arm9e
+arm/arm/cpufunc_asm_xscale.S	optional	cpu_xscale_80200 | cpu_xscale_80321 | cpu_xscale_pxa2x0 | cpu_xscale_ixp425 | cpu_xscale_80219 | cpu_xscale_81342
+arm/arm/cpufunc_asm_xscale_c3.S	optional	cpu_xscale_81342
 arm/arm/cpuinfo.c		standard
 arm/arm/cpu_asm-v6.S		optional	armv6
 arm/arm/db_disasm.c		optional	ddb



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201503292243.t2TMhemK081667>