Wed Jun 24 12:43:40 2020 UTC ()
Redo cnmac attachments - cnmacM @ gmxN @ pip0 @ iobus

Missed one file - thanks martin@.


(simonb)
diff -r1.8 -r1.9 src/sys/arch/mips/conf/files.octeon
cvs diff -r1.8 -r1.9 src/sys/arch/mips/conf/files.octeon (expand / switch to unified diff)

--- src/sys/arch/mips/conf/files.octeon 2020/06/22 02:26:20 1.8
+++ src/sys/arch/mips/conf/files.octeon 2020/06/24 12:43:40 1.9
@@ -1,101 +1,122 @@ @@ -1,101 +1,122 @@
1# $NetBSD: files.octeon,v 1.8 2020/06/22 02:26:20 simonb Exp $ 1# $NetBSD: files.octeon,v 1.9 2020/06/24 12:43:40 simonb Exp $
2 2
3file arch/mips/mips/locore_octeon.S 3file arch/mips/mips/locore_octeon.S
4file arch/mips/mips/bus_dma.c 4file arch/mips/mips/bus_dma.c
5file arch/mips/mips/mips3_clock.c 5file arch/mips/mips/mips3_clock.c
6file arch/mips/mips/mips3_clockintr.c 6file arch/mips/mips/mips3_clockintr.c
7 7
8file arch/mips/cavium/octeon_dma.c 8file arch/mips/cavium/octeon_dma.c
9file arch/mips/cavium/octeon_intr.c 9file arch/mips/cavium/octeon_intr.c
10file arch/mips/cavium/octeon_misc.c 10file arch/mips/cavium/octeon_misc.c
11file arch/mips/cavium/dev/octeon_ciu.c 
12 
13defparam opt_octeon.h OCTEON_ECLK 
14defparam opt_octeon.h CNMAC_RING_MAX 
15defparam opt_octeon.h CNMAC_RING_MIN 
16defflag opt_octeon.h CNMAC_FAST_CRC 
17 CNMAC_IPD_RED 
18 CNMAC_USENFS 
19 OCTEON_USBN_CN31XX_DMA_WORKAROUND 
20 11
21device mainbus {} 12device mainbus {}
22attach mainbus at root 13attach mainbus at root
23file arch/mips/cavium/mainbus.c mainbus 14file arch/mips/cavium/mainbus.c mainbus
24file arch/mips/cavium/mainbus_octeon1p.c mainbus 15file arch/mips/cavium/mainbus_octeon1p.c mainbus
25 16
26device cpunode { [core=-1] } 17device cpunode { [core=-1] }
27attach cpunode at mainbus 18attach cpunode at mainbus
28 19
29device cpu {} 20device cpu {}
30attach cpu at cpunode with cpu_cpunode 21attach cpu at cpunode with cpu_cpunode
31 22
32device wdog: sysmon_wdog 23device wdog: sysmon_wdog
33attach wdog at cpunode with wdog_cpunode 24attach wdog at cpunode with wdog_cpunode
34 25
35file arch/mips/cavium/octeon_cpunode.c cpunode | cpu | wdog needs-flag 26file arch/mips/cavium/octeon_cpunode.c cpunode | cpu | wdog needs-flag
36 27
37# I/O Bus 28# I/O Bus
38 29
39device iobus {} 30device iobus {}
40attach iobus at mainbus 31attach iobus at mainbus
41file arch/mips/cavium/octeon_iobus.c iobus 32file arch/mips/cavium/octeon_iobus.c iobus
42file arch/mips/cavium/octeon1p_iobus.c iobus 33file arch/mips/cavium/octeon1p_iobus.c iobus
43file arch/mips/cavium/dev/octeon_fpa.c iobus 34file arch/mips/cavium/dev/octeon_fpa.c iobus
44file arch/mips/cavium/dev/octeon_pow.c iobus 35file arch/mips/cavium/dev/octeon_pow.c iobus
45file arch/mips/cavium/dev/octeon_fau.c iobus 36file arch/mips/cavium/dev/octeon_fau.c iobus
46file arch/mips/cavium/dev/octeon_pip.c iobus 
47file arch/mips/cavium/dev/octeon_ipd.c iobus 37file arch/mips/cavium/dev/octeon_ipd.c iobus
48file arch/mips/cavium/dev/octeon_pko.c iobus 38file arch/mips/cavium/dev/octeon_pko.c iobus
49file arch/mips/cavium/dev/octeon_asx.c iobus 39file arch/mips/cavium/dev/octeon_asx.c iobus
50file arch/mips/cavium/dev/octeon_smi.c iobus 
51 40
52# I/O Bus devices 41# I/O Bus devices
53 42
54attach com at iobus with com_iobus 43attach com at iobus with com_iobus
55file arch/mips/cavium/dev/octeon_uart.c com_iobus 44file arch/mips/cavium/dev/octeon_uart.c com_iobus
56options COM_REGMAP 45options COM_REGMAP
57 46
58device octrnm 47device octrnm
59attach octrnm at iobus 48attach octrnm at iobus
60file arch/mips/cavium/dev/octeon_rnm.c octrnm & rnd 49file arch/mips/cavium/dev/octeon_rnm.c octrnm & rnd
61 50
62device octtwsi: i2cbus 51device octtwsi: i2cbus
63attach octtwsi at iobus 52attach octtwsi at iobus
64file arch/mips/cavium/dev/octeon_twsi.c octtwsi 53file arch/mips/cavium/dev/octeon_twsi.c octtwsi
65 54
66device octmpi {} 55# XXX rename to octspi?
 56device octmpi: spibus
67attach octmpi at iobus 57attach octmpi at iobus
68file arch/mips/cavium/dev/octeon_mpi.c octmpi 58file arch/mips/cavium/dev/octeon_mpi.c octmpi
69 59
 60device octcib {}
 61attach octcib at iobus
 62file arch/mips/cavium/dev/octeon_cib.c octcib
 63
 64device octcit {}
 65attach octcit at iobus
 66file arch/mips/cavium/dev/octeon_cit.c octcit
 67
 68device octciu {}
 69attach octciu at iobus
 70file arch/mips/cavium/dev/octeon_ciu.c octciu
 71
 72device octsmi {}
 73attach octsmi at iobus
 74file arch/mips/cavium/dev/octeon_smi.c octsmi
 75
 76device octpip {}
 77attach octpip at iobus
 78file arch/mips/cavium/dev/octeon_pip.c octpip
 79
70device octgmx {} 80device octgmx {}
71attach octgmx at iobus 81attach octgmx at octpip
72file arch/mips/cavium/dev/octeon_gmx.c octgmx 82file arch/mips/cavium/dev/octeon_gmx.c octgmx
73 83
74# On-chip ethernet device(s) 84# On-chip ethernet device(s)
75device cnmac: ether, ifnet, arp, mii 85device cnmac: ether, ifnet, arp, mii
76attach cnmac at octgmx 86attach cnmac at octgmx
77file arch/mips/cavium/dev/if_cnmac.c cnmac 87file arch/mips/cavium/dev/if_cnmac.c cnmac
78 88
 89# CN3xxx/CN5xxx USB
79attach dwctwo at iobus with octdwctwo 90attach dwctwo at iobus with octdwctwo
80file arch/mips/cavium/dev/octeon_dwctwo.c octdwctwo 91file arch/mips/cavium/dev/octeon_dwctwo.c octdwctwo
81 92
 93# CN6xxx USB
 94device octuctl {}
 95attach octuctl at iobus with octuctl
 96file arch/mips/cavium/dev/octeon_uctl.c octuctl
 97
 98# CN7xxx USB
 99device octxctl {}
 100attach octxctl at iobus with octxctl
 101file arch/mips/cavium/dev/octeon_xctl.c octuctl
 102
82# Boot-Bus 103# Boot-Bus
83 104
84device bootbus {} 105device bootbus {}
85attach bootbus at mainbus 106attach bootbus at mainbus
86file arch/mips/cavium/octeon_bootbus.c bootbus 107file arch/mips/cavium/octeon_bootbus.c bootbus
87 108
88# Machine-independent I2O drivers. 109# Machine-independent I2O drivers.
89include "dev/i2o/files.i2o" 110include "dev/i2o/files.i2o"
90 111
91# Machine-independent SCSI drivers 112# Machine-independent SCSI drivers
92include "dev/scsipi/files.scsipi" 113include "dev/scsipi/files.scsipi"
93 114
94# Machine-independent ATA drivers 115# Machine-independent ATA drivers
95include "dev/ata/files.ata" 116include "dev/ata/files.ata"
96 117
97# Machine-independent USB device support 118# Machine-independent USB device support
98include "dev/usb/files.usb" 119include "dev/usb/files.usb"
99 120
100# Machine-independent PCI device support 121## # Machine-independent PCI device support
101include "dev/pci/files.pci" 122## include "dev/pci/files.pci"