Thu Jun 13 13:35:41 2019 UTC ()
add ahcisata at pci


(jmcneill)
diff -r1.38 -r1.39 src/sys/arch/evbarm/conf/GENERIC
diff -r1.97 -r1.98 src/sys/arch/evbarm/conf/GENERIC64
cvs diff -r1.38 -r1.39 src/sys/arch/evbarm/conf/GENERIC (expand / switch to unified diff)

--- src/sys/arch/evbarm/conf/GENERIC 2019/06/11 13:01:48 1.38
+++ src/sys/arch/evbarm/conf/GENERIC 2019/06/13 13:35:41 1.39
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
1# 1#
2# $NetBSD: GENERIC,v 1.38 2019/06/11 13:01:48 skrll Exp $ 2# $NetBSD: GENERIC,v 1.39 2019/06/13 13:35:41 jmcneill Exp $
3# 3#
4# GENERIC ARM (aarch32) kernel 4# GENERIC ARM (aarch32) kernel
5# 5#
6 6
7include "arch/evbarm/conf/std.generic" 7include "arch/evbarm/conf/std.generic"
8include "arch/evbarm/conf/files.generic" 8include "arch/evbarm/conf/files.generic"
9include "arch/evbarm/conf/GENERIC.common" 9include "arch/evbarm/conf/GENERIC.common"
10 10
11# 11#
12# FDT files supported by this kernel - add to DTSSUBDIR and DTS as 12# FDT files supported by this kernel - add to DTSSUBDIR and DTS as
13# appropriate 13# appropriate
14# 14#
15makeoptions DTSARCH="arm aarch64" 15makeoptions DTSARCH="arm aarch64"
@@ -527,26 +527,27 @@ ld0 at sdmmc0 @@ -527,26 +527,27 @@ ld0 at sdmmc0
527ld1 at sdmmc1 527ld1 at sdmmc1
528ld2 at sdmmc2 528ld2 at sdmmc2
529ld3 at sdmmc3 529ld3 at sdmmc3
530ld* at sdmmc? 530ld* at sdmmc?
531 531
532# NAND Flash 532# NAND Flash
533sunxinand* at fdt? # NAND flash controller 533sunxinand* at fdt? # NAND flash controller
534nand* at nandbus? 534nand* at nandbus?
535flash* at nand? dynamic 1 535flash* at nand? dynamic 1
536 536
537 537
538# SATA 538# SATA
539ahcisata* at fdt? # AHCI SATA 539ahcisata* at fdt? # AHCI SATA
 540ahcisata* at pci? dev ? function ?
540atabus* at ata? 541atabus* at ata?
541atapibus* at atapi? 542atapibus* at atapi?
542wd* at atabus? drive ? 543wd* at atabus? drive ?
543cd* at atapibus? drive ? 544cd* at atapibus? drive ?
544 545
545# NVMe 546# NVMe
546nvme* at pci? dev ? function ? 547nvme* at pci? dev ? function ?
547ld* at nvme? nsid ? 548ld* at nvme? nsid ?
548 549
549# SPI controllers 550# SPI controllers
550bcmspi* at fdt? # Broadcom BCM283x SPI 551bcmspi* at fdt? # Broadcom BCM283x SPI
551spi* at spibus? 552spi* at spibus?
552 553
cvs diff -r1.97 -r1.98 src/sys/arch/evbarm/conf/GENERIC64 (expand / switch to unified diff)

--- src/sys/arch/evbarm/conf/GENERIC64 2019/06/12 10:14:05 1.97
+++ src/sys/arch/evbarm/conf/GENERIC64 2019/06/13 13:35:41 1.98
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
1# 1#
2# $NetBSD: GENERIC64,v 1.97 2019/06/12 10:14:05 jmcneill Exp $ 2# $NetBSD: GENERIC64,v 1.98 2019/06/13 13:35:41 jmcneill Exp $
3# 3#
4# GENERIC ARM (aarch64) kernel 4# GENERIC ARM (aarch64) kernel
5# 5#
6 6
7include "arch/evbarm/conf/std.generic64" 7include "arch/evbarm/conf/std.generic64"
8include "arch/evbarm/conf/files.generic64" 8include "arch/evbarm/conf/files.generic64"
9include "arch/evbarm/conf/GENERIC.common" 9include "arch/evbarm/conf/GENERIC.common"
10 10
11# 11#
12# FDT files supported by this kernel - add to DTSSUBDIR and DTS as 12# FDT files supported by this kernel - add to DTSSUBDIR and DTS as
13# appropriate 13# appropriate
14# 14#
15makeoptions DTSARCH="arm aarch64" 15makeoptions DTSARCH="arm aarch64"
@@ -372,26 +372,27 @@ rkemmcphy* at fdt? # Rockchip eMMC PHY @@ -372,26 +372,27 @@ rkemmcphy* at fdt? # Rockchip eMMC PHY
372sdhc* at fdt? # SD Host Controller Interface 372sdhc* at fdt? # SD Host Controller Interface
373sdhost* at fdt? # Broadcom BCM283x SD Host Interface 373sdhost* at fdt? # Broadcom BCM283x SD Host Interface
374sunximmc* at fdt? # Allwinner SD/MMC 374sunximmc* at fdt? # Allwinner SD/MMC
375sdmmc* at sdmmcbus? 375sdmmc* at sdmmcbus?
376ld0 at sdmmc0 376ld0 at sdmmc0
377ld1 at sdmmc1 377ld1 at sdmmc1
378ld2 at sdmmc2 378ld2 at sdmmc2
379ld3 at sdmmc3 379ld3 at sdmmc3
380ld* at sdmmc? 380ld* at sdmmc?
381 381
382# SATA 382# SATA
383ahcisata* at fdt? # AHCI SATA 383ahcisata* at fdt? # AHCI SATA
384ahcisata* at acpi? 384ahcisata* at acpi?
 385ahcisata* at pci? dev ? function ?
385atabus* at ata? 386atabus* at ata?
386atapibus* at atapi? 387atapibus* at atapi?
387wd* at atabus? drive ? 388wd* at atabus? drive ?
388cd* at atapibus? drive ? 389cd* at atapibus? drive ?
389 390
390# NVMe 391# NVMe
391nvme* at pci? dev ? function ? 392nvme* at pci? dev ? function ?
392ld* at nvme? nsid ? 393ld* at nvme? nsid ?
393 394
394# SPI controllers 395# SPI controllers
395bcmspi* at fdt? # Broadcom BCM283x SPI 396bcmspi* at fdt? # Broadcom BCM283x SPI
396spi* at spibus? 397spi* at spibus?
397 398