[openwrt/openwrt] ramips: make package kmod-sdhci-mt7620 conflict with kmod-mmc-mtk

LEDE Commits lede-commits at lists.infradead.org
Sat Jan 4 05:49:44 PST 2025


hauke pushed a commit to openwrt/openwrt.git, branch main:
https://git.openwrt.org/0764e3008228bbdafb5e4a9837fe9efec7e138a0

commit 0764e3008228bbdafb5e4a9837fe9efec7e138a0
Author: Shiji Yang <yangshiji66 at qq.com>
AuthorDate: Wed Jan 1 16:17:08 2025 +0800

    ramips: make package kmod-sdhci-mt7620 conflict with kmod-mmc-mtk
    
    These two packages are SDXC drivers for Mediatek mt762x series SoCs.
    One is upstream implementation, and the other is downstream driver.
    Installing them together will result in conflicts.
    
    Signed-off-by: Shiji Yang <yangshiji66 at qq.com>
    Link: https://github.com/openwrt/openwrt/pull/17446
    Signed-off-by: Hauke Mehrtens <hauke at hauke-m.de>
---
 target/linux/ramips/modules.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/target/linux/ramips/modules.mk b/target/linux/ramips/modules.mk
index ced479dc93..175ba94eff 100644
--- a/target/linux/ramips/modules.mk
+++ b/target/linux/ramips/modules.mk
@@ -47,6 +47,7 @@ $(eval $(call KernelPackage,pwm-mediatek-ramips))
 define KernelPackage/sdhci-mt7620
   SUBMENU:=Other modules
   TITLE:=MT7620 SDCI
+  CONFLICTS:=kmod-mmc-mtk
   DEPENDS:=@(TARGET_ramips_mt7620||TARGET_ramips_mt76x8||TARGET_ramips_mt7621) +kmod-mmc
   KCONFIG:= \
 	CONFIG_MTK_MMC \




More information about the lede-commits mailing list