Author: ian
Date: Wed Jan 21 02:49:19 2015
New Revision: 277466
URL: https://svnweb.freebsd.org/changeset/base/277466
Log:
Use arm/bus_space-v6.c for all armv6 systems, the essentially identical
files for lpc and xilinx aren't needed. Also, fix a couple paste-os.
Deleted:
head/sys/arm/lpc/lpc_space.c
head/sys/arm/xilinx/zy7_bus_space.c
Modified:
head/sys/arm/arm/bus_space-v6.c
head/sys/arm/lpc/files.lpc
head/sys/arm/xilinx/files.zynq7
Modified: head/sys/arm/arm/bus_space-v6.c
==============================================================================
--- head/sys/arm/arm/bus_space-v6.c Wed Jan 21 02:35:04 2015
(r277465)
+++ head/sys/arm/arm/bus_space-v6.c Wed Jan 21 02:49:19 2015
(r277466)
@@ -137,7 +137,7 @@ static struct bus_space _base_tag = {
/* read region stream */
.bs_rr_1_s = generic_bs_rr_1,
- .bs_rr_2_s = generic_bs_rr_2,
+ .bs_rr_2_s = generic_armv4_bs_rr_2,
.bs_rr_4_s = generic_bs_rr_4,
.bs_rr_8_s = BS_UNIMPLEMENTED,
@@ -155,8 +155,8 @@ static struct bus_space _base_tag = {
/* write region stream */
.bs_wr_1_s = generic_bs_wr_1,
- .bs_wr_2_s = generic_bs_wr_4,
- .bs_wr_4_s = generic_bs_wr_8,
+ .bs_wr_2_s = generic_armv4_bs_wr_2,
+ .bs_wr_4_s = generic_bs_wr_4,
.bs_wr_8_s = BS_UNIMPLEMENTED,
};
Modified: head/sys/arm/lpc/files.lpc
==============================================================================
--- head/sys/arm/lpc/files.lpc Wed Jan 21 02:35:04 2015 (r277465)
+++ head/sys/arm/lpc/files.lpc Wed Jan 21 02:49:19 2015 (r277466)
@@ -1,9 +1,9 @@
# $FreeBSD$
+arm/arm/bus_space-v6.c standard
arm/arm/bus_space_generic.c standard
arm/arm/cpufunc_asm_arm9.S standard
arm/arm/cpufunc_asm_armv5.S standard
arm/lpc/lpc_machdep.c standard
-arm/lpc/lpc_space.c standard
arm/lpc/lpc_pwr.c standard
arm/lpc/lpc_intc.c standard
arm/lpc/lpc_timer.c standard
Modified: head/sys/arm/xilinx/files.zynq7
==============================================================================
--- head/sys/arm/xilinx/files.zynq7 Wed Jan 21 02:35:04 2015
(r277465)
+++ head/sys/arm/xilinx/files.zynq7 Wed Jan 21 02:49:19 2015
(r277466)
@@ -5,6 +5,7 @@
kern/kern_clocksource.c standard
+arm/arm/bus_space-v6.c standard
arm/arm/bus_space_generic.c standard
arm/arm/bus_space_asm_generic.S standard
arm/arm/cpufunc_asm_armv5.S standard
@@ -18,7 +19,6 @@ arm/arm/pl310.c standard
arm/xilinx/zy7_machdep.c standard
arm/xilinx/zy7_l2cache.c standard
-arm/xilinx/zy7_bus_space.c standard
arm/xilinx/zy7_slcr.c standard
arm/xilinx/zy7_devcfg.c standard
arm/xilinx/zy7_mp.c optional smp
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
