git: f84e9df6d0e5 - main - conf: deduplicate dwmmc config logic

The branch main has been updated by mhorne:

URL: https://cgit.FreeBSD.org/src/commit/?id=f84e9df6d0e56168d8d5d0514557cc345938bef7

commit f84e9df6d0e56168d8d5d0514557cc345938bef7
Author:     Mitchell Horne <mhorne@FreeBSD.org>
AuthorDate: 2024-02-27 22:00:24 +0000
Commit:     Mitchell Horne <mhorne@FreeBSD.org>
CommitDate: 2024-02-27 22:10:14 +0000

    conf: deduplicate dwmmc config logic
    
    The core of this driver is supported by multiple architectures. Move the
    config entries to the MI conf/files.
    
    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/D44104
---
 sys/arm/altera/socfpga/files.socfpga | 1 -
 sys/arm/rockchip/files.rk32xx        | 1 -
 sys/conf/files                       | 1 +
 sys/conf/files.arm64                 | 1 -
 4 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/sys/arm/altera/socfpga/files.socfpga b/sys/arm/altera/socfpga/files.socfpga
index 986c08184570..1cf8d95b9fa3 100644
--- a/sys/arm/altera/socfpga/files.socfpga
+++ b/sys/arm/altera/socfpga/files.socfpga
@@ -5,7 +5,6 @@ arm/altera/socfpga/socfpga_manager.c		standard
 arm/altera/socfpga/socfpga_rstmgr.c		standard
 arm/altera/socfpga/socfpga_mp.c			optional smp
 
-dev/mmc/host/dwmmc.c				optional dwmmc
 dev/mmc/host/dwmmc_altera.c			optional dwmmc
 
 # Arria 10
diff --git a/sys/arm/rockchip/files.rk32xx b/sys/arm/rockchip/files.rk32xx
index 5f15a22cc334..a9ca6cb1b5ae 100644
--- a/sys/arm/rockchip/files.rk32xx
+++ b/sys/arm/rockchip/files.rk32xx
@@ -26,5 +26,4 @@ dev/iicbus/pmic/act8846.c		standard
 dev/iicbus/pmic/act8846_regulator.c	standard
 dev/iicbus/pmic/fan53555.c		standard
 dev/iicbus/rtc/hym8563.c		standard
-dev/mmc/host/dwmmc.c			optional	dwmmc
 dev/mmc/host/dwmmc_rockchip.c		optional	dwmmc
diff --git a/sys/conf/files b/sys/conf/files
index cc476dc88210..3c87c0b88528 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -2408,6 +2408,7 @@ dev/mlxfw/mlxfw_mfa2_tlv_multi.c	optional mlxfw \
 dev/mlx/mlx.c			optional mlx
 dev/mlx/mlx_disk.c		optional mlx
 dev/mlx/mlx_pci.c		optional mlx pci
+dev/mmc/host/dwmmc.c		optional dwmmc fdt
 dev/mmc/mmc_subr.c		optional mmc | mmcsd !mmccam
 dev/mmc/mmc.c			optional mmc !mmccam
 dev/mmc/mmcbr_if.m		standard
diff --git a/sys/conf/files.arm64 b/sys/conf/files.arm64
index 5ff090fcf8b2..ef00857b61c0 100644
--- a/sys/conf/files.arm64
+++ b/sys/conf/files.arm64
@@ -384,7 +384,6 @@ dev/ipmi/ipmi_smic.c				optional ipmi
 dev/mailbox/arm/arm_doorbell.c			optional fdt arm_doorbell
 dev/mbox/mbox_if.m				optional soc_brcm_bcm2837
 
-dev/mmc/host/dwmmc.c				optional dwmmc fdt
 dev/mmc/host/dwmmc_altera.c			optional dwmmc dwmmc_altera fdt
 dev/mmc/host/dwmmc_hisi.c			optional dwmmc dwmmc_hisi fdt
 dev/mmc/host/dwmmc_rockchip.c			optional dwmmc rk_dwmmc fdt