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

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

details:   https://anonhg.NetBSD.org/src/rev/76247a33dcad
branches:  trunk
changeset: 342607:76247a33dcad
user:      ryo <ryo%NetBSD.org@localhost>
date:      Thu Dec 31 12:14:01 2015 +0000

description:
use armv7_generic_space

diffstat:

 sys/arch/arm/imx/files.imx6                   |  8 ++++----
 sys/arch/arm/imx/imx6_axi.c                   |  6 +++---
 sys/arch/arm/imx/imx6_board.c                 |  8 ++++----
 sys/arch/arm/imx/imx6var.h                    |  4 ++--
 sys/arch/evbarm/nitrogen6/nitrogen6_machdep.c |  6 +++---
 5 files changed, 16 insertions(+), 16 deletions(-)

diffs (127 lines):

diff -r eb8487383121 -r 76247a33dcad sys/arch/arm/imx/files.imx6
--- a/sys/arch/arm/imx/files.imx6       Thu Dec 31 11:53:18 2015 +0000
+++ b/sys/arch/arm/imx/files.imx6       Thu Dec 31 12:14:01 2015 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files.imx6,v 1.5 2015/03/27 05:31:23 hkenken Exp $
+#      $NetBSD: files.imx6,v 1.6 2015/12/31 12:14:01 ryo Exp $
 #
 # Configuration info for the Freescale i.MX6
 #
@@ -15,12 +15,12 @@
 file   arch/arm/arm32/irq_dispatch.S
 
 define bus_dma_generic
-
-file   arch/arm/imx/imx_space.c
+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
+
 file   arch/arm/imx/imx6_board.c
 
-
 # iMX6 AXI/AHB bus interface and SoC domains
 device axi { [addr=-1], [size=0], [irq=-1], [irqbase=-1]} : bus_space_generic
 attach axi at mainbus
diff -r eb8487383121 -r 76247a33dcad sys/arch/arm/imx/imx6_axi.c
--- a/sys/arch/arm/imx/imx6_axi.c       Thu Dec 31 11:53:18 2015 +0000
+++ b/sys/arch/arm/imx/imx6_axi.c       Thu Dec 31 12:14:01 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: imx6_axi.c,v 1.1 2014/09/25 05:05:28 ryo Exp $ */
+/*     $NetBSD: imx6_axi.c,v 1.2 2015/12/31 12:14:01 ryo Exp $ */
 
 /*
  * Copyright (c) 2014 Ryo Shimizu <ryo%nerv.org@localhost>
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: imx6_axi.c,v 1.1 2014/09/25 05:05:28 ryo Exp $");
+__KERNEL_RCSID(0, "$NetBSD: imx6_axi.c,v 1.2 2015/12/31 12:14:01 ryo 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 eb8487383121 -r 76247a33dcad sys/arch/arm/imx/imx6_board.c
--- a/sys/arch/arm/imx/imx6_board.c     Thu Dec 31 11:53:18 2015 +0000
+++ b/sys/arch/arm/imx/imx6_board.c     Thu Dec 31 12:14:01 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: imx6_board.c,v 1.4 2015/06/01 10:10:56 ryo Exp $       */
+/*     $NetBSD: imx6_board.c,v 1.5 2015/12/31 12:14:01 ryo Exp $       */
 
 /*
  * Copyright (c) 2012  Genetec Corporation.  All rights reserved.
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: imx6_board.c,v 1.4 2015/06/01 10:10:56 ryo Exp $");
+__KERNEL_RCSID(1, "$NetBSD: imx6_board.c,v 1.5 2015/12/31 12:14:01 ryo Exp $");
 
 #include "opt_imx.h"
 #include "arml2cc.h"
@@ -48,9 +48,9 @@
 #include <arm/imx/imx6_ccmreg.h>
 #include <arm/imx/imxwdogreg.h>
 
-bus_space_tag_t imx6_ioreg_bst = &imx_bs_tag;
+bus_space_tag_t imx6_ioreg_bst = &armv7_generic_bs_tag;
 bus_space_handle_t imx6_ioreg_bsh;
-bus_space_tag_t imx6_armcore_bst = &imx_bs_tag;
+bus_space_tag_t imx6_armcore_bst = &armv7_generic_bs_tag;
 bus_space_handle_t imx6_armcore_bsh;
 
 void
diff -r eb8487383121 -r 76247a33dcad sys/arch/arm/imx/imx6var.h
--- a/sys/arch/arm/imx/imx6var.h        Thu Dec 31 11:53:18 2015 +0000
+++ b/sys/arch/arm/imx/imx6var.h        Thu Dec 31 12:14:01 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: imx6var.h,v 1.3 2015/07/30 08:09:36 ryo Exp $  */
+/*     $NetBSD: imx6var.h,v 1.4 2015/12/31 12:14:01 ryo Exp $  */
 
 /*
  * Copyright (c) 2014 Ryo Shimizu <ryo%nerv.org@localhost>
@@ -41,7 +41,7 @@
        int aa_irqbase;
 };
 
-extern struct bus_space imx_bs_tag;
+extern struct bus_space armv7_generic_bs_tag;
 extern struct arm32_bus_dma_tag imx_bus_dma_tag;
 extern bus_space_tag_t imx6_armcore_bst;
 extern bus_space_handle_t imx6_armcore_bsh;
diff -r eb8487383121 -r 76247a33dcad sys/arch/evbarm/nitrogen6/nitrogen6_machdep.c
--- a/sys/arch/evbarm/nitrogen6/nitrogen6_machdep.c     Thu Dec 31 11:53:18 2015 +0000
+++ b/sys/arch/evbarm/nitrogen6/nitrogen6_machdep.c     Thu Dec 31 12:14:01 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: nitrogen6_machdep.c,v 1.4 2015/12/31 11:53:19 ryo Exp $        */
+/*     $NetBSD: nitrogen6_machdep.c,v 1.5 2015/12/31 12:14:01 ryo Exp $        */
 
 /*-
  * Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nitrogen6_machdep.c,v 1.4 2015/12/31 11:53:19 ryo Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nitrogen6_machdep.c,v 1.5 2015/12/31 12:14:01 ryo Exp $");
 
 #include "opt_evbarm_boardtype.h"
 #include "opt_arm_debug.h"
@@ -303,7 +303,7 @@
                paddr_t consaddr;
 
                consaddr = CONADDR;
-               imxuart_cons_attach(&imx_bs_tag, consaddr, consrate, consmode);
+               imxuart_cons_attach(&armv7_generic_bs_tag, consaddr, consrate, consmode);
                return;
        }
 # endif /* (NIMXUART > 0) && defined(IMXUARTCONSOLE) */