[bot] AutoMerging: merge all upstream's changes:

* https://github.com/coolsnowwolf/lede: fix k3 wifi drive problem (coolsnowwolf#5053) fix k3screenctrl depends (coolsnowwolf#5052)
alexliu269 · Jul 9, 2020 · b967d32 · b967d32
2 parents dfc7a42 + 6fb7d55
commit b967d32
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/package/lean/k3screenctrl/Makefile b/package/lean/k3screenctrl/Makefile
@@ -19,7 +19,7 @@ TARGET_CFLAGS+= -D_GNU_SOURCE
 define Package/k3screenctrl
   SECTION:=utils
   CATEGORY:=Utilities
-  DEPENDS:=@TARGET_bcm53xx_DEVICE_phicomm-k3 +@KERNEL_DEVMEM
+  DEPENDS:=@TARGET_bcm53xx_generic_DEVICE_phicomm-k3 +@KERNEL_DEVMEM
   TITLE:=LCD screen controller on PHICOMM K3
   URL:=https://github.com/updateing/k3-screen-ctrl
 endef

diff --git a/target/linux/bcm53xx/image/Makefile b/target/linux/bcm53xx/image/Makefile
@@ -387,7 +387,7 @@ TARGET_DEVICES += smartrg-sr400ac
 define Device/phicomm-k3
   DEVICE_VENDOR := PHICOMM
   DEVICE_MODEL := K3
-  DEVICE_PACKAGES := $(IEEE8021X) kmod-brcmfmac k3-brcmfmac4366c-firmware $(USB3_PACKAGES) k3screenctrl
+  DEVICE_PACKAGES := $(IEEE8021X) kmod-brcmfmac k3wifi $(USB3_PACKAGES) k3screenctrl
   IMAGES := trx
 endef
 TARGET_DEVICES += phicomm-k3