nss-firmware: Rework platform dependancy and version string

- Added proper CONFLICTS which should allow building multiple
  firmwares in the same build tree.
- Updated version string for 11.4 (it was 5 when it's been 6 for a while)
- Adjusted nss-eip-firmware dependency to match IPQ807x/IPQ60xx since
  'TARGET_qualcommax` included IPQ50xx which does not have EIP hardware.
- PKG_RELEASE bumped to 2

Signed-off-by: Sean Khan <datapronix@protonmail.com>

firmware/nss-eip-firmware/Makefile

@@ -12,7 +12,7 @@ define Package/nss-eip-firmware
   SECTION:=firmware
   CATEGORY:=Firmware
   TITLE:=NSS EIP-197 firmware
-  DEPENDS:=@(TARGET_qualcommax||TARGET_ipq60xx)
+  DEPENDS:=@(TARGET_qualcommax_ipq807x||TARGET_qualcommax_ipq60xx)
 endef
 
 define Build/Compile

firmware/nss-firmware/Makefile

@@ -11,7 +11,7 @@ PKG_NAME:=nss-firmware
 PKG_SOURCE_DATE:=2024-08-04
 PKG_SOURCE_VERSION:=794fe3732fca4ef9b74e7be6f621d160d831b636
 PKG_MIRROR_HASH:=a3bb68bd729469470cbccd538d7fc529acabad46a2c9aa2ad6bb19fb05f01b45
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://github.com/qosmio/qca-sdk-nss-fw.git
@@ -33,7 +33,7 @@ STRIP:=:
 
 NSS_PROFILE:=R
 
-define Package/nss-firmware-default
+define nss-firmware-common
 	TITLE:=NSS firmware
 	SECTION:=firmware
 	CATEGORY:=Firmware
@@ -41,28 +41,34 @@ define Package/nss-firmware-default
 	DEPENDS:=@TARGET_qualcommax
 endef
 
-define Package/nss-firmware-ipq8074
+define Package/nss-firmware
-$(Package/nss-firmware-default)
+$(nss-firmware-common)
+	DEPENDS+= +TARGET_qualcommax_ipq807x:nss-firmware-ipq807x \
+		  +TARGET_qualcommax_ipq60xx:nss-firmware-ipq60xx \
+		  +TARGET_qualcommax_ipq50xx:nss-firmware-ipq50xx
+endef
+
+define Package/nss-firmware-ipq807x
+$(nss-firmware-common)
 	IPQ_PLATFORM=IPQ8074
-	DEPENDS+= @TARGET_qualcommax_ipq807x +nss-firmware-default
 	NSS_SOC:=HK
 endef
 
-define Package/nss-firmware-ipq6018
+define Package/nss-firmware-ipq60xx
-$(Package/nss-firmware-default)
+$(nss-firmware-common)
 	IPQ_PLATFORM=IPQ6018
-	DEPENDS+= @TARGET_qualcommax_ipq60xx +nss-firmware-default
+	CONFLICTS=nss-firmware-ipq807x
 	NSS_SOC:=CP
 endef
 
-define Package/nss-firmware-ipq5018
+define Package/nss-firmware-ipq50xx
-$(Package/nss-firmware-default)
+$(nss-firmware-common)
 	IPQ_PLATFORM=IPQ5018
-	DEPENDS+= @TARGET_qualcommax_ipq50xx +nss-firmware-default
+	CONFLICTS=nss-firmware-ipq807x nss-firmware-ipq60xx
 	NSS_SOC:=MP
 endef
 
-define Package/nss-firmware-default/config
+define Package/nss-firmware/config
   menu "NSS Firmware Version"
 
   comment "Select NSS firmware version"
@@ -87,7 +93,7 @@ define Package/nss-firmware-default/config
                This version does NOT work with NSS MESH (802.11s)
 
     config NSS_FIRMWARE_VERSION_11_4
-          bool "NSS Firmware 11.4.0.5 Release 5"
+          bool "NSS Firmware 11.4.0.5 Release 6"
           help
                This version WORKS with NSS MESH (802.11s)
   endchoice
@@ -134,23 +140,23 @@ ifeq ($(NSS_SOC),HK)
 endif
 endef
 
-define Package/nss-firmware-ipq8074/install
+define Package/nss-firmware-ipq807x/install
 	$(call Package/nss-firmware/install,$(1))
 endef
 
-define Package/nss-firmware-ipq6018/install
+define Package/nss-firmware-ipq60xx/install
 	$(call Package/nss-firmware/install,$(1))
 endef
 
-define Package/nss-firmware-ipq5018/install
+define Package/nss-firmware-ipq50xx/install
 	$(call Package/nss-firmware/install,$(1))
 endef
 
-define Package/nss-firmware-default/install
+define Package/nss-firmware/install
 	true
 endef
 
-$(eval $(call BuildPackage,nss-firmware-ipq8074))
+$(eval $(call BuildPackage,nss-firmware-ipq807x))
-$(eval $(call BuildPackage,nss-firmware-ipq6018))
+$(eval $(call BuildPackage,nss-firmware-ipq60xx))
-$(eval $(call BuildPackage,nss-firmware-ipq5018))
+$(eval $(call BuildPackage,nss-firmware-ipq50xx))
-$(eval $(call BuildPackage,nss-firmware-default))
+$(eval $(call BuildPackage,nss-firmware))

qca-nss-drv/Config.in

@@ -163,6 +163,7 @@ config NSS_DRV_QVPN_ENABLE
 	bool
 	default n
 	prompt "Enable OpenVpn (QVPN)"
+	depends on TARGET_qualcommax_ipq807x || TARGET_qualcommax_ipq60xx
 
 config NSS_DRV_RMNET_ENABLE
 	bool
@@ -250,5 +251,6 @@ config NSS_DRV_WIFI_MESH_ENABLE
 config NSS_DRV_WIFI_LEGACY_ENABLE
 	bool
 	default n
+	depends on TARGET_ipq806x
 	prompt "Enable Legacy WIFI"
 endmenu

qca-nss-drv/Makefile

@@ -79,9 +79,9 @@ define KernelPackage/qca-nss-drv
   SECTION:=kernel
   CATEGORY:=Kernel modules
   SUBMENU:=Network Devices
-  DEPENDS:=@(TARGET_ipq806x||TARGET_qualcommax||TARGET_ipq807x||TARGET_ipq60xx) \
+  DEPENDS:=@(TARGET_ipq806x||TARGET_qualcommax) \
-  				 +!TARGET_ipq806x:kmod-qca-nss-dp \
+  				 +TARGET_qualcommax:kmod-qca-nss-dp \
-  				 +TARGET_qualcommax_ipq807x:nss-firmware-ipq8074
+  				 +TARGET_qualcommax:nss-firmware
   TITLE:=Kernel driver for NSS (core driver)
   FILES:=$(PKG_BUILD_DIR)/qca-nss-drv.ko
   AUTOLOAD:=$(call AutoLoad,32,qca-nss-drv)