Fri Aug 18 21:45:25 2017 UTC ()
Sprinkle 'bus_dma_generic needs-flag' to fix build after previous.


(jakllsch)
diff -r1.15 -r1.16 src/sys/arch/arm/imx/files.imx51
diff -r1.9 -r1.10 src/sys/arch/arm/imx/files.imx6
diff -r1.3 -r1.4 src/sys/arch/arm/imx/files.imx7
cvs diff -r1.15 -r1.16 src/sys/arch/arm/imx/files.imx51 (expand / switch to unified diff)

--- src/sys/arch/arm/imx/files.imx51 2017/08/17 09:11:04 1.15
+++ src/sys/arch/arm/imx/files.imx51 2017/08/18 21:45:25 1.16
@@ -1,32 +1,32 @@ @@ -1,32 +1,32 @@
1# $NetBSD: files.imx51,v 1.15 2017/08/17 09:11:04 hkenken Exp $ 1# $NetBSD: files.imx51,v 1.16 2017/08/18 21:45:25 jakllsch Exp $
2# 2#
3# Configuration info for the Freescale i.MX5x 3# Configuration info for the Freescale i.MX5x
4# 4#
5 5
6defparam opt_imx.h MEMSIZE 6defparam opt_imx.h MEMSIZE
7defflag opt_imx.h IMX51 7defflag opt_imx.h IMX51
8defflag opt_imx.h IMX50 8defflag opt_imx.h IMX50
9 9
10define bus_dma_generic 10define bus_dma_generic
11 11
12file arch/arm/arm32/arm32_boot.c 12file arch/arm/arm32/arm32_boot.c
13file arch/arm/arm32/arm32_kvminit.c 13file arch/arm/arm32/arm32_kvminit.c
14file arch/arm/arm32/arm32_reboot.c 14file arch/arm/arm32/arm32_reboot.c
15file arch/arm/arm32/irq_dispatch.S 15file arch/arm/arm32/irq_dispatch.S
16 16
17define bus_dma_generic 17define bus_dma_generic
18file arch/arm/arm32/armv7_generic_space.c 18file arch/arm/arm32/armv7_generic_space.c
19file arch/arm/arm32/armv7_generic_dma.c 19file arch/arm/arm32/armv7_generic_dma.c bus_dma_generic needs-flag
20file arch/arm/arm/bus_space_a4x.S 20file arch/arm/arm/bus_space_a4x.S
21 21
22# iMX51 AXI/AHB bus interface and SoC domains 22# iMX51 AXI/AHB bus interface and SoC domains
23device axi { [addr=-1], [size=0], [irq=-1], [irqbase=-1]} : bus_space_generic 23device axi { [addr=-1], [size=0], [irq=-1], [irqbase=-1]} : bus_space_generic
24attach axi at mainbus 24attach axi at mainbus
25file arch/arm/imx/imx51_axi.c axi 25file arch/arm/imx/imx51_axi.c axi
26 26
27# iMX51 TrustZone Interrupt Controller 27# iMX51 TrustZone Interrupt Controller
28include "arch/arm/pic/files.pic" 28include "arch/arm/pic/files.pic"
29device tzic: pic, pic_splfuncs 29device tzic: pic, pic_splfuncs
30attach tzic at axi 30attach tzic at axi
31file arch/arm/imx/imx51_tzic.c tzic needs-flag 31file arch/arm/imx/imx51_tzic.c tzic needs-flag
32 32
cvs diff -r1.9 -r1.10 src/sys/arch/arm/imx/Attic/files.imx6 (expand / switch to unified diff)

--- src/sys/arch/arm/imx/Attic/files.imx6 2017/08/17 09:11:04 1.9
+++ src/sys/arch/arm/imx/Attic/files.imx6 2017/08/18 21:45:25 1.10
@@ -1,32 +1,32 @@ @@ -1,32 +1,32 @@
1# $NetBSD: files.imx6,v 1.9 2017/08/17 09:11:04 hkenken Exp $ 1# $NetBSD: files.imx6,v 1.10 2017/08/18 21:45:25 jakllsch Exp $
2# 2#
3# Configuration info for the Freescale i.MX6 3# Configuration info for the Freescale i.MX6
4# 4#
5 5
6include "arch/arm/pic/files.pic" 6include "arch/arm/pic/files.pic"
7include "arch/arm/cortex/files.cortex" 7include "arch/arm/cortex/files.cortex"
8 8
9defparam opt_imx.h MEMSIZE 9defparam opt_imx.h MEMSIZE
10defflag opt_imx.h IMX6 10defflag opt_imx.h IMX6
11 11
12file arch/arm/arm32/arm32_boot.c 12file arch/arm/arm32/arm32_boot.c
13file arch/arm/arm32/arm32_kvminit.c 13file arch/arm/arm32/arm32_kvminit.c
14file arch/arm/arm32/arm32_reboot.c 14file arch/arm/arm32/arm32_reboot.c
15file arch/arm/arm32/irq_dispatch.S 15file arch/arm/arm32/irq_dispatch.S
16 16
17define bus_dma_generic 17define bus_dma_generic
18file arch/arm/arm32/armv7_generic_space.c 18file arch/arm/arm32/armv7_generic_space.c
19file arch/arm/arm32/armv7_generic_dma.c 19file arch/arm/arm32/armv7_generic_dma.c bus_dma_generic needs-flag
20file arch/arm/arm/bus_space_a4x.S 20file arch/arm/arm/bus_space_a4x.S
21 21
22file arch/arm/imx/imx6_board.c 22file arch/arm/imx/imx6_board.c
23 23
24# iMX6 AXI/AHB bus interface and SoC domains 24# iMX6 AXI/AHB bus interface and SoC domains
25device axi { [addr=-1], [size=0], [irq=-1], [irqbase=-1]} : bus_space_generic 25device axi { [addr=-1], [size=0], [irq=-1], [irqbase=-1]} : bus_space_generic
26attach axi at mainbus 26attach axi at mainbus
27file arch/arm/imx/imx6_axi.c axi 27file arch/arm/imx/imx6_axi.c axi
28 28
29# iMX6 PCIe 29# iMX6 PCIe
30device imxpcie: pcibus 30device imxpcie: pcibus
31attach imxpcie at axi 31attach imxpcie at axi
32file arch/arm/imx/imx6_pcie.c imxpcie 32file arch/arm/imx/imx6_pcie.c imxpcie
cvs diff -r1.3 -r1.4 src/sys/arch/arm/imx/Attic/files.imx7 (expand / switch to unified diff)

--- src/sys/arch/arm/imx/Attic/files.imx7 2017/08/17 09:11:04 1.3
+++ src/sys/arch/arm/imx/Attic/files.imx7 2017/08/18 21:45:25 1.4
@@ -1,33 +1,33 @@ @@ -1,33 +1,33 @@
1# $NetBSD: files.imx7,v 1.3 2017/08/17 09:11:04 hkenken Exp $ 1# $NetBSD: files.imx7,v 1.4 2017/08/18 21:45:25 jakllsch Exp $
2# 2#
3# Configuration info for the Freescale i.MX7 3# Configuration info for the Freescale i.MX7
4# 4#
5 5
6include "arch/arm/pic/files.pic" 6include "arch/arm/pic/files.pic"
7include "arch/arm/cortex/files.cortex" 7include "arch/arm/cortex/files.cortex"
8 8
9defparam opt_imx.h MEMSIZE 9defparam opt_imx.h MEMSIZE
10defparam opt_imx.h MEMSIZE_RESERVED 10defparam opt_imx.h MEMSIZE_RESERVED
11defflag opt_imx.h IMX7 11defflag opt_imx.h IMX7
12 12
13file arch/arm/arm32/arm32_boot.c 13file arch/arm/arm32/arm32_boot.c
14file arch/arm/arm32/arm32_kvminit.c 14file arch/arm/arm32/arm32_kvminit.c
15file arch/arm/arm32/arm32_reboot.c 15file arch/arm/arm32/arm32_reboot.c
16file arch/arm/arm32/irq_dispatch.S 16file arch/arm/arm32/irq_dispatch.S
17 17
18define bus_dma_generic 18define bus_dma_generic
19file arch/arm/arm32/armv7_generic_space.c 19file arch/arm/arm32/armv7_generic_space.c
20file arch/arm/arm32/armv7_generic_dma.c 20file arch/arm/arm32/armv7_generic_dma.c bus_dma_generic needs-flag
21file arch/arm/arm/bus_space_a4x.S 21file arch/arm/arm/bus_space_a4x.S
22 22
23file arch/arm/imx/imx7_board.c 23file arch/arm/imx/imx7_board.c
24 24
25# iMX7 AXI/AHB bus interface and SoC domains 25# iMX7 AXI/AHB bus interface and SoC domains
26device axi { [addr=-1], [size=0], [irq=-1], [irqbase=-1]} : bus_space_generic 26device axi { [addr=-1], [size=0], [irq=-1], [irqbase=-1]} : bus_space_generic
27attach axi at mainbus 27attach axi at mainbus
28file arch/arm/imx/imx7_axi.c axi 28file arch/arm/imx/imx7_axi.c axi
29 29
30# iMX7 Clock Control Module 30# iMX7 Clock Control Module
31device imxccm 31device imxccm
32attach imxccm at axi 32attach imxccm at axi
33file arch/arm/imx/imx7_ccm.c imxccm needs-flag 33file arch/arm/imx/imx7_ccm.c imxccm needs-flag