The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=a01dc140b27e98c200eef173e1db6e750f7d3ea0
commit a01dc140b27e98c200eef173e1db6e750f7d3ea0 Author: Mitchell Horne <[email protected]> AuthorDate: 2024-02-27 21:59:53 +0000 Commit: Mitchell Horne <[email protected]> CommitDate: 2024-02-27 22:10:14 +0000 conf: deduplicate dwc config logic Move the core dwc(4) file entries to the MI conf/files. Platform-specific versions e.g. rk_dwc are retained in their current position. On arm64 this necessitates adding an additional 'device dwc' option. This hardware is found on several available/emerging RISC-V SoCs, so we will soon need it on this architecture. Reviewed by: manu MFC after: 1 week Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D44103 --- sys/arm64/conf/NOTES | 1 + sys/arm64/conf/std.altera | 1 + sys/arm64/conf/std.rockchip | 1 + sys/conf/files | 4 ++++ sys/conf/files.arm | 4 ---- sys/conf/files.arm64 | 4 ---- 6 files changed, 7 insertions(+), 8 deletions(-) diff --git a/sys/arm64/conf/NOTES b/sys/arm64/conf/NOTES index 48cd2647df70..21b1b22a5f01 100644 --- a/sys/arm64/conf/NOTES +++ b/sys/arm64/conf/NOTES @@ -93,6 +93,7 @@ device neta # Marvell Armada 370/38x/XP/3700 NIC device smc # SMSC LAN91C111 device vnic # Cavium ThunderX NIC device al_eth # Annapurna Alpine Ethernet NIC +device dwc # Synopsys Designware GMAC Ethernet device dwc_rk # Rockchip Designware device dwc_socfpga # Altera SOCFPGA Ethernet MAC device ice # Intel 800 Series Physical Function diff --git a/sys/arm64/conf/std.altera b/sys/arm64/conf/std.altera index 8ef17481c9e1..5a15c20f6624 100644 --- a/sys/arm64/conf/std.altera +++ b/sys/arm64/conf/std.altera @@ -12,6 +12,7 @@ device dwgpio # Synopsys DesignWare APB GPIO Controller device uart_snps # Ethernet NICs +device dwc # Synopsys DesignWare GMAC controller device dwc_socfpga # Altera SOCFPGA Ethernet MAC # MMC/SD/SDIO Card slot support diff --git a/sys/arm64/conf/std.rockchip b/sys/arm64/conf/std.rockchip index 8f8084379d62..3733ddc4eeae 100644 --- a/sys/arm64/conf/std.rockchip +++ b/sys/arm64/conf/std.rockchip @@ -35,6 +35,7 @@ device rk_pwm device uart_snps # Ethernet NICs +device dwc # Synopsys DesignWare GMAC controller device dwc_rk # Rockchip Designware device eqos # Synopsys Designware Ethernet QoS controller diff --git a/sys/conf/files b/sys/conf/files index b5f28b848800..cc476dc88210 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -1591,6 +1591,10 @@ dev/drm2/ttm/ttm_execbuf_util.c optional drm2 dev/drm2/ttm/ttm_memory.c optional drm2 dev/drm2/ttm/ttm_page_alloc.c optional drm2 dev/drm2/ttm/ttm_bo_vm.c optional drm2 +dev/dwc/if_dwc.c optional dwc fdt +dev/dwc/if_dwc_if.m optional dwc fdt +dev/dwc/dwc1000_core.c optional dwc fdt +dev/dwc/dwc1000_dma.c optional dwc fdt dev/efidev/efidev.c optional efirt dev/efidev/efirt.c optional efirt dev/efidev/efirtc.c optional efirt diff --git a/sys/conf/files.arm b/sys/conf/files.arm index 28e80016d97b..110c0a9e9dbf 100644 --- a/sys/conf/files.arm +++ b/sys/conf/files.arm @@ -86,10 +86,6 @@ contrib/openzfs/module/icp/asm-arm/sha2/sha512-armv7.S optional zfs compile-with crypto/des/des_enc.c optional netsmb dev/cpufreq/cpufreq_dt.c optional cpufreq fdt -dev/dwc/if_dwc.c optional dwc -dev/dwc/if_dwc_if.m optional dwc -dev/dwc/dwc1000_core.c optional dwc -dev/dwc/dwc1000_dma.c optional dwc dev/fb/fb.c optional sc dev/fdt/fdt_arm_platform.c optional platform fdt dev/video/crtc_if.m optional vt diff --git a/sys/conf/files.arm64 b/sys/conf/files.arm64 index cc217b3ce78f..5ff090fcf8b2 100644 --- a/sys/conf/files.arm64 +++ b/sys/conf/files.arm64 @@ -258,10 +258,6 @@ dev/dpaa2/memac_mdio_fdt.c optional soc_nxp_ls dpaa2 fdt dev/dpaa2/memac_mdio_if.m optional soc_nxp_ls dpaa2 acpi | soc_nxp_ls dpaa2 fdt # Synopsys DesignWare Ethernet Controller -dev/dwc/if_dwc.c optional fdt dwc_rk soc_rockchip_rk3328 | fdt dwc_rk soc_rockchip_rk3399 | fdt dwc_socfpga soc_intel_stratix10 -dev/dwc/if_dwc_if.m optional fdt dwc_rk soc_rockchip_rk3328 | fdt dwc_rk soc_rockchip_rk3399 | fdt dwc_socfpga soc_intel_stratix10 -dev/dwc/dwc1000_core.c optional fdt dwc_rk soc_rockchip_rk3328 | fdt dwc_rk soc_rockchip_rk3399 | fdt dwc_socfpga soc_intel_stratix10 -dev/dwc/dwc1000_dma.c optional fdt dwc_rk soc_rockchip_rk3328 | fdt dwc_rk soc_rockchip_rk3399 | fdt dwc_socfpga soc_intel_stratix10 dev/dwc/if_dwc_rk.c optional fdt dwc_rk soc_rockchip_rk3328 | fdt dwc_rk soc_rockchip_rk3399 dev/dwc/if_dwc_socfpga.c optional fdt dwc_socfpga
