Module Name: src
Committed By: skrll
Date: Sat Jul 27 08:02:04 UTC 2019
Modified Files:
src/sys/arch/arm/imx: files.imx6 imx31_ahb.c imx6_board.c imx6_pcie.c
src/sys/arch/arm/imx/fdt: files.imx6
Log Message:
Fix builds properly
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/arm/imx/files.imx6
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/arm/imx/imx31_ahb.c
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/arm/imx/imx6_board.c
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/arm/imx/imx6_pcie.c
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/imx/fdt/files.imx6
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.17 src/sys/arch/arm/imx/files.imx6:1.18
--- src/sys/arch/arm/imx/files.imx6:1.17 Wed Jul 24 12:33:18 2019
+++ src/sys/arch/arm/imx/files.imx6 Sat Jul 27 08:02:04 2019
@@ -1,4 +1,4 @@
-# $NetBSD: files.imx6,v 1.17 2019/07/24 12:33:18 hkenken Exp $
+# $NetBSD: files.imx6,v 1.18 2019/07/27 08:02:04 skrll Exp $
#
# Configuration info for the Freescale i.MX6
#
@@ -63,7 +63,7 @@ file arch/arm/imx/imxwdog.c imxwdog
# iMX GPIO
device imxgpio: gpiobus
attach imxgpio at axi
-file arch/arm/imx/imxgpio.c imxgpio
+file arch/arm/imx/imxgpio.c imxgpio needs-flag
file arch/arm/imx/imx6_gpio.c imxgpio
# iMX6 IOMUX
Index: src/sys/arch/arm/imx/imx31_ahb.c
diff -u src/sys/arch/arm/imx/imx31_ahb.c:1.6 src/sys/arch/arm/imx/imx31_ahb.c:1.7
--- src/sys/arch/arm/imx/imx31_ahb.c:1.6 Sat Oct 27 17:17:39 2012
+++ src/sys/arch/arm/imx/imx31_ahb.c Sat Jul 27 08:02:04 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: imx31_ahb.c,v 1.6 2012/10/27 17:17:39 chs Exp $ */
+/* $NetBSD: imx31_ahb.c,v 1.7 2019/07/27 08:02:04 skrll Exp $ */
/*
* Copyright (c) 2002, 2005 Genetec Corporation. All rights reserved.
@@ -99,11 +99,10 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$Id: imx31_ahb.c,v 1.6 2012/10/27 17:17:39 chs Exp $");
+__KERNEL_RCSID(0, "$Id: imx31_ahb.c,v 1.7 2019/07/27 08:02:04 skrll Exp $");
#include "locators.h"
#include "avic.h"
-#include "imxgpio.h"
#include <sys/param.h>
#include <sys/systm.h>
Index: src/sys/arch/arm/imx/imx6_board.c
diff -u src/sys/arch/arm/imx/imx6_board.c:1.13 src/sys/arch/arm/imx/imx6_board.c:1.14
--- src/sys/arch/arm/imx/imx6_board.c:1.13 Wed Jul 24 11:58:00 2019
+++ src/sys/arch/arm/imx/imx6_board.c Sat Jul 27 08:02:04 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: imx6_board.c,v 1.13 2019/07/24 11:58:00 hkenken Exp $ */
+/* $NetBSD: imx6_board.c,v 1.14 2019/07/27 08:02:04 skrll Exp $ */
/*
* Copyright (c) 2012 Genetec Corporation. All rights reserved.
@@ -27,9 +27,10 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: imx6_board.c,v 1.13 2019/07/24 11:58:00 hkenken Exp $");
+__KERNEL_RCSID(1, "$NetBSD: imx6_board.c,v 1.14 2019/07/27 08:02:04 skrll Exp $");
#include "arml2cc.h"
+#include "imxgpio.h"
#include "opt_cputypes.h"
#include "opt_imx.h"
Index: src/sys/arch/arm/imx/imx6_pcie.c
diff -u src/sys/arch/arm/imx/imx6_pcie.c:1.12 src/sys/arch/arm/imx/imx6_pcie.c:1.13
--- src/sys/arch/arm/imx/imx6_pcie.c:1.12 Sat Jul 27 08:00:41 2019
+++ src/sys/arch/arm/imx/imx6_pcie.c Sat Jul 27 08:02:04 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: imx6_pcie.c,v 1.12 2019/07/27 08:00:41 skrll Exp $ */
+/* $NetBSD: imx6_pcie.c,v 1.13 2019/07/27 08:02:04 skrll Exp $ */
/*
* Copyright (c) 2016 Genetec Corporation. All rights reserved.
@@ -31,11 +31,12 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: imx6_pcie.c,v 1.12 2019/07/27 08:00:41 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: imx6_pcie.c,v 1.13 2019/07/27 08:02:04 skrll Exp $");
#include "opt_pci.h"
#include "locators.h"
+#include "imxgpio.h"
#include "pci.h"
#define _INTR_PRIVATE
Index: src/sys/arch/arm/imx/fdt/files.imx6
diff -u src/sys/arch/arm/imx/fdt/files.imx6:1.1 src/sys/arch/arm/imx/fdt/files.imx6:1.2
--- src/sys/arch/arm/imx/fdt/files.imx6:1.1 Wed Jul 24 13:12:33 2019
+++ src/sys/arch/arm/imx/fdt/files.imx6 Sat Jul 27 08:02:04 2019
@@ -1,4 +1,4 @@
-# $NetBSD: files.imx6,v 1.1 2019/07/24 13:12:33 hkenken Exp $
+# $NetBSD: files.imx6,v 1.2 2019/07/27 08:02:04 skrll Exp $
#
# Configuration info for the Freescale i.MX6
#
@@ -36,7 +36,7 @@ file arch/arm/imx/fdt/imx6_iomux.c imxio
# GPIO controller
device imxgpio: gpiobus
attach imxgpio at fdt
-file arch/arm/imx/imxgpio.c imxgpio
+file arch/arm/imx/imxgpio.c imxgpio needs-flag
file arch/arm/imx/fdt/imx6_gpio.c imxgpio
# UART
