From: John Crispin <john@phrozen.org>
Date: Tue, 5 Sep 2017 06:08:36 +0000 (+0200)
Subject: ramips: fix mt76x8 dependencies
X-Git-Tag: v19.07.0-rc1~5862
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=5117911d91c0d047971f592086dc6b9be65b5103;p=openwrt%2Fstaging%2Fhauke.git

ramips: fix mt76x8 dependencies

The commit merging mt7628 and mt7688 failed to update some
dependencies.

Signed-off-by: John Crispin <john@phrozen.org>
---

diff --git a/package/kernel/mt76/Makefile b/package/kernel/mt76/Makefile
index 8fa3267180..2a10f1a7a7 100644
--- a/package/kernel/mt76/Makefile
+++ b/package/kernel/mt76/Makefile
@@ -96,7 +96,7 @@ endef
 
 define KernelPackage/mt7603/install
 	$(INSTALL_DIR) $(1)/lib/firmware
-	cp $(if $(CONFIG_TARGET_ramips_mt7628)$(CONFIG_TARGET_ramips_mt7688), \
+	cp $(if $(CONFIG_TARGET_ramips_mt76x8), \
 		$(PKG_BUILD_DIR)/firmware/mt7628_e1.bin \
 		$(PKG_BUILD_DIR)/firmware/mt7628_e2.bin \
 		,\
diff --git a/target/linux/ramips/modules.mk b/target/linux/ramips/modules.mk
index 870f2d5c43..95dfd78d05 100644
--- a/target/linux/ramips/modules.mk
+++ b/target/linux/ramips/modules.mk
@@ -10,7 +10,7 @@ OTHER_MENU:=Other modules
 define KernelPackage/pwm-mediatek
   SUBMENU:=Other modules
   TITLE:=MT7628 PWM
-  DEPENDS:=@(TARGET_ramips_mt7628||TARGET_ramips_mt7688)
+  DEPENDS:=@(TARGET_ramips_mt76x8)
   KCONFIG:= \
 	CONFIG_PWM=y \
 	CONFIG_PWM_MEDIATEK \
@@ -29,7 +29,7 @@ $(eval $(call KernelPackage,pwm-mediatek))
 define KernelPackage/sdhci-mt7620
   SUBMENU:=Other modules
   TITLE:=MT7620 SDCI
-  DEPENDS:=@(TARGET_ramips_mt7620||TARGET_ramips_mt7628||TARGET_ramips_mt7621||TARGET_ramips_mt7688) +kmod-mmc
+  DEPENDS:=@(TARGET_ramips_mt7620||TARGET_ramips_mt76x8||TARGET_ramips_mt7621) +kmod-mmc
   KCONFIG:= \
 	CONFIG_MTK_MMC \
 	CONFIG_MTK_AEE_KDUMP=n \
@@ -48,7 +48,7 @@ define KernelPackage/i2c-ralink
   $(call i2c_defaults,$(I2C_RALINK_MODULES),59)
   TITLE:=Ralink I2C Controller
   DEPENDS:=kmod-i2c-core @TARGET_ramips \
-	@!(TARGET_ramips_mt7621||TARGET_ramips_mt7628||TARGET_ramips_mt7688)
+	@!(TARGET_ramips_mt7621||TARGET_ramips_mt76x8)
 endef
 
 define KernelPackage/i2c-ralink/description
@@ -65,7 +65,7 @@ define KernelPackage/i2c-mt7628
   $(call i2c_defaults,$(I2C_MT7621_MODULES),59)
   TITLE:=MT7628/88 I2C Controller
   DEPENDS:=kmod-i2c-core \
-	@(TARGET_ramips_mt7628||TARGET_ramips_mt7688)
+	@(TARGET_ramips_mt76x8)
 endef
 
 define KernelPackage/i2c-mt7628/description