Sat Oct 26 14:57:27 2019 UTC ()
Adapt ti fdt glue to support GENERIC kernel.


(jmcneill)
diff -r1.4 -r1.5 src/sys/arch/arm/ti/files.ti
diff -r1.6 -r0 src/sys/arch/evbarm/conf/TI
diff -r1.8 -r1.9 src/sys/arch/evbarm/conf/files.generic
diff -r1.2 -r0 src/sys/arch/evbarm/conf/files.ti
diff -r1.5 -r0 src/sys/arch/evbarm/conf/std.ti
cvs diff -r1.4 -r1.5 src/sys/arch/arm/ti/files.ti (expand / switch to unified diff)

--- src/sys/arch/arm/ti/files.ti 2018/11/21 08:55:05 1.4
+++ src/sys/arch/arm/ti/files.ti 2019/10/26 14:57:27 1.5
@@ -1,41 +1,38 @@ @@ -1,41 +1,38 @@
1# $NetBSD: files.ti,v 1.4 2018/11/21 08:55:05 skrll Exp $ 1# $NetBSD: files.ti,v 1.5 2019/10/26 14:57:27 jmcneill Exp $
2# 2#
3 3
4file arch/arm/arm32/arm32_boot.c 4file arch/arm/ti/ti_platform.c soc_ti
5file arch/arm/arm32/arm32_kvminit.c 
6file arch/arm/arm32/arm32_reboot.c 
7file arch/arm/arm32/irq_dispatch.S 
8 
9file arch/arm/arm32/armv7_generic_space.c 
10file arch/arm/arm/arm_generic_dma.c 
11file arch/arm/arm/bus_space_a4x.S 
12 
13file arch/arm/ti/ti_platform.c 
14 5
15# Interrupt controller 6# Interrupt controller
16device omapintc: pic, pic_splfuncs 7device omapintc: pic, pic_splfuncs
17attach omapintc at fdt 8attach omapintc at fdt
18file arch/arm/ti/ti_omapintc.c omapintc 9file arch/arm/ti/ti_omapintc.c omapintc
19 10
20# PRCM 11# PRCM
21define ti_prcm 12define ti_prcm
22file arch/arm/ti/ti_prcm.c ti_prcm 13file arch/arm/ti/ti_prcm.c ti_prcm
23 14
24# PRCM (AM3xxx) 15# PRCM (AM3xxx)
25device am3prcm: ti_prcm 16device am3prcm: ti_prcm
26attach am3prcm at fdt with am3_prcm 17attach am3prcm at fdt with am3_prcm
27file arch/arm/ti/am3_prcm.c am3_prcm 18file arch/arm/ti/am3_prcm.c am3_prcm
28 19
29# UART 20# UART
30attach com at fdt with ti_com 21ifdef soc_ti
31file arch/arm/ti/ti_com.c ti_com needs-flag 22attach com at fdt with ti_com: ti_prcm
 23file arch/arm/ti/ti_com.c ti_com needs-flag
 24endif
32 25
33# Timer 26# Timer
34device omaptimer 27device omaptimer
35attach omaptimer at fdt 28attach omaptimer at fdt
36file arch/arm/ti/ti_omaptimer.c omaptimer 29file arch/arm/ti/ti_omaptimer.c omaptimer
37 30
38# Ethernet 31# Ethernet
39device cpsw: ether, ifnet, arp, mii, mii_phy 32device cpsw: ether, ifnet, arp, mii, mii_phy
40attach cpsw at fdt 33attach cpsw at fdt
41file arch/arm/ti/if_cpsw.c cpsw 34file arch/arm/ti/if_cpsw.c cpsw
 35
 36# SOC parameters
 37defflag opt_soc.h SOC_TI
 38defflag opt_soc.h SOC_TI_AM335X: SOC_TI
File Deleted: src/sys/arch/evbarm/conf/Attic/TI
cvs diff -r1.8 -r1.9 src/sys/arch/evbarm/conf/files.generic (expand / switch to unified diff)

--- src/sys/arch/evbarm/conf/files.generic 2019/09/15 21:04:41 1.8
+++ src/sys/arch/evbarm/conf/files.generic 2019/10/26 14:57:27 1.9
@@ -1,34 +1,35 @@ @@ -1,34 +1,35 @@
1# $NetBSD: files.generic,v 1.8 2019/09/15 21:04:41 bouyer Exp $ 1# $NetBSD: files.generic,v 1.9 2019/10/26 14:57:27 jmcneill Exp $
2# 2#
3# A generic (aarch32) kernel configuration info 3# A generic (aarch32) kernel configuration info
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
9include "arch/evbarm/conf/files.fdt" 9include "arch/evbarm/conf/files.fdt"
10 10
11file arch/arm/arm32/arm32_boot.c 11file arch/arm/arm32/arm32_boot.c
12file arch/arm/arm32/arm32_kvminit.c 12file arch/arm/arm32/arm32_kvminit.c
13file arch/arm/arm32/arm32_reboot.c 13file arch/arm/arm32/arm32_reboot.c
14file arch/arm/arm32/irq_dispatch.S 14file arch/arm/arm32/irq_dispatch.S
15file arch/arm/arm32/armv7_generic_space.c 15file arch/arm/arm32/armv7_generic_space.c
16file arch/arm/arm/arm_generic_dma.c 16file arch/arm/arm/arm_generic_dma.c
17file arch/arm/arm/bus_space_a4x.S 17file arch/arm/arm/bus_space_a4x.S
18 18
19# Add other board files here 19# Add other board files here
20include "arch/arm/altera/files.altera" 20include "arch/arm/altera/files.altera"
21include "arch/arm/amlogic/files.meson" 21include "arch/arm/amlogic/files.meson"
22include "arch/arm/broadcom/files.bcm2835" 22include "arch/arm/broadcom/files.bcm2835"
23include "arch/arm/nvidia/files.tegra" 23include "arch/arm/nvidia/files.tegra"
24include "arch/arm/samsung/files.exynos" 24include "arch/arm/samsung/files.exynos"
25include "arch/arm/sunxi/files.sunxi" 25include "arch/arm/sunxi/files.sunxi"
 26include "arch/arm/ti/files.ti"
26include "arch/arm/vexpress/files.vexpress" 27include "arch/arm/vexpress/files.vexpress"
27include "arch/arm/virt/files.virt" 28include "arch/arm/virt/files.virt"
28include "arch/arm/xilinx/files.zynq" 29include "arch/arm/xilinx/files.zynq"
29 30
30# 31#
31# Stack-less Just-In-Time compiler 32# Stack-less Just-In-Time compiler
32# 33#
33 34
34include "external/bsd/sljit/conf/files.sljit" 35include "external/bsd/sljit/conf/files.sljit"
File Deleted: src/sys/arch/evbarm/conf/Attic/files.ti
File Deleted: src/sys/arch/evbarm/conf/Attic/std.ti