diff options
| -rw-r--r-- | sys/arch/arm/armv7/armv7_a4x_io.S | 102 | ||||
| -rw-r--r-- | sys/arch/arm/armv7/armv7_a4x_space.c | 134 | ||||
| -rw-r--r-- | sys/arch/arm/armv7/armv7var.h | 1 | ||||
| -rw-r--r-- | sys/arch/arm/conf/files.arm | 4 | ||||
| -rw-r--r-- | sys/arch/armv7/armv7/armv7_machdep.c | 7 |
5 files changed, 2 insertions, 246 deletions
diff --git a/sys/arch/arm/armv7/armv7_a4x_io.S b/sys/arch/arm/armv7/armv7_a4x_io.S deleted file mode 100644 index 3fa09faa4c2..00000000000 --- a/sys/arch/arm/armv7/armv7_a4x_io.S +++ /dev/null @@ -1,102 +0,0 @@ -/* $OpenBSD: armv7_a4x_io.S,v 1.2 2017/04/27 10:57:05 kettenis Exp $ */ -/* $NetBSD: pxa2x0_a4x_io.S,v 1.1 2002/10/19 19:31:39 bsh Exp $ */ - -/* - * Copyright (c) 2002 Genetec Corporation. All rights reserved. - * Written by Hiroyuki Bessho for Genetec Corporation. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed for the NetBSD Project by - * Genetec Corporation. - * 4. The name of Genetec Corporation may not be used to endorse or - * promote products derived from this software without specific prior - * written permission. - * - * THIS SOFTWARE IS PROVIDED BY GENETEC CORPORATION ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED - * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL GENETEC CORPORATION - * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - */ - -/* - * There are simple bus space functions for IO registers mapped at - * 32-bit aligned positions. offset is multiplied by 4. - */ - -#include <machine/asm.h> - -/* - * bus_space I/O functions with offset*4 - */ - -/* - * read single - */ - -ENTRY(a4x_bs_r_1) - ldr r0, [r1, r2, LSL #2] - mov pc, lr - -ENTRY(a4x_bs_r_2) - ldr r0, [r1, r2, LSL #2] - mov pc, lr - -ENTRY(a4x_bs_r_4) - ldr r0, [r1, r2, LSL #2] - mov pc, lr - -/* - * write single - */ - -ENTRY(a4x_bs_w_1) - str r3, [r1, r2, LSL #2] - mov pc, lr - -ENTRY(a4x_bs_w_2) - str r3, [r1, r2, LSL #2] - mov pc, lr - -ENTRY(a4x_bs_w_4) - str r3, [r1, r2, LSL #2] - mov pc, lr - -/* - * read multiple - */ -ENTRY(a4x_bs_rm_1) - mov r2, r2, LSL #2 - b generic_bs_rm_1 - -ENTRY(a4x_bs_rm_2) - mov r2, r2, LSL #2 - b generic_armv4_bs_rm_2 - - - -/* - * write multiple - */ -ENTRY(a4x_bs_wm_1) - mov r2, r2, LSL #2 - b generic_bs_wm_1 - -ENTRY(a4x_bs_wm_2) - mov r2, r2, LSL #2 - b generic_armv4_bs_wm_2 diff --git a/sys/arch/arm/armv7/armv7_a4x_space.c b/sys/arch/arm/armv7/armv7_a4x_space.c deleted file mode 100644 index 845f7704d8d..00000000000 --- a/sys/arch/arm/armv7/armv7_a4x_space.c +++ /dev/null @@ -1,134 +0,0 @@ -/* $OpenBSD: armv7_a4x_space.c,v 1.2 2012/12/05 23:20:11 deraadt Exp $ */ -/* $NetBSD: armv7_a4x_space.c,v 1.2 2003/07/15 00:24:54 lukem Exp $ */ - -/* - * Copyright (c) 2002 Genetec Corporation. All rights reserved. - * Written by Hiroyuki Bessho for Genetec Corporation. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed for the NetBSD Project by - * Genetec Corporation. - * 4. The name of Genetec Corporation may not be used to endorse or - * promote products derived from this software without specific prior - * written permission. - * - * THIS SOFTWARE IS PROVIDED BY GENETEC CORPORATION ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED - * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL GENETEC CORPORATION - * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - */ - -/* - * Bus space tag for 8/16-bit devices on 32-bit bus. - * all registers are located at the address of multiple of 4. - */ - -#include <sys/param.h> -#include <sys/systm.h> - -#include <uvm/uvm_extern.h> - -#include <machine/bus.h> - -/* Prototypes for all the bus_space structure functions */ -bs_protos(armv7); -bs_protos(a4x); -bs_protos(generic); -bs_protos(generic_armv4); -bs_protos(bs_notimpl); - -struct bus_space armv7_a4x_bs_tag = { - /* cookie */ - (void *) 0, - - /* mapping/unmapping */ - armv7_bs_map, - armv7_bs_unmap, - armv7_bs_subregion, - - /* allocation/deallocation */ - armv7_bs_alloc, /* not implemented */ - armv7_bs_free, /* not implemented */ - - /* get kernel virtual address */ - armv7_bs_vaddr, - - /* mmap */ - bs_notimpl_bs_mmap, - - /* barrier */ - armv7_bs_barrier, - - /* read (single) */ - a4x_bs_r_1, - a4x_bs_r_2, - a4x_bs_r_4, - bs_notimpl_bs_r_8, - - /* read multiple */ - a4x_bs_rm_1, - a4x_bs_rm_2, - bs_notimpl_bs_rm_4, - bs_notimpl_bs_rm_8, - - /* read region */ - bs_notimpl_bs_rr_1, - bs_notimpl_bs_rr_2, - bs_notimpl_bs_rr_4, - bs_notimpl_bs_rr_8, - - /* write (single) */ - a4x_bs_w_1, - a4x_bs_w_2, - a4x_bs_w_4, - bs_notimpl_bs_w_8, - - /* write multiple */ - a4x_bs_wm_1, - a4x_bs_wm_2, - bs_notimpl_bs_wm_4, - bs_notimpl_bs_wm_8, - - /* write region */ - bs_notimpl_bs_wr_1, - bs_notimpl_bs_wr_2, - bs_notimpl_bs_wr_4, - bs_notimpl_bs_wr_8, - - /* set multiple */ - bs_notimpl_bs_sm_1, - bs_notimpl_bs_sm_2, - bs_notimpl_bs_sm_4, - bs_notimpl_bs_sm_8, - - /* set region */ - bs_notimpl_bs_sr_1, - bs_notimpl_bs_sr_2, - bs_notimpl_bs_sr_4, - bs_notimpl_bs_sr_8, - - /* copy */ - bs_notimpl_bs_c_1, - bs_notimpl_bs_c_2, - bs_notimpl_bs_c_4, - bs_notimpl_bs_c_8, -}; - - - diff --git a/sys/arch/arm/armv7/armv7var.h b/sys/arch/arm/armv7/armv7var.h index 926bfaf9f83..fca402f7fa3 100644 --- a/sys/arch/arm/armv7/armv7var.h +++ b/sys/arch/arm/armv7/armv7var.h @@ -1,4 +1,3 @@ extern struct bus_space armv7_bs_tag; -extern struct bus_space armv7_a4x_bs_tag; void armv7_intr_bootstrap(vaddr_t); diff --git a/sys/arch/arm/conf/files.arm b/sys/arch/arm/conf/files.arm index bb88f05720c..0d28e653766 100644 --- a/sys/arch/arm/conf/files.arm +++ b/sys/arch/arm/conf/files.arm @@ -1,4 +1,4 @@ -# $OpenBSD: files.arm,v 1.49 2018/05/04 16:12:12 visa Exp $ +# $OpenBSD: files.arm,v 1.50 2018/05/15 11:11:35 kettenis Exp $ # $NetBSD: files.arm,v 1.76 2003/11/05 12:53:15 scw Exp $ # generic networking files @@ -69,8 +69,6 @@ file arch/arm/arm/sys_machdep.c file arch/arm/arm/vm_machdep.c file arch/arm/armv7/armv7_space.c cpu_armv7 -file arch/arm/armv7/armv7_a4x_space.c cpu_armv7 -file arch/arm/armv7/armv7_a4x_io.S cpu_armv7 file arch/arm/armv7/bus_space_asm_armv7.S cpu_armv7 file arch/arm/arm/vfp.c cpu_armv7 diff --git a/sys/arch/armv7/armv7/armv7_machdep.c b/sys/arch/armv7/armv7/armv7_machdep.c index 10e2a8493da..99020084e6a 100644 --- a/sys/arch/armv7/armv7/armv7_machdep.c +++ b/sys/arch/armv7/armv7/armv7_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: armv7_machdep.c,v 1.52 2018/05/07 14:13:54 kettenis Exp $ */ +/* $OpenBSD: armv7_machdep.c,v 1.53 2018/05/15 11:11:35 kettenis Exp $ */ /* $NetBSD: lubbock_machdep.c,v 1.2 2003/07/15 00:25:06 lukem Exp $ */ /* @@ -411,14 +411,10 @@ initarm(void *arg0, void *arg1, void *arg2, paddr_t loadaddr) /* * Temporarily replace bus_space_map() functions so that * console devices can get mapped. - * - * Note that this relies upon the fact that both regular - * and a4x bus_space tags use the same map function. */ tmp_bs_tag = armv7_bs_tag; map_func_save = armv7_bs_tag.bs_map; armv7_bs_tag.bs_map = bootstrap_bs_map; - armv7_a4x_bs_tag.bs_map = bootstrap_bs_map; tmp_bs_tag.bs_map = bootstrap_bs_map; /* @@ -791,7 +787,6 @@ initarm(void *arg0, void *arg1, void *arg2, paddr_t loadaddr) * Restore proper bus_space operation, now that pmap is initialized. */ armv7_bs_tag.bs_map = map_func_save; - armv7_a4x_bs_tag.bs_map = map_func_save; #ifdef DDB db_machine_init(); |