Module Name: src
Committed By: ryo
Date: Thu Dec 31 12:14:01 UTC 2015
Modified Files:
src/sys/arch/arm/imx: files.imx6 imx6_axi.c imx6_board.c imx6var.h
src/sys/arch/evbarm/nitrogen6: nitrogen6_machdep.c
Log Message:
use armv7_generic_space
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/arm/imx/files.imx6
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/imx/imx6_axi.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/imx/imx6_board.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/imx/imx6var.h
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/evbarm/nitrogen6/nitrogen6_machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/imx/files.imx6
diff -u src/sys/arch/arm/imx/files.imx6:1.5 src/sys/arch/arm/imx/files.imx6:1.6
--- src/sys/arch/arm/imx/files.imx6:1.5 Fri Mar 27 05:31:23 2015
+++ src/sys/arch/arm/imx/files.imx6 Thu Dec 31 12:14:01 2015
@@ -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,11 +15,11 @@ file arch/arm/arm32/arm32_reboot.c
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
+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
Index: src/sys/arch/arm/imx/imx6_axi.c
diff -u src/sys/arch/arm/imx/imx6_axi.c:1.1 src/sys/arch/arm/imx/imx6_axi.c:1.2
--- src/sys/arch/arm/imx/imx6_axi.c:1.1 Thu Sep 25 05:05:28 2014
+++ src/sys/arch/arm/imx/imx6_axi.c Thu Dec 31 12:14:01 2015
@@ -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 <r...@nerv.org>
@@ -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 @@ axi_attach(device_t parent __unused, dev
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
Index: src/sys/arch/arm/imx/imx6_board.c
diff -u src/sys/arch/arm/imx/imx6_board.c:1.4 src/sys/arch/arm/imx/imx6_board.c:1.5
--- src/sys/arch/arm/imx/imx6_board.c:1.4 Mon Jun 1 10:10:56 2015
+++ src/sys/arch/arm/imx/imx6_board.c Thu Dec 31 12:14:01 2015
@@ -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 @@ __KERNEL_RCSID(1, "$NetBSD: imx6_board.c
#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
Index: src/sys/arch/arm/imx/imx6var.h
diff -u src/sys/arch/arm/imx/imx6var.h:1.3 src/sys/arch/arm/imx/imx6var.h:1.4
--- src/sys/arch/arm/imx/imx6var.h:1.3 Thu Jul 30 08:09:36 2015
+++ src/sys/arch/arm/imx/imx6var.h Thu Dec 31 12:14:01 2015
@@ -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 <r...@nerv.org>
@@ -41,7 +41,7 @@ struct axi_attach_args {
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;
Index: src/sys/arch/evbarm/nitrogen6/nitrogen6_machdep.c
diff -u src/sys/arch/evbarm/nitrogen6/nitrogen6_machdep.c:1.4 src/sys/arch/evbarm/nitrogen6/nitrogen6_machdep.c:1.5
--- src/sys/arch/evbarm/nitrogen6/nitrogen6_machdep.c:1.4 Thu Dec 31 11:53:19 2015
+++ src/sys/arch/evbarm/nitrogen6/nitrogen6_machdep.c Thu Dec 31 12:14:01 2015
@@ -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 @@ consinit(void)
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) */
