[src/trunk]: src/sys/arch use armv7_generic_space

[hkenken <hkenken%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/8c4696ce9a5c
branches:  trunk
changeset: 808135:8c4696ce9a5c
user:      hkenken <hkenken%NetBSD.org@localhost>
date:      Thu May 07 04:13:47 2015 +0000

description:
use armv7_generic_space

diffstat:

 sys/arch/arm/imx/files.imx51                  |  10 +++++++---
 sys/arch/arm/imx/imx51_axi.c                  |   6 +++---
 sys/arch/arm/imx/imx51var.h                   |   5 +++--
 sys/arch/evbarm/conf/files.kobo               |   6 +-----
 sys/arch/evbarm/conf/files.netwalker          |   6 +-----
 sys/arch/evbarm/kobo/kobo_machdep.c           |   8 ++++----
 sys/arch/evbarm/netwalker/netwalker_machdep.c |   8 ++++----
 7 files changed, 23 insertions(+), 26 deletions(-)

diffs (180 lines):

diff -r bce27cd719de -r 8c4696ce9a5c sys/arch/arm/imx/files.imx51
--- a/sys/arch/arm/imx/files.imx51      Thu May 07 04:03:38 2015 +0000
+++ b/sys/arch/arm/imx/files.imx51      Thu May 07 04:13:47 2015 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files.imx51,v 1.12 2015/03/27 05:31:23 hkenken Exp $
+#      $NetBSD: files.imx51,v 1.13 2015/05/07 04:13:47 hkenken Exp $
 #
 # Configuration info for the Freescale i.MX5x
 #
@@ -9,7 +9,12 @@
 
 define bus_dma_generic
 
-file   arch/arm/imx/imx_space.c
+file   arch/arm/arm32/arm32_boot.c
+file   arch/arm/arm32/arm32_kvminit.c
+file   arch/arm/arm32/arm32_reboot.c
+file   arch/arm/arm32/irq_dispatch.S
+file   arch/arm/arm32/armv7_generic_space.c
+file   arch/arm/arm/bus_space_a4x.S
 file   arch/arm/imx/imx_dma.c          bus_dma_generic needs-flag
 
 # iMX51 AXI/AHB bus interface and SoC domains
@@ -22,7 +27,6 @@
 device tzic: pic, pic_splfuncs
 attach tzic at axi
 file   arch/arm/imx/imx51_tzic.c               tzic    needs-flag
-file   arch/arm/arm32/irq_dispatch.S
 
 # iMX51 Enhanced Periodic Interrupt Timer
 device imxclock
diff -r bce27cd719de -r 8c4696ce9a5c sys/arch/arm/imx/imx51_axi.c
--- a/sys/arch/arm/imx/imx51_axi.c      Thu May 07 04:03:38 2015 +0000
+++ b/sys/arch/arm/imx/imx51_axi.c      Thu May 07 04:13:47 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: imx51_axi.c,v 1.4 2014/03/10 04:25:51 htodd Exp $      */
+/*     $NetBSD: imx51_axi.c,v 1.5 2015/05/07 04:13:47 hkenken Exp $    */
 
 /*-
  * Copyright (c) 2010 SHIMIZU Ryo <ryo%nerv.org@localhost>
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: imx51_axi.c,v 1.4 2014/03/10 04:25:51 htodd Exp $");
+__KERNEL_RCSID(0, "$NetBSD: imx51_axi.c,v 1.5 2015/05/07 04:13:47 hkenken Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -76,7 +76,7 @@
        aprint_naive("\n");
 
        sc = device_private(self);
-       sc->sc_iot = &imx_bs_tag;
+       sc->sc_iot = &armv7_generic_bs_tag;
 #if NBUS_DMA_GENERIC > 0
        sc->sc_dmat = &imx_bus_dma_tag;
 #else
diff -r bce27cd719de -r 8c4696ce9a5c sys/arch/arm/imx/imx51var.h
--- a/sys/arch/arm/imx/imx51var.h       Thu May 07 04:03:38 2015 +0000
+++ b/sys/arch/arm/imx/imx51var.h       Thu May 07 04:13:47 2015 +0000
@@ -1,9 +1,10 @@
-/*     $NetBSD: imx51var.h,v 1.2 2010/11/30 13:05:27 bsh Exp $ */
+/*     $NetBSD: imx51var.h,v 1.3 2015/05/07 04:13:47 hkenken Exp $ */
 
 #ifndef _ARM_IMX_IMX51VAR_H
 #define        _ARM_IMX_IMX51VAR_H
 
-extern struct bus_space imx_bs_tag;
+extern struct bus_space armv7_generic_bs_tag;
+extern struct bus_space armv7_generic_a4x_bs_tag;
 extern struct arm32_bus_dma_tag imx_bus_dma_tag;
 
 void gpio_set_direction(uint32_t, uint32_t);
diff -r bce27cd719de -r 8c4696ce9a5c sys/arch/evbarm/conf/files.kobo
--- a/sys/arch/evbarm/conf/files.kobo   Thu May 07 04:03:38 2015 +0000
+++ b/sys/arch/evbarm/conf/files.kobo   Thu May 07 04:13:47 2015 +0000
@@ -1,12 +1,8 @@
-#      $NetBSD: files.kobo,v 1.1 2014/07/25 11:22:50 hkenken Exp $
+#      $NetBSD: files.kobo,v 1.2 2015/05/07 04:13:47 hkenken Exp $
 #
 # KOBO evaluation board configuration info
 #
 
-file   arch/arm/arm32/arm32_boot.c
-file   arch/arm/arm32/arm32_kvminit.c
-file   arch/arm/arm32/arm32_reboot.c
-
 file   arch/evbarm/kobo/kobo_machdep.c
 
 # Kernel boot arguments
diff -r bce27cd719de -r 8c4696ce9a5c sys/arch/evbarm/conf/files.netwalker
--- a/sys/arch/evbarm/conf/files.netwalker      Thu May 07 04:03:38 2015 +0000
+++ b/sys/arch/evbarm/conf/files.netwalker      Thu May 07 04:13:47 2015 +0000
@@ -1,12 +1,8 @@
-#      $NetBSD: files.netwalker,v 1.8 2014/05/06 12:02:52 hkenken Exp $
+#      $NetBSD: files.netwalker,v 1.9 2015/05/07 04:13:47 hkenken Exp $
 #
 # Sharp Netwalker configuration info
 #
 
-file   arch/arm/arm32/arm32_boot.c
-file   arch/arm/arm32/arm32_kvminit.c
-file   arch/arm/arm32/arm32_reboot.c
-
 file   arch/evbarm/netwalker/netwalker_machdep.c
 
 # Kernel boot arguments
diff -r bce27cd719de -r 8c4696ce9a5c sys/arch/evbarm/kobo/kobo_machdep.c
--- a/sys/arch/evbarm/kobo/kobo_machdep.c       Thu May 07 04:03:38 2015 +0000
+++ b/sys/arch/evbarm/kobo/kobo_machdep.c       Thu May 07 04:13:47 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: kobo_machdep.c,v 1.2 2014/07/25 16:04:27 hkenken Exp $ */
+/*     $NetBSD: kobo_machdep.c,v 1.3 2015/05/07 04:13:47 hkenken Exp $ */
 
 /*
  * Copyright (c) 2002, 2003, 2005, 2010  Genetec Corporation.
@@ -102,7 +102,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kobo_machdep.c,v 1.2 2014/07/25 16:04:27 hkenken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kobo_machdep.c,v 1.3 2015/05/07 04:13:47 hkenken Exp $");
 
 #include "opt_evbarm_boardtype.h"
 #include "opt_arm_debug.h"
@@ -525,7 +525,7 @@
 #else
                consaddr = IMX51_UART2_BASE;
 #endif
-               imxuart_cons_attach(&imx_bs_tag, consaddr, consrate, consmode);
+               imxuart_cons_attach(&armv7_generic_bs_tag, consaddr, consrate, consmode);
                return;
        }
 #endif
@@ -561,7 +561,7 @@
 {
 #if (NIMXUART > 0)
        if (strcmp(kgdb_devname, "imxuart") == 0) {
-               imxuart_kgdb_attach(&imx_bs_tag, kgdb_addr,
+               imxuart_kgdb_attach(&armv7_generic_bs_tag, kgdb_addr,
                kgdb_rate, kgdb_mode);
            return;
        }
diff -r bce27cd719de -r 8c4696ce9a5c sys/arch/evbarm/netwalker/netwalker_machdep.c
--- a/sys/arch/evbarm/netwalker/netwalker_machdep.c     Thu May 07 04:03:38 2015 +0000
+++ b/sys/arch/evbarm/netwalker/netwalker_machdep.c     Thu May 07 04:13:47 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: netwalker_machdep.c,v 1.17 2014/07/25 16:04:27 hkenken Exp $   */
+/*     $NetBSD: netwalker_machdep.c,v 1.18 2015/05/07 04:13:47 hkenken Exp $   */
 
 /*
  * Copyright (c) 2002, 2003, 2005, 2010  Genetec Corporation.
@@ -102,7 +102,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netwalker_machdep.c,v 1.17 2014/07/25 16:04:27 hkenken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netwalker_machdep.c,v 1.18 2015/05/07 04:13:47 hkenken Exp $");
 
 #include "opt_evbarm_boardtype.h"
 #include "opt_arm_debug.h"
@@ -671,7 +671,7 @@
 #else
                consaddr = IMX51_UART1_BASE;
 #endif
-               imxuart_cons_attach(&imx_bs_tag, consaddr, consrate, consmode);
+               imxuart_cons_attach(&armv7_generic_bs_tag, consaddr, consrate, consmode);
            return;
        }
 #endif
@@ -707,7 +707,7 @@
 {
 #if (NIMXUART > 0)
        if (strcmp(kgdb_devname, "imxuart") == 0) {
-               imxuart_kgdb_attach(&imx_bs_tag, kgdb_addr,
+               imxuart_kgdb_attach(&armv7_generic_bs_tag, kgdb_addr,
                kgdb_rate, kgdb_mode);
            return;
        }