wwan/driver: code alignment

whao123yahoo · Mar 13, 2023 · 8443bb1 · 8443bb1
1 parent dd7c89a
commit 8443bb1
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 16 deletions.
diff --git a/package/wwan/app/fibocom-dial/Makefile b/package/wwan/app/fibocom-dial/Makefile
@@ -2,8 +2,6 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=fibocom-dial
 PKG_RELEASE:=1
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
-
 
 include $(INCLUDE_DIR)/package.mk
 

diff --git a/package/wwan/app/luci-app-spdmodem/Makefile b/package/wwan/app/luci-app-spdmodem/Makefile
@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 LUCI_TITLE:=SPD Modem Server
-LUCI_DEPENDS:=
+LUCI_DEPENDS:=+luci-compat +kmod-sprd_pcie
 
 include $(TOPDIR)/feeds/luci/luci.mk
 

diff --git a/package/wwan/app/quectel_cm_5G/Makefile b/package/wwan/app/quectel_cm_5G/Makefile
@@ -1,10 +1,10 @@
 include $(TOPDIR)/rules.mk
-include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:= quectel-CM-5G
 PKG_RELEASE:=2
 PKG_VERSION:=1.0
 
+include $(INCLUDE_DIR)/kernel.mk
 include $(INCLUDE_DIR)/package.mk
 
 define Package/quectel-CM-5G
@@ -23,18 +23,17 @@ define Build/Compile
 		ARCH="$(LINUX_KARCH)" \
 		SUBDIRS="$(PKG_BUILD_DIR)" \
 		EXTRA_CFLAGS="$(EXTRA_CFLAGS)" \
-		CC="$(TARGET_CC)" \
-
+		CC="$(TARGET_CC)"
 endef
 
 define Package/quectel-CM-5G/install
-		$(INSTALL_DIR) $(1)/usr/bin $(1)/lib/netifd/proto $(1)/lib/netifd
-		$(INSTALL_BIN) $(PKG_BUILD_DIR)/quectel-CM $(1)/usr/bin/quectel-CM
-		$(INSTALL_BIN) ./files/rmnet_init.sh $(1)/usr/bin
-		$(INSTALL_BIN) ./files/rmnet.sh $(1)/lib/netifd/proto
-		$(INSTALL_BIN) ./files/rmnet.script $(1)/lib/netifd
-		$(INSTALL_BIN) ./files/rmnet6.sh $(1)/lib/netifd/proto
-		$(INSTALL_BIN) ./files/rmnet6.script $(1)/lib/netifd
+	$(INSTALL_DIR) $(1)/usr/bin $(1)/lib/netifd/proto $(1)/lib/netifd
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/quectel-CM $(1)/usr/bin/quectel-CM
+	$(INSTALL_BIN) ./files/rmnet.sh $(1)/lib/netifd/proto
+	$(INSTALL_BIN) ./files/rmnet6.sh $(1)/lib/netifd/proto
+	$(INSTALL_BIN) ./files/rmnet6.script $(1)/lib/netifd
+	$(INSTALL_BIN) ./files/rmnet.script $(1)/lib/netifd
+	$(INSTALL_BIN) ./files/rmnet_init.sh $(1)/usr/bin
 endef
 
 $(eval $(call BuildPackage,quectel-CM-5G))
diff --git a/package/wwan/driver/quectel_MHI/Makefile b/package/wwan/driver/quectel_MHI/Makefile
@@ -15,7 +15,7 @@ include $(INCLUDE_DIR)/kernel.mk
 include $(INCLUDE_DIR)/package.mk
 
 define KernelPackage/pcie_mhi
-  SUBMENU:=PCIE Support
+  SUBMENU:=WWAN Support
   TITLE:=Kernel pcie driver for MHI device
   DEPENDS:=+pciids +pciutils +quectel-CM-5G
   FILES:=$(PKG_BUILD_DIR)/pcie_mhi.ko

diff --git a/package/wwan/driver/quectel_SRPD_PCIE/Makefile b/package/wwan/driver/quectel_SRPD_PCIE/Makefile
@@ -15,9 +15,8 @@ include $(INCLUDE_DIR)/kernel.mk
 include $(INCLUDE_DIR)/package.mk
 
 define KernelPackage/sprd_pcie
-  SUBMENU:=PCIE Support
+  SUBMENU:=WWAN Support
   TITLE:=Kernel pcie driver for SPRD device
-  DEPENDS:=
   FILES:=$(PKG_BUILD_DIR)/sprd_pcie.ko
   AUTOLOAD:=$(call AutoLoad,41,sprd_pcie)
 endef