easy-soc-libs: libeasy-1.0.1

-------------------------------------------------------------------------------
* 0accbd7 libwifi: intel: show chan utilization instead of load
-------------------------------------------------------------------------------
commit 0accbd7266b2742ad8921edd5dab974fc384a49a
Author: Anjan Chanda <anjan.chanda@iopsys.eu>
Date: 2019-11-27 10:19:28 +0100

    libwifi: intel: show chan utilization instead of load

Base directory -> /
 libwifi/modules/intel.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
-------------------------------------------------------------------------------

bbf/Makefile

@@ -1,22 +1,22 @@
 #
-# Copyright (C) 2019 Iopsys
+# Copyright (C) 2019 IOPSYS
 #
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libbbfdm
-PKG_VERSION:=1.0-2019-11-02
+PKG_VERSION:=1.0-2019-12-10
 PKG_FIXUP:=autoreconf
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/bbf.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=a33b47b9c34bdd174e39b54525b082259c60850c
+PKG_SOURCE_VERSION:=0ea0b2c89a51ad56ca76d171b7fd5dcf38e102cd
 PKG_RELEASE=$(PKG_SOURCE_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 
-PKG_LICENSE:=GPLv2
+PKG_LICENSE:=LGPL-2.1
 PKG_LICENSE_FILES:=LICENSE
 
 include $(INCLUDE_DIR)/package.mk
@@ -81,6 +81,7 @@ define Build/InstallDev
 	$(INSTALL_DIR) $(1)/usr/include/libbbfdm
 	$(CP) $(PKG_BUILD_DIR)/*.h $(1)/usr/include/libbbfdm/
 	$(CP) $(PKG_BUILD_DIR)/dmtree/tr181/*.h $(1)/usr/include/libbbfdm/
+	$(CP) $(PKG_BUILD_DIR)/dmtree/tr157/*.h $(1)/usr/include/libbbfdm/
 	$(INSTALL_DIR) $(1)/usr/lib
 	$(CP) $(PKG_BUILD_DIR)/bin/.libs/libbbfdm.{a,so*} $(1)/usr/lib/
 endef

dectmngr2/Makefile

@@ -30,7 +30,7 @@ define Package/dectmngr2
   CATEGORY:=Utilities
   TITLE:=Dectmngr2
   URL:=
-  DEPENDS:= +natalie-dect-h bcmkernel +libubox +ubus +libpicoevent endptmngr
+  DEPENDS:= +natalie-dect-h +PACKAGE_bcmkernel:bcmkernel +PACKAGE_bcmopen:bcmopen @(PACKAGE_bcmkernel||PACKAGE_bcmopen) +libubox +ubus +libpicoevent endptmngr
 endef
 
 define Package/dectmngr2/description

easy-qos/files/etc/init.d/easy_qos.classcfg

@@ -4,6 +4,7 @@ START=99
 USE_PROCD=1
 
 RULE_LIST="/tmp/easy_qos_rule.list"
+CLIENT_LIST="/tmp/easy_qos_class_client.list"
 BRIDGE_INTF=""
 
 [ -f /etc/profile.d/intel.sh ] && {
@@ -16,6 +17,13 @@ log() {
 }
 
 exec_log() {
+	${@}
+	if [ "${?}" -ne 0 ]; then
+		log "Failed to create ${@}";
+	fi
+}
+
+exec_class_log() {
 	${@} |grep -i successful
 	if [ "${?}" -ne 0 ]; then
 		log "Failed to create ${@}";
@@ -46,6 +54,114 @@ get_priority() {
 	esac
 }
 
+get_mark() {
+	local prio=$(echo $1|tr [A-Z] [a-z]);
+	case "${prio}" in
+		"lowest")
+			echo "0x41/0x3df";;
+		"low")
+			echo "0x82/0x3df";;
+		"besteffort")
+			echo "0xc3/0x3df";;
+		"normal")
+			echo "0x104/0x3df";;
+		"video")
+			echo "0x145/0x3df";;
+		"medium")
+			echo "0x186/0x3df";;
+		"high")
+			echo "0x1c7/0x3df";;
+		"highest")
+			echo "0x208/0x3df";;
+	esac
+}
+
+clean_client_entries() {
+	[ -f ${CLIENT_LIST} ] && rm ${CLIENT_LIST}
+}
+
+map_client_entries() {
+	local clients ip mac host
+
+	json_load "$(ubus call router.network 'clients')"
+	json_get_keys keys
+
+	for key in ${keys};
+	do
+		json_select ${key}
+		json_get_vars ipaddr macaddr hostname
+		clients="${macaddr} ${ipaddr} ${hostname};${clients}"
+		json_select ..
+	done
+
+	json_init
+
+	IFS=";"
+	for client in ${clients};
+	do
+		macaddr=$(echo ${client} | cut -d" " -f1)
+		json_add_object "${macaddr//:/_}"
+		json_add_string "ip" "$(echo ${client} | cut -d" " -f2)"
+		json_add_string "macaddr" "$(echo ${client} | cut -d" " -f1)"
+		json_add_string "host" "$(echo ${client} | cut -d" " -f3)"
+		json_close_object
+	done
+
+	IFS=' '
+	echo `json_dump` > ${CLIENT_LIST}
+	json_cleanup
+}
+
+# Find the IP of a corresponding mac from arp table
+get_ipaddress() {
+	local clients ip mac host
+
+	json_load "$(cat ${CLIENT_LIST})"
+	json_get_keys keys
+
+	# jshn seems a bit iffy on having : in key, replace by _
+	json_select "${1//:/_}" 2 > /dev/null
+	json_get_var ip ip
+
+	echo "$ip"
+}
+
+check_and_create() {
+	iptables -t mangle -C PREROUTING ${@} 2>/dev/null
+	# Create rule if not exists
+	if [ ${?} -ne 0 ]; then
+		exec_log iptables -t mangle -A PREROUTING ${@}
+	else
+		log "Rule exists for ${@}"
+	fi
+}
+
+create_ip_rule() {
+	local proto=$1; shift
+	local src_ip=$1; shift
+	local mark=$1; shift
+	local ports=$1;
+	local cmd="";
+
+	cmd="-j EXTMARK --set-mark ${mark}";
+	if [ "${proto}" != "icmp" ]; then
+		if [ -n "${ports}" ]; then
+			cmd="--match multiport --dports ${ports} ${cmd}";
+		fi
+	fi
+
+	if [ "${proto}" == "icmp" ]; then
+		cmd="-p icmp -m icmp --icmp-type 8 $cmd"
+	elif [ "${proto}" == "all" ]; then
+		cmd="-p all $cmd"
+	else
+		cmd="-p ${proto} -m ${proto} $cmd"
+	fi
+	cmd="-s ${src_ip} $cmd"
+
+	check_and_create ${cmd}
+}
+
 is_lan_bridge() {
 	local _section=$1
 	local _type
@@ -67,10 +183,10 @@ get_bridge_interface() {
 validate_rule_section()
 {
 	uci_validate_section easy_qos rule "${1}" \
-		'priority:string:none' \
-		'macaddr:string:none' \
+		'priority:string' \
+		'macaddr:string' \
 		'proto:string:none' \
-		'port:list(uinteger):none' \
+		'port:list(uinteger)' \
 		'comment:string:none'
 }
 
@@ -82,8 +198,14 @@ clear_existing_rules() {
 	while read line
 	do
 		log "Deleting old classification rules"
-		exec_log classcfg -D ${line} -i ${BRIDGE_INTF}
+		exec_class_log classcfg -D ${line} -i ${BRIDGE_INTF}
 	done <${RULE_LIST}
+
+	local rule=$(iptables -t mangle -S PREROUTING|grep -m 1 EXTMARK |sed 's/-A/-D/1')
+	while [ -n "${rule}" ]; do
+		exec_log iptables -t mangle ${rule}
+		rule=$(iptables -t mangle -S PREROUTING|grep -m 1 EXTMARK |sed 's/-A/-D/1')
+	done
 	sync
 
 	[ -f ${RULE_LIST} ] && rm ${RULE_LIST}
@@ -104,13 +226,16 @@ create_rule() {
 	if [ "${mac_addr}" != "none" ]; then
 		cmd="--smac ${mac_addr} ${cmd}";
 	fi
-	if [ "${ports}" != "none" ]; then
-		IFS=","
-		for port in ${ports};
-		do
-			cmd="--dport ${port}:${port} ${cmd}";
-		done
-		IFS=' '
+
+	if [ "${proto}" != "icmp" ]; then
+		if [ "${ports}" != "none" ]; then
+			IFS=","
+			for port in ${ports};
+			do
+				cmd="--dport ${port}:${port} ${cmd}";
+			done
+			IFS=' '
+		fi
 	fi
 	if [ "${proto}" != "none" ]; then
 		cmd="-p ${proto} $cmd"
@@ -119,14 +244,14 @@ create_rule() {
 	cmd="-A ${rule_name} $cmd"
 
 	# Store the rule_names for cleanup on reload
-	exec_log classcfg ${cmd} 
+	exec_class_log classcfg ${cmd}
 	[ $? -eq 0 ] && \
 		echo ${rule_name}  >> ${RULE_LIST}
 }
 
 manage_rule() {
 	local cfg="$1"
-	local priority macaddr proto port comment prio_num port_list
+	local priority macaddr proto port comment prio_num port_list ip ipmark
 
 	validate_rule_section "${1}" || {
 		log "Validation of section failed"
@@ -135,22 +260,33 @@ manage_rule() {
 
 	prio_num=$(get_priority ${priority})
 	port_list=$(echo ${port}|sed 's/ /,/g')
+	ipmark=$(get_mark ${priority})
+	ip=$(get_ipaddress ${macaddr})
 
 	if [ -n "${prio_num}" ]; then
 		if [ "${proto}" == "none" -o "${proto}" == "tcpudp" ]; then
 			create_rule tcp ${macaddr} ${prio_num} ${port_list}
 			create_rule udp ${macaddr} ${prio_num} ${port_list}
+			if [ -n "${ip}" ]; then
+				create_ip_rule tcp ${ip} ${ipmark} ${port_list}
+				create_ip_rule udp ${ip} ${ipmark} ${port_list}
+			fi
 		else
 			create_rule ${proto} ${macaddr} ${prio_num} ${port_list}
+			if [ -n "${ip}" ]; then
+				create_ip_rule ${proto} ${ip} ${ipmark} ${port_list}
+			fi
 		fi
 	fi
 }
 
 reload_service() {
 	get_bridge_interface
+	map_client_entries
 	clear_existing_rules
 	config_load easy_qos
 	config_foreach manage_rule rule
+	clean_client_entries
 }
 
 start_service() {

easy-qos/files/etc/init.d/easy_qos.iptables

@@ -103,18 +103,18 @@ validate_rule_section()
 
 # Clear existing rules before applying new rules
 clear_existing_rules() {
-	local rule=$(iptables -t mangle -S OUTPUT|grep -m 1 MARK |sed 's/-A/-D/1')
+	local rule=$(iptables -t mangle -S PREROUTING | grep -m 1 MARK |sed 's/-A/-D/1')
 	while [ -n "${rule}" ]; do
 		exec_log iptables -t mangle ${rule}
-		rule=$(iptables -t mangle -S OUTPUT|grep -m 1 MARK |sed 's/-A/-D/1')
+		rule=$(iptables -t mangle -S PREROUTING | grep -m 1 MARK |sed 's/-A/-D/1')
 	done
 }
 
 check_and_create() {
-	iptables -t mangle -C OUTPUT ${@} 2>/dev/null
+	iptables -t mangle -C PREROUTING ${@} 2>/dev/null
 	# Create rule if not exists
 	if [ ${?} -ne 0 ]; then
-		exec_log iptables -t mangle -A OUTPUT ${@}
+		exec_log iptables -t mangle -A PREROUTING ${@}
 	else
 		log "Rule exists for ${@}"
 	fi

easy-soc-libs.deprecated/Config.in

@@ -0,0 +1,10 @@
+if (PACKAGE_libwifix)
+menu "configurations"
+
+config LIBWIFIX_DEBUG
+	depends on PACKAGE_libwifix
+	bool "Enable wifi debugging"
+	default n
+
+endmenu
+endif

easy-soc-libs.deprecated/Makefile

@@ -0,0 +1,108 @@
+#
+# Copyright (C) 2019 iopsys Software Solutions AB
+#
+# This is free software, licensed under the GNU General Public License v2.
+# 
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=easy-soc-libs.deprecated
+PKG_VERSION:=1.0.1
+PKG_RELEASE:=1
+
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_VERSION:=cec7ae3a5c8348ea2d81a2abac0599a098752e3a
+PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/easy-soc-libs.git
+PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@iopsys.eu>
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+
+PKG_LICENSE:=GPLv2
+PKG_LICENSE_FILES:=LICENSE
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/easy-soc-libs.deprecated
+  SECTION:=libs
+  CATEGORY:=Libraries
+  TITLE:=IOPSYS easy SoC libraries (deprecated)
+  SUBMENU:=IOPSYS easy SoC libraries (deprecated)
+  DEPENDS:=+libopenssl
+  MENU:=1
+endef
+
+define Package/libwifix/config
+  source "$(SOURCE)/Config.in"
+endef
+
+define Package/libwifix
+  $(call Package/easy-soc-libs.deprecated)
+  TITLE:= WiFi library for wifix (deprecated)
+  DEPENDS+=+libnl +libnl-route
+endef
+
+ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_mips),y)
+  TARGET_PLATFORM=BROADCOM
+  TARGET_CFLAGS +=-DIOPSYS_BROADCOM -DCONFIG_BCM963138 \
+	-I$(STAGING_DIR)/usr/include/bcm963xx/bcmdrivers/opensource/include/bcm963xx
+  KERNEL_DIR:=$(BUILD_DIR)/bcmkernel/bcm963xx
+else ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_arm),y)
+  TARGET_PLATFORM=BROADCOM
+  TARGET_CFLAGS +=-DIOPSYS_BROADCOM -DCONFIG_BCM963138 \
+	-I$(STAGING_DIR)/usr/include/bcm963xx/bcmdrivers/opensource/include/bcm963xx
+else ifeq ($(CONFIG_TARGET_iopsys_ramips),y)
+  TARGET_PLATFORM=MEDIATEK
+  TARGET_CFLAGS +=-DIOPSYS_MEDIATEK
+else ifeq ($(CONFIG_TARGET_iopsys_linksys),y)
+  TARGET_PLATFORM=MARVELL
+  TARGET_CFLAGS +=-DIOPSYS_MARVELL
+else ifeq ($(CONFIG_TARGET_intel_mips),y)
+  TARGET_PLATFORM=INTEL
+  TARGET_CFLAGS +=-DIOPSYS_INTEL
+else
+  $(info Unexpected CONFIG_TARGET)
+endif
+
+export TARGET_PLATFORM
+
+ifdef CONFIG_LIBWIFIX_DEBUG
+  TARGET_CFLAGS += -DIOP_LLA_LIBS_DEBUG
+endif
+
+subdirs := \
+	$(if $(CONFIG_PACKAGE_libwifix),libwifix)
+
+TARGET_CFLAGS += \
+	-I$(STAGING_DIR)/usr/include \
+	-I$(STAGING_DIR)/usr/include/openssl \
+	-I$(STAGING_DIR)/usr/include/libnl3
+
+MAKE_FLAGS += \
+	CFLAGS="$(TARGET_CFLAGS) -Wall -I./" \
+	LDFLAGS="$(TARGET_LDFLAGS)" \
+	FPIC="$(FPIC)" \
+	PLATFORM="$(TARGET_PLATFORM)" \
+	subdirs="$(subdirs)"
+
+define Build/InstallDev/libwifix
+	$(INSTALL_DIR) $(1)/usr/include
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_BUILD_DIR)/libwifix/wifi.h $(1)/usr/include/wifix.h
+	$(CP) $(PKG_BUILD_DIR)/libwifix/libwifi*.so* $(1)/usr/lib/
+endef
+
+define Build/Compile
+	$(call Build/Compile/Default)
+endef
+
+define Build/InstallDev
+	$(foreach dir,$(subdirs),$(call Build/InstallDev/$(dir),$(1),$(2));)
+endef
+
+define Package/libwifix/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_BUILD_DIR)/libwifix/libwifi*.so* $(1)/usr/lib/
+endef
+
+$(eval $(call BuildPackage,libwifix))

easy-soc-libs/Makefile

@@ -13,7 +13,7 @@ PKG_RELEASE:=1
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=63f749faa67670229a5cbaf39ee0fef92d8276f3
+PKG_SOURCE_VERSION:=0accbd7266b2742ad8921edd5dab974fc384a49a
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/easy-soc-libs.git
 PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@iopsys.eu>
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
@@ -39,6 +39,12 @@ define Package/libwifi/config
   source "$(SOURCE)/Config.in"
 endef
 
+define Package/libeasy
+  $(call Package/easy-soc-libs)
+  TITLE:= Helper and utility functions library (libeasy)
+  DEPENDS+=+libnl +libnl-route
+endef
+
 define Package/libwifi
   $(call Package/easy-soc-libs)
   TITLE:= WiFi library (libwifi)
@@ -88,7 +94,8 @@ endef
 subdirs := \
 	$(if $(CONFIG_PACKAGE_libwifi),libwifi) \
 	$(if $(CONFIG_PACKAGE_libdsl),libdsl) \
-	$(if $(CONFIG_PACKAGE_libethernet),libethernet)
+	$(if $(CONFIG_PACKAGE_libethernet),libethernet) \
+	$(if $(CONFIG_PACKAGE_libeasy),libeasy)
 
 TARGET_CFLAGS += \
 	-I$(STAGING_DIR)/usr/include \
@@ -108,6 +115,13 @@ define Build/Prepare
 endef
 endif
 
+define Build/InstallDev/libeasy
+	$(INSTALL_DIR) $(1)/usr/include
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_BUILD_DIR)/libeasy/easy.h $(1)/usr/include/
+	$(CP) $(PKG_BUILD_DIR)/libeasy/libeasy.so* $(1)/usr/lib/
+endef
+
 define Build/InstallDev/libwifi
 	$(INSTALL_DIR) $(1)/usr/include
 	$(INSTALL_DIR) $(1)/usr/lib
@@ -140,6 +154,11 @@ define Build/InstallDev
 	$(foreach dir,$(subdirs),$(call Build/InstallDev/$(dir),$(1),$(2));)
 endef
 
+define Package/libeasy/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_BUILD_DIR)/libeasy/libeasy.so* $(1)/usr/lib/
+endef
+
 define Package/libwifi/install
 	$(INSTALL_DIR) $(1)/usr/lib
 	$(CP) $(PKG_BUILD_DIR)/libwifi/libwifi*.so* $(1)/usr/lib/
@@ -162,4 +181,4 @@ endef
 $(eval $(call BuildPackage,libwifi))
 $(eval $(call BuildPackage,libdsl))
 $(eval $(call BuildPackage,libethernet))
-$(eval $(call BuildPackage,easy-soc-libs))
+$(eval $(call BuildPackage,libeasy))

endptmngr/Makefile

@@ -29,6 +29,7 @@ RSTRIP:=true
 export BUILD_DIR
 
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+PKG_BUILD_PARALLEL:=1
 
 
 
@@ -42,7 +43,7 @@ define Package/endptmngr
   CATEGORY:=Utilities
   TITLE:=Brcmslic
   URL:=
-  DEPENDS:= +libubox +ubus +libpicoevent @(PACKAGE_bcmkernel||PACKAGE_bcmopen) @TARGET_HAS_VOICE
+  DEPENDS:= +libubox +ubus +libpicoevent +PACKAGE_bcmkernel:bcmkernel +PACKAGE_bcmopen:bcmopen @(PACKAGE_bcmkernel||PACKAGE_bcmopen) @TARGET_HAS_VOICE
 endef
 
 define Package/endptmngr/description

icwmp/Makefile

@@ -8,11 +8,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=icwmp
-PKG_VERSION:=4.0-2019-10-17
+PKG_VERSION:=4.0-2019-12-11
 PKG_FIXUP:=autoreconf
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/icwmp.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=9cfbfa9a381d372643fe18f8c258779bed3ee3bd
+PKG_SOURCE_VERSION:=3fdaca7e3463d46a52f31496b0f84deb6b21eaf8
 PKG_RELEASE=$(PKG_SOURCE_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
@@ -33,45 +33,52 @@ CWMP_REVISION=$(shell svnversion ./src/ -n|cut -f2 -d:)
 include $(INCLUDE_DIR)/package.mk
 
 define Package/icwmp_stun
-	SECTION:=utils
-	CATEGORY:=Utilities
-	TITLE:=TR-069 stun Client
-	DEPENDS:=+libubus +libuci +libubox +libjson-c +libopenssl +libblobmsg-json
+  SECTION:=utils
+  CATEGORY:=Utilities
+  TITLE:=TR-069 stun Client
+  DEPENDS:=+libubus +libuci +libubox +libjson-c +libopenssl +libblobmsg-json
 endef
 
 define Package/icwmp_xmpp
-	SECTION:=utils
-	CATEGORY:=Utilities
-	TITLE:=TR-069 xmpp feature
-	DEPENDS:=+libuci +libubox +libexpat +libstrophe
+  SECTION:=utils
+  CATEGORY:=Utilities
+  TITLE:=TR-069 xmpp feature
+  DEPENDS:=+libuci +libubox +libexpat +libstrophe
 endef
 
 define Package/icwmp_twamp
-	SECTION:=utils
-	CATEGORY:=Utilities
-	TITLE:=TR-069 twamp feature
-	DEPENDS:=+libuci
+  SECTION:=utils
+  CATEGORY:=Utilities
+  TITLE:=TR-069 twamp feature
+  DEPENDS:=+libuci
 endef
 
 define Package/icwmp_udpechoserver
-	SECTION:=utils
-	CATEGORY:=Utilities
-	TITLE:=TR-069 udpechoserver feature
-	DEPENDS:=+libuci
+  SECTION:=utils
+  CATEGORY:=Utilities
+  TITLE:=TR-069 udpechoserver feature
+  DEPENDS:=+libuci
 endef
 
 define Package/icwmp_bulkdata
- SECTION:=utils
- CATEGORY:=Utilities
- TITLE:=TR-069 BulkData Collection
- DEPENDS:=+libubus +libuci +libubox +libjson-c +libcurl +curl +libblobmsg-json +libbbfdm
+  SECTION:=utils
+  CATEGORY:=Utilities
+  TITLE:=TR-069 BulkData Collection
+  DEPENDS:=+libubus +libuci +libubox +libjson-c +libcurl +curl +libblobmsg-json +libbbfdm
+endef
+
+define Package/icwmp-tr098
+  SECTION:=utils
+  CATEGORY:=Utilities
+  TITLE:=CWMP client for TR-098 Data Model
+  DEPENDS:=+libuci +libmicroxml +libubox +jshn +libubus +libblobmsg-json +libpthread +ubusd +shflags +getopt +zlib +libjson-c +libopenssl +curl +libcurl +libtr098
 endef
 
 define Package/icwmp/Default
   SECTION:=utils
   CATEGORY:=Utilities
   TITLE:=CWMP client
-  DEPENDS:=+libuci +libmicroxml +libubox +jshn +libubus +libblobmsg-json +libpthread +ubusd +shflags +getopt +zlib +libjson-c +libopenssl +curl +libbbfdm +libtr098
+  DEPENDS:=+libuci +libmicroxml +libubox +jshn +libubus +libblobmsg-json +libpthread +ubusd +shflags +getopt +zlib +libjson-c +libopenssl +curl +libbbfdm
 endef
 
 define Package/icwmp/description
@@ -103,13 +110,14 @@ define Build/Prepare
 endef
 endif
 
-ifeq ($(CONFIG_TARGET_iopsys_ramips),y)
-TARGET_CFLAGS += -DEX400
-endif
-
 TARGET_CFLAGS += \
 	-D_GNU_SOURCE -D_AADJ
 
+ifeq ($(CONFIG_PACKAGE_icwmp-tr098),y)
+CONFIGURE_ARGS += \
+	--enable-icwmp_tr098
+endif
+
 ifneq ($(CWMP_REVISION)_,_)
 ifneq ($(CWMP_REVISION),exported)
 ifneq ($(CWMP_REVISION),Unversioned directory)
@@ -158,21 +166,10 @@ CONFIGURE_ARGS += \
 	--enable-devel
 endif
 
-ifeq ($(CONFIG_PACKAGE_libtr098),y)
-CONFIGURE_ARGS += \
-	--enable-tr098
-endif
-
-CONFIGURE_ARGS += \
-	--enable-tr181
-
 define Package/icwmp-$(BUILD_VARIANT)/install
 	$(INSTALL_DIR) $(1)/etc/icwmpd
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(CP) $(PKG_BUILD_DIR)/bin/icwmpd $(1)/usr/sbin
-ifeq ($(CONFIG_PACKAGE_libtr098),y)
-	$(CP) $(PKG_BUILD_DIR)/bin/icwmp_tr098d $(1)/usr/sbin
-endif
 	$(INSTALL_DIR) $(1)/etc/config
 	$(INSTALL_CONF) $(PKG_BUILD_DIR)/config/cwmp $(1)/etc/config
 	$(INSTALL_CONF) $(PKG_BUILD_DIR)/config/firewall.cwmp $(1)/etc/firewall.cwmp
@@ -190,6 +187,11 @@ endif
 	$(CP) ./files/* $(1)/
 endef
 
+define Package/icwmp-tr098/install
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(CP) $(PKG_BUILD_DIR)/bin/icwmp_tr098d $(1)/usr/sbin
+endef
+
 define Package/icwmp_stun/install
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bin/icwmp_stund $(1)/usr/sbin/icwmp_stund
@@ -261,3 +263,5 @@ $(eval $(call BuildPackage,icwmp_xmpp))
 $(eval $(call BuildPackage,icwmp_udpechoserver))
 $(eval $(call BuildPackage,icwmp_twamp))
 $(eval $(call BuildPackage,icwmp_bulkdata))
+$(eval $(call BuildPackage,icwmp-tr098))
+$(eval $(call BuildPackage,icwmp-zstream))

ieee1905/Makefile

@@ -5,10 +5,10 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ieee1905
-PKG_VERSION:=1.0.0
+PKG_VERSION:=1.1.0
 
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=a6a39128b1fe5132e51de4f580bf66f373515dcd
+PKG_SOURCE_VERSION:=3008fe46ee9247f0203b3a125fddebadbdd7dcdc
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/ieee1905.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
 
@@ -20,16 +20,21 @@ define Package/ieee1905
   SECTION:=utils
   CATEGORY:=Utilities
   TITLE:=IEEE1905 handler
-  DEPENDS:=+meshcomms +libubox +libubus +libblobmsg-json
+  DEPENDS:= +libwifi +ubox +libpicoevent +libpcap +libopenssl +libuci +libjson-c
 endef
 
 define Package/ieee1905/description
- Listens to ieee1905 messages, parse and expose them over ubus.
+ IEEE1905 stack with extended functionalities.
 endef
 
 TARGET_CFLAGS += \
 	-I$(STAGING_DIR)/usr/include \
-	-D_GNU_SOURCE
+	-D_GNU_SOURCE \
+	-DSEND_EMPTY_TLVS \
+	-DFIX_BROKEN_TLVS \
+	-DSPEED_UP_DISCOVERY \
+	-DREGISTER_EXTENSION_BBF
+	#-DDO_NOT_ACCEPT_UNAUTHENTICATED_COMMANDS \
 
 #define Build/Prepare
 #        $(CP) -rf ./ieee1905/* $(PKG_BUILD_DIR)/
@@ -37,9 +42,16 @@ TARGET_CFLAGS += \
 
 define Package/ieee1905/install
 	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_DIR) $(1)/etc/config
+	$(INSTALL_DIR) $(1)/etc/hotplug.d
+	$(INSTALL_DIR) $(1)/etc/hotplug.d/button
 	$(INSTALL_BIN) ./files/etc/init.d/ieee1905 $(1)/etc/init.d/ieee1905
+	$(INSTALL_BIN) ./files/etc/hotplug.d/button/11-ieee1905 $(1)/etc/hotplug.d/button/11-ieee1905
+	$(INSTALL_DATA) ./files/etc/config/ieee1905 $(1)/etc/config/ieee1905
 	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/ieee1905 $(1)/usr/sbin/
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/ieee1905d $(1)/usr/sbin/
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/libs/*.so $(1)/usr/lib/
 endef
 
 $(eval $(call BuildPackage,ieee1905))

ieee1905/files/etc/config/ieee1905

@@ -0,0 +1,39 @@
+config ieee1905
+        option enabled '1'
+        option debug  true
+
+config meshcomms 'global'
+        option enabled '1'
+        option basemacint 'wan'
+        option mapall true
+#        option registrar 'rai0'
+        option debug_level  2
+        option port  8888
+        option cmdu_event false
+
+#config al-iface
+#        option enabled '1'
+#        option ifname 'br-lan'
+#        option media 'bridge'
+#        option manufacturer_name 'Broadcom'
+#        option model_name 'Eth EG400'
+#        option model_number '00002'
+#        option device_name 'EG400R1'
+
+#config al-iface
+#        option enabled '1'
+#        option ifname 'wl0'
+#        option media 'ap'
+#        option manufacturer_name 'Mediatek'
+#        option model_name 'WIFI EX400'
+#        option model_number '00001'
+#        option device_name 'EX400R0'
+
+#config al-iface
+#        option enabled '1'
+#        option ifname 'wl1'
+#        option media 'ap'
+#        option manufacturer_name 'Mediatek'
+#        option model_name 'WIFI EX400'
+#        option model_number '00001'
+#        option device_name 'EX400R0'

ieee1905/files/etc/hotplug.d/button/11-ieee1905

@@ -0,0 +1,36 @@
+#!/bin/sh
+
+TOPOLOGY_FILE="/tmp/topology_change"
+WPS_FILE="/tmp/virtual_push_button"
+
+handle_topology_change() {
+	[ -f ${TOPOLOGY_FILE} ] && \
+		touch ${TOPOLOGY_FILE}
+}
+
+handle_wps() {
+	[ -f ${WPS_FILE} ] && \
+		touch ${WPS_FILE}
+}
+
+case "$ACTION" in
+	add|register)
+		[ "wifibutton" == "$INTERFACE" -o "ecobutton" == "$INTERFACE" ] && {
+			handle_wps
+		}
+		[ "wifi_2g" == "$INTERFACE" ] && {
+			handle_wps
+		}
+		[ "wifi_5g" == "$INTERFACE" ] && {
+			handle_wps
+		}
+		[ "wpsbutton" == "$INTERFACE" ] && {
+			handle_wps
+		}
+		[ "wpscbutton" == "$INTERFACE" ] && {
+			handle_topology_change
+		}
+        ;;
+        remove|unregister)
+        ;;
+esac

ieee1905/files/etc/init.d/ieee1905

@@ -4,11 +4,184 @@ START=99
 STOP=10
 
 USE_PROCD=1
-PROG=/usr/sbin/ieee1905
+PROG=/usr/sbin/ieee1905d
+MESH_CONF=/tmp/meshcomms.config
+INTERFACE=""
+
+validate_global_section()
+{
+	uci_validate_section ieee1905 meshcomms "${1}" \
+		'enabled:bool:false' \
+		'basemacint:string:wan' \
+		'almac:string' \
+		'registrar:string' \
+		'mapall:bool:true' \
+		'debug_level:uinteger:5' \
+		'port:port:8888' \
+		'cmdu_event:bool:true'
+}
+
+validate_ieee1905_section()
+{
+	uci_validate_section ieee1905 ieee1905 "${1}" \
+		'debug:bool:true' \
+		'enabled:bool:true'
+}
+
+get_device_name() {
+	local device
+	# Get wan L3 interface
+	ubus list |grep -iq network.interface.${1}
+	if [ "$?" -eq 0 ]; then
+		json_load "$(ubus -t 2 call network.interface.${1} status)"
+		json_get_var device device
+		echo ${device}
+	fi
+}
+
+get_interface_mac() {
+	local l3 basemac
+	l3=$(get_device_name ${1})
+	if [ -n ${l3} ]; then
+		json_load "$(ubus -t 2 call network.device status "{\"name\":\"${l3}\"}")"
+		json_get_var basemac macaddr
+	fi
+	local first=0x$(echo $basemac |cut -d : -f 1)
+	local rest=$(echo $basemac |cut -d : -f 2-)
+	# Set local bit
+	first=$((first|2))
+	first=$(printf "%x" $first)
+	basemac="${first}:${rest}"
+	echo ${basemac}
+}
+
+validate_al_section()
+{
+	uci_validate_section ieee1905 al-iface "${1}" \
+		'enabled:bool:false' \
+		'ifname:string' \
+		'media:string:eth' \
+		'manufacturer_name:string:iopsys' \
+		'model_name:string' \
+		'model_number:string' \
+		'device_name:string'
+}
+
+configure_interface()
+{
+	local ifname media enabled manufacturer_name model_name model_number device_name
+	validate_al_section ${1} || {
+		echo "Validation of global section failed"
+		return 1;
+	}
+
+	if [ ${enabled} -eq 0 ]; then
+		return;
+	fi
+
+	if [ -z ${INTERFACE} ]; then
+		INTERFACE=${ifname}
+	else
+		INTERFACE="${INTERFACE},${ifname}"
+	fi
+
+	json_add_object
+	json_add_string ifname ${ifname}
+	json_add_string media ${media}
+	json_add_string manufacturer_name ${manufacturer_name}
+	json_add_string model_name ${model_name}
+	json_add_string model_number ${model_number}
+	json_add_string device_name ${device_name}
+	json_close_object
+}
+
+configure_meshcomms()
+{
+	local enabled almac basemacint mapall debug_level port l3device basemac intf registrar cmdu_event
+
+	validate_global_section global || {
+		echo "Validation of global section failed"
+		return 1;
+	}
+
+	if [ -z ${almac} ]; then
+		basemac=$(get_interface_mac ${basemacint})
+	else
+		basemac=${almac}
+	fi
+
+
+	local fname cname model cUrl
+	fname=$(db get hw.board.boardId)
+	cname=$(db get hw.board.iopVerCustomer)
+	model=$(db get hw.board.routerModel)
+	cUrl="http://192.168.1.1"
+
+	json_init
+	# fill the al-iface info
+	json_add_array al-iface
+	config_foreach configure_interface al-iface
+	json_close_array
+	json_add_object deviceInfo
+	json_add_string friendly_name ${fname}
+	json_add_string manufacturer_name ${cname}
+	json_add_string model ${model}
+	json_add_string control_url ${cUrl}
+	json_close_object
+	json_add_object meshcomms
+	json_add_int enabled ${enabled}
+	json_add_string mac ${basemac}
+	json_add_string interfaces ${INTERFACE}
+	json_add_int map ${mapall}
+	json_add_string registrar ${registrar}
+	json_add_int debug_level ${debug_level}
+	json_add_int port ${port}
+	json_add_int cmdu_event ${cmdu_event}
+	json_close_object
+
+	json_dump >${MESH_CONF}
+
+}
+
+configure_ieee1905()
+{
+	local enabled debug
+
+	validate_ieee1905_section ${1} || {
+		echo "Validation of ieee1905 section failed"
+		exit 1;
+	}
+
+	if [ ${debug} -eq 1 ]; then
+		# Forward stdout of the command to logd
+		procd_set_param stdout 1
+		# Same for stderr
+		procd_set_param stderr 1
+	fi
+
+	if [ ${enabled} -ne 1 ]; then
+		exit 0;
+	fi
+}
+
+configure_network() {
+	[ -f ${MESH_CONF} ] && rm ${MESH_CONF}
+
+	ebtables -L FORWARD|grep -iqE "1:80:C2:(0)+:(0)+:13.*-j.*DROP"
+	if [ "$?" -ne 0 ]; then
+		echo "Applying drop rule to drop pkts forwared by kernel to 1905.1 multicast mac"
+		ebtables -A FORWARD -d 01:80:c2:00:00:13 -j DROP
+	fi
+
+	config_load ieee1905
+	config_foreach configure_ieee1905 ieee1905
+	config_foreach configure_meshcomms meshcomms
+}
 
 start_service() {
-	procd_open_instance
+	procd_open_instance ieee1905
 	procd_set_param command ${PROG}
+	configure_network
 	procd_set_param respawn
 	procd_close_instance
 }
@@ -18,7 +191,7 @@ reload_service() {
 	start
 }
 
-service_triggers()
-{
-	procd_add_config_trigger "config.change" "ieee1905" /etc/init.d/ieee1905 restart
+service_triggers() {
+	procd_add_reload_trigger "network"
+	procd_add_reload_trigger "netmode"
 }

inotify-tools/Makefile

@@ -0,0 +1,60 @@
+#
+# Copyright (C) 2006-2010 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+include $(INCLUDE_DIR)/kernel.mk
+
+PKG_NAME:=inotify-tools
+PKG_VERSION:=3.14
+PKG_RELEASE:=1
+
+PKG_SOURCE_VERSION:=1df9af4d6cd0f4af4b1b19254bcf056aed4ae395
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=https://github.com/rvoicilas/inotify-tools.git
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)-$(PKG_SOURCE_VERSION).tar.gz
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+
+PKG_LICENSE:=GPLv2
+PKG_LICENSE_FILES:=COPYING
+
+# support parallel build
+PKG_BUILD_PARALLEL:=1
+
+#re create configure scripts if not present.
+PKG_FIXUP:=autoreconf
+
+# run install target when cross compiling. basically, make install DESTDIR=$(PKG_INSTALL_DIR)
+# this way we don't need to pick out the resulting files from the build dir.
+PKG_INSTALL:=1
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/inotify-tools
+	CATEGORY:=Utilities
+	TITLE:=Tools to trace filesystem events.
+	URL:=
+endef
+
+define Package/inotify-tools/description
+	Tools to trace filesystem events.
+endef
+
+define Package/inotify-tools/install
+	$(INSTALL_DIR) $(1)/usr
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(INSTALL_DIR) $(1)/usr/lib/
+	$(CP) ./files/* $(1)/
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/libinotifytools.so.0.4.1 $(1)/usr/lib/
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/libinotifytools.so.0 $(1)/usr/lib/
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/libinotifytools.so $(1)/usr/lib/
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/inotifywait $(1)/usr/bin/
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/inotifywatch $(1)/usr/bin/
+endef
+
+$(eval $(call BuildPackage,inotify-tools))

inotify-tools/files/usr/bin/iop_write_monitor

@@ -0,0 +1,13 @@
+#! /bin/sh
+
+# is the real root mounted ?
+if [ ! -f /tmp/inotify_real_root/etc/preinit ]
+then
+	ubivol=$( cat /proc/cmdline  | sed -e "s/.*root=\(ubi:rootfs_.\).*/\1/" )
+	mkdir /tmp/inotify_real_root
+	mount -t ubifs $ubivol /tmp/inotify_real_root
+fi
+
+inotifywait -r -m -e modify -e create -e attrib -e delete -e move /tmp/inotify_real_root
+
+

iop/config

@@ -123,6 +123,8 @@ CONFIG_PACKAGE_wwan=y
 CONFIG_PACKAGE_libwifi=y
 CONFIG_PACKAGE_wifilife=y
 CONFIG_PACKAGE_wifimngr=y
+CONFIG_PACKAGE_libwifix=y
+CONFIG_PACKAGE_wifixd=y
 CONFIG_PACKAGE_xl2tpd=y
 CONFIG_PACKAGE_zoneinfo-core=y
 CONFIG_PACKAGE_zoneinfo-europe=y
@@ -183,10 +185,6 @@ CONFIG_BUSYBOX_CONFIG_FEATURE_TFTP_PUT=y
 # CONFIG_BUSYBOX_CONFIG_PAM is not set
 # CONFIG_BUSYBOX_CONFIG_TFTP_DEBUG is not set
 # CONFIG_BUSYBOX_CONFIG_NTPD is not set
-CONFIG_BUSYBOX_CONFIG_MOUNTPOINT=y
-CONFIG_BUSYBOX_CONFIG_RUN_PARTS=y
-CONFIG_BUSYBOX_CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS=y
-CONFIG_BUSYBOX_CONFIG_FEATURE_RUN_PARTS_FANCY=y
 CONFIG_LIBCURL_CRYPTO_AUTH=y
 # CONFIG_LIBCURL_MBEDTLS is not set
 CONFIG_LIBCURL_OPENSSL=y
@@ -196,5 +194,5 @@ CONFIG_OPENVPN_openssl_ENABLE_IPROUTE2=y
 CONFIG_KERNEL_DEVTMPFS=y
 CONFIG_KERNEL_DEVTMPFS_MOUNT=y
 # CONFIG_BUSYBOX_CONFIG_IP is not set
-LOCAL_MIRROR="http://download.iopsys.eu/iopsys/mirror/"
+CONFIG_LOCALMIRROR="http://download.iopsys.eu/iopsys/mirror/"
 

iop/scripts/cve-check.sh

@@ -1,36 +0,0 @@
-#!/bin/sh
-function cvecheck {
-    CVEDIR="/tmp/cve-indicator/"
-    CVEBIN="${CVEDIR}/bin"
-    REPORTS="reports"
-    mkdir -p $REPORTS
-
-    dpkg -s python3 python3-requests python3-yaml python3-mako python3-six &> /dev/null
-    if [ $? -ne 0 ]
-        then
-            echo "Missing dependencies"
-            sudo apt-get update
-            sudo apt-get install python3 python3-requests python3-yaml python3-mako python3-six
-
-        else
-            echo    "Dependecy check passed"
-    fi
-
-
-if [ -d "$CVEDIR" ]; then
-  ### Take action if $DIR exists ###
-  echo "${CVEDIR} exists running cvecheck"
-else
-  ###  Control will jump here if $DIR does NOT exists ###
-  echo "Error: cvecheck not found. getting from iopsys repo"
-  git clone git@dev.iopsys.eu:iopsys/cve-indicator.git /tmp/cve-indicator
-fi
-  CVEGENLIST=`${CVEBIN}/cve-indicator gen-list openwrt bin`
-  CVEGETCVES=`${CVEBIN}/cve-indicator get-cves $CVEGENLIST --api_url http://cve.circl.lu/api/cvefor/`
-  CVEGETRPRT=`${CVEBIN}/cve-indicator gen-rprt $CVEGETCVES`
-exit 0
-
-}
-
-
-register_command "cvecheck" "Generate a CVE report on latest build"

iop/scripts/extract_core.sh

@@ -6,9 +6,13 @@ function extract_core {
 	topdir=$(pwd)
 
 	# Paths to packages that should be exported.
+	paths+='package/network/services/dnsmasq '
 	paths+='package/network/config/firewall '
 	paths+='package/network/config/netifd '
+	paths+='package/network/config/qos-scripts '
 	paths+='package/utils/busybox '
+	paths+='package/base-files '
+	paths+='package/system/procd '
 	paths+='package/system/rpcd '
 	paths+='package/network/services/openvpn '
 
@@ -20,13 +24,7 @@ function extract_core {
 		echo ""
 		echo "Example: $0 extract_core"
 		echo "  -p package/utils/busybox"
-		echo "  -r feeds/openwrt_core"
-		echo "  -b devel"
-		echo ""
-		echo "Extract all default packages:"
-		echo "$0 extract_core"
-		echo "  -p default"
-		echo "  -r feeds/openwrt_core"
+		echo "  -r feeds/lede_core"
 		echo "  -b devel"
 	}
 

iop/scripts/feeds_update.sh

@@ -28,7 +28,7 @@ function feeds_update {
 
     # replace core packages with iopsys versions
     if [ $override == 1 ]; then
-		./scripts/feeds install -f -p openwrt_core -a
+		./scripts/feeds install -f -p lede_core -a
     fi
 
     # targets need to be installed explicitly

iopupgrade/files/sbin/iopu

@@ -25,7 +25,6 @@ log_stdout=1		# set to 0 to prevent the log to also print to stdout
 upd_noreboot=0		# set to 1 if we should not reboot after programming
 upd_forceimage=0	# set this to force upgrade even if image is for wrong board.
 upd_forceboot=0		# set this to force upgrade of boot loader
-upd_keepconfig=0	# set this to keep the current configuration.
 ###############################################################################
 # import external functions
 source /lib/upgrade/iopsys.sh
@@ -52,41 +51,25 @@ function log {
 # anyhting it calls as stdout/stderr might no longer exist
 function finish {
 
-    if [ $run_cleanup -eq 1 ]
+    if [ "$run_cleanup" == "1" ]
     then
 
 	function_call upd_cleanup
-	run_cleanup=0
 	log ""
     fi
 
-    if [ $run_mount_cleanup -eq 1 ]
+    if [ "$run_mount_cleanup" == "1" ]
     then
 	log "Cleaning up after mount"
 	umount_newroot
     fi
     # always kill the timeout process, will leave the sleep but that is harmless
     # as long as the kill will nerver be run.
-    if [ -n "$TIMEOUT_PID" ]; then
-        kill $TIMEOUT_PID 2>/dev/null
-        TIMEOUT_PID=""
-    fi
+    kill $TIMEOUT_PID 2>/dev/null
 
     lock -u /tmp/iopu.lock
 }
 
-function ctrl_c {
-
-    # on ctrl-c we remove the exit handler as it is called directly.
-    trap - EXIT
-
-    # call cleanup function
-    finish
-
-    # do not continue program
-    exit 1
-}
-
 function sig_pipe {
     log_stdout=0  # stdin,stdout,stderr do not exist anymore
     log "Got sigpipe. Turning of log printing to stdout"
@@ -94,6 +77,7 @@ function sig_pipe {
 
 # if a timout happens terminate
 function timeout {
+    finish
     exit 1
 }
 
@@ -149,7 +133,6 @@ function umount_newroot {
     umount /tmp/newroot_overlay/rom
     umount /tmp/newroot_overlay
     umount /tmp/newroot
-    rmdir /tmp/newroot_overlay /tmp/newroot
     run_mount_cleanup=0
 }
 
@@ -158,23 +141,11 @@ function usage {
     echo ""
     echo "opts:"
     echo ""
-    echo "	-n		Do not do the final reboot of the target board"
-    echo "	-c		Keep configuration"
-    echo "	-x		Force install even if firmware is not for this board"
-    echo "	-b		Force install of bootloader regardless of version installed"
-    echo "	-r		Jump into chroot env of other system"
-    echo "	-C \"command\"	Execute command in chroot env of other system"
-}
-
-# Execute command in newroot(other system root)
-function newroot_exec {
-
-    upd_vol=$(get_flashbank_next)
-    mount_newroot
-    (ENV=/sbin/iopu_chroot_env chroot /tmp/newroot_overlay "$@")
-    echo ""
-    umount_newroot
-
+    echo "	-n	Do not do the final reboot of the target board"
+    echo "	-c	Keep configuration"
+    echo "	-x	Force install even if firmware is not for this board"
+    echo "	-b	Force install of bootloader regardless of version installed"
+    echo "	-r	Jump into chroot env of other system"
 }
 
 ###############################################################################
@@ -190,11 +161,10 @@ then
 fi
 
 trap finish EXIT
-trap ctrl_c INT
 trap timeout SIGALRM
 trap sig_pipe SIGPIPE
 
-while getopts "nrxbhcC:" opt; do
+while getopts "nrxbh" opt; do
     case $opt in
 	n)
 	    upd_noreboot=1
@@ -205,16 +175,13 @@ while getopts "nrxbhcC:" opt; do
 	b)
 	    upd_forceboot=1
 	    ;;
-	c)
-	    upd_keepconfig=1
-	    ;;
 	r)
-	    newroot_exec /bin/sh
-	    exit
-	    ;;
-	C)
-	    newroot_exec "${OPTARG}"
-	    exit
+	    upd_vol=$(get_flashbank_next)
+	    mount_newroot
+	    (ENV=/sbin/iopu_chroot_env chroot /tmp/newroot_overlay /bin/sh)
+	    echo ""
+	    umount_newroot
+	    exit 0
 	    ;;
 	h)
 	    usage
@@ -226,7 +193,8 @@ done
 # put a timeout on this if it takes longer than 120 seconds we should abort
 # and clean up
 (
-	sleep 120 && kill -ALRM $$ 2>/dev/null		# send it a SIGALRM signal
+sleep 120	# if 2 minutes pass
+kill -ALRM $$	2>/dev/null # send it a SIGALRM signal
 )&
 TIMEOUT_PID=$!
 
@@ -243,7 +211,7 @@ fi
 cur_vol=$(get_flashbank_current)
 upd_vol=$(get_flashbank_next)
 
-# convert volume name "rootfs_$upd_vol" into ubi volume id
+# convert volume name "rootfs_$upd_vol" into ubifs volume id
 upd_ubi_id=$(ubinfo -d 0 -N rootfs_$upd_vol | awk "/Volume ID:/ {print \$3}")
 log "installing Root Fileystem into UBI volume rootfs_$upd_vol"
 
@@ -259,32 +227,29 @@ function_call upd_conf_kernel
 log "now starting writing data to flash with [ iopupgrade $cmdline -M "$cmdline_match" -u ubi0_$upd_ubi_id ]"
 run_cleanup=1	# When we start to actually write data there might be some
 		# things that need cleanup if we get an error/crash
-if ! iopupgrade $cmdline -M "$cmdline_match" -u ubi0_$upd_ubi_id; then
-	log "iopupgrade program Failed"
-	exit 1
+iopupgrade $cmdline -M "$cmdline_match" -u ubi0_$upd_ubi_id
+
+# in case of any error we abort
+if [ $? -ne 0 ]; then
+    log "iopupgrade program Failed"
+    exit 1
 fi
 
 log "Firmware programmed to flash."
 
+
+log "Transfering configuration to new system."
+
 # Force upgrade of boot loader
 [ $upd_forceboot -eq 1 ] && chroot_cmdline="$chroot_cmdline -b"
 
-if [ $upd_keepconfig -eq 1 ]; then
-	log "Transfering configuration to new system."
-	chroot_cmdline="$chroot_cmdline -c"
-fi
-
 mount_newroot
-if ! chroot /tmp/newroot_overlay /sbin/iopu_chroot $chroot_cmdline; then
-	log "Configuration migration failed!"
-	exit 1
-fi
+chroot /tmp/newroot_overlay /sbin/iopu_chroot $chroot_cmdline
 umount_newroot
 
-log "New firmware fully installed."
+log "Update fully installed."
 run_cleanup=0
 
-
 # Now make sure that we actually boot the new system on the next reboot
 upd_finnish
 
@@ -306,3 +271,8 @@ else
 fi
 
 
+
+
+
+
+

iopupgrade/files/sbin/iopu_chroot

@@ -14,7 +14,6 @@
 # by functions declared in this script
 upd_forceboot=0
 log_stdout=1		# set to 0 to prevent the log to also print to stdout
-upd_keepconfig=0	# set this to keep the current configuration.
 
 ###############################################################################
 # import external functions
@@ -25,36 +24,33 @@ source /lib/upgrade/iopsys.sh
 
 # only call function if it exists
 function_call() {
-	if [ -n "$1" ] && type "$1" 2>/dev/null >/dev/null
-	then
-		$1 "$@" || exit
-	fi
+    if type "$1" 2>/dev/null >/dev/null
+    then
+	$1 $@
+    fi
 }
 # Cleanup and error handling functions.
 function log {
-	TIME=$(date)
-	[ $log_stdout -eq 1 ] && echo "$@"
-	echo "[$TIME] $@" >>/root/upd_log
+    TIME=$(date)
+    [ $log_stdout -eq 1 ] && echo "$@"
+    echo "[$TIME] $@" >>/root/upd_log
 }
 
 
-while getopts "hbc" opt; do
-	case $opt in
-		h)
-			upd_usage
-			exit 1
-			;;
-		c)
-			upd_keepconfig=1
-			;;
-		b)
-			upd_forceboot=1
-			;;
-		\?)
-			echo "Invalid option: -$OPTARG" >&2
-			exit 1
-			;;
-	esac
+while getopts "hb" opt; do
+    case $opt in
+	h)
+	    upd_usage
+	    exit 1
+	    ;;
+	b)
+	    upd_forceboot=1
+	    ;;
+	\?)
+	    echo "Invalid option: -$OPTARG" >&2
+	    exit 1
+	    ;;
+    esac
 done
 
 # copy old install log over
@@ -63,9 +59,3 @@ cp /tmp/oldroot/tmp/upd_log /root/upd_log
 # Upgrade boot loader if needed.
 function_call upd_program_boot
 
-# Let the new upgrade do whatever it needs,
-# such as configuration migration etc.
-if [ $upd_keepconfig -eq 1 -a -x /lib/upgrade/post-rootfs-fixup ]; then
-	(/lib/upgrade/post-rootfs-fixup /dev/null /tmp/oldroot) || exit
-fi
-

json-editor/Makefile

@@ -17,7 +17,7 @@ include $(INCLUDE_DIR)/cmake.mk
 define Package/json-editor
   SECTION:=base
   CATEGORY:=Libraries
-  DEPENDS:=+libjson-c +libblobmsg-json
+  DEPENDS:=+libjson-c +libblobmsg_json
   TITLE:=JSON-editor
 endef
 

libmicroxml/Makefile

@@ -1,56 +0,0 @@
-#
-# Copyright (C) 2012-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=libmicroxml
-PKG_VERSION:=2012-06-11
-PKG_RELEASE=$(PKG_SOURCE_VERSION)
-
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=git://dev.freecwmp.org/microxml
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=72965423184f24cc0b963d91c2d1863cdb01b6aa
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
-PKG_LICENSE:=LGPL-2.0
-PKG_LICENSE_FILES:=COPYING
-
-PKG_FIXUP:=autoreconf
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/libmicroxml
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE:=XML library
-  MAINTAINER:=Luka Perkov <luka@openwrt.org>
-endef
-
-define Package/libmicroxml/description
- A micro sized XML library
-endef
-
-CONFIGURE_ARGS += \
-	--disable-threads \
-	--enable-static \
-	--enable-shared
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include
-	$(CP) $(PKG_BUILD_DIR)/microxml.h $(1)/usr/include
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/libmicroxml.so* $(1)/usr/lib
-	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
-	$(CP) $(PKG_BUILD_DIR)/microxml.pc $(1)/usr/lib/pkgconfig
-endef
-
-define Package/libmicroxml/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/libmicroxml.so* $(1)/usr/lib
-endef
-
-$(eval $(call BuildPackage,libmicroxml))

libmicroxml/patches/100-fix-memleak.patch

@@ -1,130 +0,0 @@
-diff --git a/mxml-file.c b/mxml-file.c
-index 02eca9d..f10d202 100644
---- a/mxml-file.c
-+++ b/mxml-file.c
-@@ -363,9 +363,12 @@ mxmlSaveFile(mxml_node_t    *node,	/* I - Node to write */
-   * Write the node...
-   */
- 
--  if ((col = mxml_write_node(node, fp, cb, 0, mxml_file_putc, global)) < 0)
-+  if ((col = mxml_write_node(node, fp, cb, 0, mxml_file_putc, global)) < 0){
-+    global_free(global);
-     return (-1);
--
-+  }
-+  
-+  global_free(global);
-   if (col > 0)
-     if (putc('\n', fp) < 0)
-       return (-1);
-@@ -1448,6 +1451,7 @@ mxml_load_data(
-   if ((buffer = malloc(64)) == NULL)
-   {
-     mxml_error("Unable to allocate string buffer!");
-+    global_free(global);
-     return (NULL);
-   }
- 
-@@ -2083,11 +2087,12 @@ mxml_load_data(
- 		 node->parent ? node->parent->value.element.name : "(null)");
- 
-       mxmlDelete(first);
--
-+      global_free(global);
-       return (NULL);
-     }
-   }
- 
-+  global_free(global);
-   if (parent)
-     return (parent);
-   else
-@@ -2102,7 +2107,7 @@ error:
-   mxmlDelete(first);
- 
-   free(buffer);
--
-+  global_free(global);
-   return (NULL);
- }
- 
-diff --git a/mxml-private.c b/mxml-private.c
-index 4378ca3..ea6e452 100644
---- a/mxml-private.c
-+++ b/mxml-private.c
-@@ -41,6 +41,32 @@
-  * This code currently supports AIX, HP-UX, Linux, Mac OS X, Solaris, and
-  * Windows.  It might work on the BSDs and IRIX, but I haven't tested that.
-  */
-+void *global_mem[16] = {0};
-+
-+static void *global_calloc(int x, int size)
-+{
-+  int i;
-+  void *m = calloc(x, size);
-+  for (i = ((sizeof(global_mem)/sizeof(global_mem[0])) - 1); i > 0; i--) {
-+    global_mem[i] = global_mem[i-1];
-+  }
-+  global_mem[0] = m;
-+  return m;
-+}
-+
-+void global_free(void *m)
-+{
-+  int i;
-+  if (m == NULL)
-+    return;
-+  for (i = ((sizeof(global_mem)/sizeof(global_mem[0])) - 1); i >= 0; i--) {
-+    if (global_mem[i] == m) {
-+      global_mem[i] = NULL;
-+      free(m);
-+      break;
-+    }
-+  }
-+}
- 
- #if defined(__sun) || defined(_AIX)
- #  pragma fini(_mxml_fini)
-@@ -148,7 +174,6 @@ mxml_real_cb(mxml_node_t *node)		/* I - Current node */
-   return (MXML_REAL);
- }
- 
--
- #ifdef HAVE_PTHREAD_H			/**** POSIX threading ****/
- #  include <pthread.h>
- 
-@@ -190,7 +215,6 @@ _MXML_FINI(void)
-   }
- }
- 
--
- /*
-  * '_mxml_global()' - Get global data.
-  */
-@@ -205,7 +229,7 @@ _mxml_global(void)
- 
-   if ((global = (_mxml_global_t *)pthread_getspecific(_mxml_key)) == NULL)
-   {
--    global = (_mxml_global_t *)calloc(1, sizeof(_mxml_global_t));
-+    global = (_mxml_global_t *)global_calloc(1, sizeof(_mxml_global_t));
-     pthread_setspecific(_mxml_key, global);
- 
-     global->num_entity_cbs = 1;
-@@ -288,7 +312,7 @@ _mxml_global(void)
- 
-   if ((global = (_mxml_global_t *)TlsGetValue(_mxml_tls_index)) == NULL)
-   {
--    global = (_mxml_global_t *)calloc(1, sizeof(_mxml_global_t));
-+    global = (_mxml_global_t *)global_calloc(1, sizeof(_mxml_global_t));
- 
-     global->num_entity_cbs = 1;
-     global->entity_cbs[0]  = _mxml_entity_cb;
-diff --git a/mxml-private.h b/mxml-private.h
-index c591208..72ed338 100644
---- a/mxml-private.h
-+++ b/mxml-private.h
-@@ -43,3 +43,4 @@ typedef struct _mxml_global_s
- extern _mxml_global_t	*_mxml_global(void);
- extern int		_mxml_entity_cb(const char *name);
- 
-+extern void global_free(void *m);

librpc/Makefile

@@ -1,33 +0,0 @@
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=librpc
-PKG_RELEASE=1
-
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL=$(LEDE_GIT)/project/librpc-uclibc.git
-PKG_SOURCE_DATE:=2015-11-04
-PKG_SOURCE_VERSION:=a921e3ded051746f9f7cd5e5a312fb6771716aac
-PKG_MIRROR_HASH:=22c8dc55e1c4e8e31635a37708a3ce622a6ca33ebd918a4321b0be6ffce89b21
-CMAKE_INSTALL:=1
-PKG_USE_MIPS16:=0
-
-PKG_LICENSE:=LGPL-2.1
-PKG_LICENSE_FILES:=
-
-PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
-
-include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/cmake.mk
-
-define Package/librpc
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE:=uClibc RPC library
-endef
-
-define Package/librpc/install
-	$(INSTALL_DIR) $(1)/lib/
-	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/librpc.so $(1)/lib/
-endef
-
-$(eval $(call BuildPackage,librpc))

meshcomms/Makefile

@@ -5,10 +5,10 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=meshcomms
-PKG_VERSION:=1.0.1
+PKG_VERSION:=1.0.2
 
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=8d5808d81d1fc96e4ce4ee682847b4de15b46224
+PKG_SOURCE_VERSION:=72048b609104a5479ac2cdae21d5d1f733fd2bc3
 PKG_SOURCE_URL:=https://dev.iopsys.eu/fork/meshcomms.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
 
@@ -17,12 +17,6 @@ PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_LICENSE:=BSD2+Patent
 PKG_LICENSE_FILES:=LICENSE
 
-PLATFORM := linux
-FLAVOUR  := iopsys
-
-export PLATFORM
-export FLAVOUR
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/meshcomms
@@ -39,14 +33,8 @@ endef
 
 TARGET_CFLAGS += \
 	-I$(STAGING_DIR)/usr/include \
-	-D_GNU_SOURCE \
-        -DDO_NOT_ACCEPT_UNAUTHENTICATED_COMMANDS
-
-ifneq ($(CONFIG_BIG_ENDIAN),)
-TARGET_CFLAGS += -D_HOST_IS_BIG_ENDIAN_=1
-else
-TARGET_CFLAGS += -D_HOST_IS_LITTLE_ENDIAN_=1
-endif
+	-D_GNU_SOURCE
+#        -DDO_NOT_ACCEPT_UNAUTHENTICATED_COMMANDS
 
 #define Build/Prepare
 #        $(CP) -rf ./meshcomms/* $(PKG_BUILD_DIR)/
@@ -54,11 +42,26 @@ endif
 
 define Package/meshcomms/install
 	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(INSTALL_DIR) $(STAGING_DIR)/usr/lib
+	$(INSTALL_DIR) $(STAGING_DIR)/usr/include
+	$(INSTALL_DIR) $(STAGING_DIR)/usr/include/meshcomms
+	$(INSTALL_DIR) $(STAGING_DIR)/usr/include/meshcomms/common
+	$(INSTALL_DIR) $(STAGING_DIR)/usr/include/meshcomms/bbf
+	$(INSTALL_DIR) $(STAGING_DIR)/usr/include/meshcomms/al
+	$(INSTALL_DIR) $(STAGING_DIR)/usr/include/meshcomms/factory
 	$(INSTALL_DIR) $(1)/etc/init.d
 	$(INSTALL_DIR) $(1)/etc/config
 	$(INSTALL_CONF) ./files/meshcomms.conf $(1)/etc/config/meshcomms
 	$(INSTALL_BIN) ./files/meshcomms.init $(1)/etc/init.d/meshcomms
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/output/al_entity $(1)/usr/sbin/
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/output/libmeshcomms.so $(1)/usr/lib
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/output/libmeshcomms.so $(STAGING_DIR)/usr/lib
+	$(CP) $(PKG_BUILD_DIR)/include/meshcomms.h $(STAGING_DIR)/usr/include/meshcomms/
+	$(CP) $(PKG_BUILD_DIR)/src/common/interfaces/*.h $(STAGING_DIR)/usr/include/meshcomms/
+	$(CP) $(PKG_BUILD_DIR)/src/factory/interfaces/*.h $(STAGING_DIR)/usr/include/meshcomms/
+	$(CP) $(PKG_BUILD_DIR)/src/factory/interfaces/extensions/bbf/*.h $(STAGING_DIR)/usr/include/meshcomms/
+	$(CP) $(PKG_BUILD_DIR)/src/al/internal_interfaces/*.h $(STAGING_DIR)/usr/include/meshcomms/
 endef
 
 $(eval $(call BuildPackage,meshcomms))

mt7603/Makefile

@@ -1,291 +0,0 @@
-# All rights reserved.
-# See LICENSE for more information.
-
-include $(TOPDIR)/rules.mk
-include $(INCLUDE_DIR)/kernel.mk
-
-PKG_NAME:=mt7603e
-PKG_VERSION:=4.1.2.0_20190222
-PKG_RELEASE:=1
-
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=git@dev.iopsys.eu:mediatek/mt7603.git
-PKG_SOURCE_VERSION:=4e94b2c3f45b7d5374ed988cdad925d5ca30b838
-#PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
-#PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-
-PKG_KCONFIG:= \
-	AP_SUPPORT \
-	RT_FIRST_CARD \
-	RT_SECOND_CARD \
-	RT_FIRST_IF_RF_OFFSET \
-	RT_SECOND_IF_RF_OFFSET \
-	MT_WIFI \
-	WIFI_BASIC_FUNC \
-	MT_WIFI_PATH \
-	FIRST_IF_NONE \
-	FIRST_IF_EEPROM_FLASH \
-	FIRST_IF_EEPROM_EFUSE \
-	RT_FIRST_CARD_EEPROM \
-	SECOND_IF_NONE \
-	SECOND_IF_EEPROM_FLASH \
-	SECOND_IF_EEPROM_PROM \
-	SECOND_IF_EEPROM_EFUSE \
-	RT_SECOND_CARD_EEPROM \
-	MULTI_INF_SUPPORT \
-	WIFI_BASIC_FUNC \
-	WIRELESS_EXT \
-	WEXT_SPY \
-	WEXT_PRIV \
-	DOT11_N_SUPPORT \
-	DOT11_VHT_AC \
-	DOT11_HE_AX \
-	CFG_SUPPORT_FALCON_MURU \
-	CFG_SUPPORT_FALCON_TXCMD_DBG \
-	CFG_SUPPORT_FALCON_SR \
-	WIFI_DRIVER \
-	G_BAND_256QAM_SUPPORT \
-	BRCM_256QAM_SUPPORT \
-	ICAP_SUPPORT \
-	MT_AP_SUPPORT \
-	BACKGROUND_SCAN_SUPPORT \
-	SMART_CARRIER_SENSE_SUPPORT \
-	SCS_FW_OFFLOAD \
-	THERMAL_PROTECT_SUPPORT \
-	MT_DFS_SUPPORT \
-	HDR_TRANS_TX_SUPPORT \
-	CHIP_MT7615E \
-	HDR_TRANS_RX_SUPPORT \
-	SUPPORT_DYNAMIC_TXOP \
-	WSC_INCLUDED \
-	MT_STA_SUPPORT \
-	WSC_V2_SUPPORT \
-	DOT11W_PMF_SUPPORT \
-	PASSPOINT_R2 \
-	TXBF_SUPPORT \
-	IGMP_SNOOP_SUPPORT \
-	RATE_ADAPTION \
-	RATE_ADAPT_AGBS_SUPPORT \
-	RTMP_FLASH_SUPPORT \
-	ATE_SUPPORT \
-	WLAN_SERVICE \
-	UAPSD \
-	RLT_MAC \
-	RLT_BBP \
-	RLT_RF \
-	RTMP_MAC \
-	RTMP_BBP \
-	RTMP_RF \
-	RTMP_PCI_SUPPORT \
-	RTMP_USB_SUPPORT \
-	RTMP_RBUS_SUPPORT \
-	WIFI_MODE_AP \
-	WIFI_MODE_STA \
-	WIRELESS_EXT \
-	WEXT_SPY \
-	WEXT_PRIV \
-	WDS_SUPPORT \
-	MBSS_SUPPORT \
-	APCLI_SUPPORT \
-	APCLI_CERT_SUPPORT \
-	APCLI_CONNECTION_TRIAL \
-	MAC_REPEATER_SUPPORT \
-	RALINK_RT6352 \
-	RALINK_MT7620 \
-	RALINK_MT7603E \
-	CON_WPS_SUPPORT \
-	VOW_SUPPORT \
-	BAND_STEERING \
-	TXOP_ARBITER \
-	CFG_SUPPORT_DYNAMIC_TXOP \
-	WIFI_MODE_BOTH \
-	WIFI_RLT_MAC \
-	RLT_MAC \
-	WIFI_RTMP_MAC \
-	RTMP_MAC \
-	WIFI_MT_MAC \
-	CHIP_MT7603E \
-	CHIP_MT7615E \
-	MT_MAC \
-	RATE_ADAPTION \
-	SUPPORT_OPENWRT \
-	SDK_USER_LIGHTY \
-	MUMIMO_SUPPORT \
-	MU_RA_SUPPORT \
-	LED_CONTROL_SUPPORT \
-	RA_HW_NAT \
-	RA_HW_NAT_WIFI_NEW_ARCH \
-	CFG80211_SUPPORT \
-	SER_SUPPORT \
-	GREENAP_SUPPORT \
-	RADIUS_ACCOUNTING_SUPPORT \
-	TPC_SUPPORT \
-	RLM_CAL_CACHE_SUPPORT \
-	CAL_BIN_FILE_SUPPORT \
-	RF_LOCKDOWN_SUPPORT \
-	PASSPOINT_R2 \
-	RED_SUPPORT \
-	FIRST_IF_EPAELNA \
-	FIRST_IF_IPAILNA \
-	FIRST_IF_IPAELNA \
-	FIRST_IF_EPAILNA \
-	SECOND_IF_EPAELNA \
-	SECOND_IF_IPAILNA \
-	SECOND_IF_IPAELNA \
-	SECOND_IF_EPAILNA \
-	THIRD_IF_EPAELNA \
-	THIRD_IF_IPAILNA \
-	THIRD_IF_IPAELNA \
-	THIRD_IF_EPAILNA \
-	WIFI_PKT_FWD \
-	DOT11K_RRM_SUPPORT \
-	DOT11R_FT_SUPPORT \
-	ENTERPRISE_AP_SUPPORT \
-	WIFI_EAP_FEATURE \
-	RADIUS_MAC_AUTH_SUPPORT \
-	VLAN_SUPPORT \
-	DYNAMIC_VLAN_SUPPORT \
-	CUSTOMISED_HOSTAPD_SUPPORT \
-	APCLI_STA_SUPPORT \
-	WDS_STA_SUPPORT \
-	MBSS_AS_WDS_AP_SUPPORT \
-	MBO_SUPPORT \
-	MAP_SUPPORT \
-	WPA3_SUPPORT \
-	OWE_SUPPORT \
-	WIFI_PKT_FWD_V1 \
-	FIRST_IF_MT7615E \
-	FIRST_IF_MT7622 \
-	FIRST_IF_MT7626 \
-	FIRST_IF_AXE \
-	FIRST_IF_MT7915 \
-	SECOND_IF_MT7615E \
-	SECOND_IF_AXE \
-	THIRD_IF_NONE \
-	THIRD_IF_MT7615E \
-	CHIP_AXE \
-	CHIP_MT7915 \
-	RT_THIRD_CARD \
-	RT_THIRD_IF_RF_OFFSET \
-	THIRD_IF_EEPROM_FLASH \
-	THIRD_IF_EEPROM_PROM \
-	THIRD_IF_EEPROM_EFUSE \
-	RT_THIRD_CARD_EEPROM \
-	SPECTRUM_SUPPORT \
-	PRE_CAL_TRX_SET1_SUPPORT \
-	MWDS \
-	MCAST_RATE_SPECIFIC \
-	WLAN_HOOK \
-	COEX_SUPPORT \
-	EASY_SETUP_SUPPORT \
-	EVENT_NOTIFIER_SUPPORT \
-	AIR_MONITOR \
-	OFFCHANNEL_SCAN_FEATURE \
-	WNM_SUPPORT \
-	INTERWORKING \
-	LINUX_NET_TXQ_SUPPORT \
-	CHIP_MT7622 \
-	CHIP_MT7626 \
-	MEMORY_SHRINK \
-	RPS_EFFICIENCY \
-	WHNAT_SUPPORT \
-	FAST_NAT_SUPPORT \
-	PRE_CAL_TRX_SET2_SUPPORT \
-	LINK_TEST_SUPPORT \
-	TCP_RACK_SUPPORT \
-	FQ_SCH_SUPPORT \
-	BRCM_256QAM_SUPPORT \
-	VHT_TXBF_2G_EPIGRAM_IE_SUPPORT \
-	DSCP_QOS_MAP_SUPPORT \
-	DSCP_PRI_SUPPORT \
-	PCIE_ASPM_DYM_CTRL_SUPPORT \
-	MIN_PHY_RATE_SUPPORT \
-	FAST_UP_RATE_SUPPORT \
-	TXRX_STAT_SUPPORT \
-	VENDOR_FEATURE11_SUPPORT \
-	WIFI_TWT_SUPPORT \
-	SINGLE_SKU \
-	SNIFFER_SUPPORT \
-
-PKG_CONFIG_DEPENDS:=$(foreach c, $(PKG_KCONFIG),$(if $(CONFIG_MTK_$c),CONFIG_$(c)))
-
-include $(INCLUDE_DIR)/package.mk
-
-#TAR_CMD=$(HOST_TAR) -C $(1)/ $(TAR_OPTIONS)
-
-define KernelPackage/mt7603e
-  CATEGORY:=Mediatek drivers
-  TITLE:=WiFi drivers
-  DEPENDS:= +wifi-profile
-ifneq ($(CONFIG_MTK_FAST_NAT_SUPPORT), )
-ifneq ($(CONFIG_NET_MEDIATEK_HNAT), )
-  DEPENDS+=+kmod-mediatek_hnat
-endif
-endif
-  FILES:=$(PKG_BUILD_DIR)/mt7603_wifi_ap/mt7603e.ko
-  AUTOLOAD:=$(call AutoProbe, mt7603e)
-  MENU:=1
-endef
-
-define KernelPackage/mt7603e/config
-	source "$(SOURCE)/globalconfig.in"
-endef
-
-## check following
-#CONFIG_MT7603E_HOTSPOT=y (depends on missing WAPP_SUPPORT)
-#CONFIG_MT7603E_MBO_SUPPORT=y
-#CONFIG_MT7603E_MAP_SUPPORT=y
-#CONFIG_MT7603E_TXBF_SUPPORT=y (undef -DVHT_TXBF_SUPPORT)
-#CONFIG_MT7603E_ACL_V2_SUPPORT=y (build error)
-#CONFIG_MT7603E_DFS_SUPPORT=y (unnecessary)
-#CONFIG_MT7603E_SINGLE_SKU_V2=y  (fix: get_single_sku_path())
-#CONFIG_MT7603E_WDS_SUPPORT=y ( incomplete? )
-#CONFIG_MT7603E_BTCOEX_CONCURRENT=y (undefined)
-
-NOSTDINC_FLAGS := -DCONFIG_SECOND_IF_MT7615E -DCONFIG_FIRST_IF_MT7603E
-
-
-define Build/Compile
-	+$(MAKE) $(PKG_JOBS) -C "$(LINUX_DIR)" \
-		$(KERNEL_MAKE_FLAGS) V=1 \
-		NOSTDINC_FLAGS="$(NOSTDINC_FLAGS)" \
-		SUBDIRS="$(PKG_BUILD_DIR)/mt7603_wifi_ap" \
-		$(foreach c, $(PKG_KCONFIG),$(if $(CONFIG_MTK_$c),CONFIG_$(c)=$(CONFIG_MTK_$(c)))) \
-		CONFIG_SUPPORT_OPENWRT=y CONFIG_MT_AP_SUPPORT=m CONFIG_CHIP_MT7603E=y CONFIG_MT_MAC=y \
-		CONFIG_FIRST_IF_MT7603E=y CONFIG_SECOND_IF_MT7615E=y \
-		CONFIG_RT_FIRST_IF_RF_OFFSET=0x0 CONFIG_RT_SECOND_IF_RF_OFFSET=0x8000 \
-		CONFIG_MT7603E_RALINK_MT7603E=y \
-		CONFIG_MT_MAC=y \
-		CONFIG_MT7603E_RTMP_PCI_SUPPORT=y \
-		CONFIG_MT7603E_NEW_RATE_ADAPT_SUPPORT=y CONFIG_MT7603E_AGS_SUPPORT=y \
-		CONFIG_MT7603E_UAPSD=y CONFIG_MT7603E_MT_MAC=y \
-		CONFIG_MT7603E_WSC_INCLUDED=y CONFIG_MT7603E_WSC_V2_SUPPORT=y \
-		CONFIG_MT7603E_DOT11W_PMF_SUPPORT=y \
-		CONFIG_MT7603E_DOT11N_DRAFT3=y \
-		CONFIG_MT7603E_DOT11R_FT_SUPPORT=y \
-		CONFIG_MT7603E_DOT11K_RRM_SUPPORT=y \
-		CONFIG_MT7603E_WNM_SUPPORT=y \
-		CONFIG_MT7603E_INTERWORKING=y \
-		CONFIG_MT7603E_IGMP_SNOOP_SUPPORT=y \
-		CONFIG_MT7603E_LED_CONTROL_SUPPORT=y \
-		CONFIG_MT7603E_MBSS_SUPPORT=y \
-		CONFIG_MT7603E_APCLI_SUPPORT=y \
-		CONFIG_MT7603E_MULTI_APCLI_SUPPORT=y \
-		CONFIG_MT7603E_MAC_REPEATER_SUPPORT=y \
-		CONFIG_MT7603E_ATE_SUPPORT=y \
-		CONFIG_MT7603E_BAND_STEERING_7603=y \
-		CONFIG_MT7603E_MULTI_INF_SUPPORT=y \
-		CONFIG_MT7603E_WPA3_SUPPORT=y \
-		CONFIG_MT7603E_OWE_SUPPORT=y \
-		CONFIG_MT7603E_SECURITY_IMPROVEMENT_SUPPORT=y \
-		CONFIG_MT7603E_NEW_BW2040_COEXIST_SUPPORT=y \
-		CONFIG_MT7603E_RLT_AP_SUPPORT=m \
-		modules
-endef
-
-define KernelPackage/mt7603e/install
-	true
-endef
-
-$(eval $(call KernelPackage,mt7603e))

mt7603/ap.config.in

@@ -1,317 +0,0 @@
-config MTK_MT_AP_SUPPORT
-	bool
-	default y
-	depends on MTK_WIFI_MODE_AP
-
-if MTK_MT_AP_SUPPORT
-
-config MTK_WDS_SUPPORT
-	bool "WDS"
-	depends on MTK_MT_AP_SUPPORT
-	default y
-
-config MTK_MBSS_SUPPORT
-	bool "Multi-BSS (MBSSID)"
-	depends on MTK_MT_AP_SUPPORT
-	default y
-
-config MTK_APCLI_SUPPORT
-	bool "AP-Client Support"
-	depends on MTK_MT_AP_SUPPORT
-	default y
-
-config MTK_APCLI_CERT_SUPPORT
-	bool "AP-Client TGn Cert Support"
-	depends on MTK_MT_AP_SUPPORT
-	depends on MTK_APCLI_SUPPORT
-        default n
-
-config MTK_MAC_REPEATER_SUPPORT
-	bool "MAC Repeater Support"
-	depends on MTK_MT_AP_SUPPORT
-	depends on MTK_APCLI_SUPPORT
-	default y
-
-config MTK_APCLI_CONNECTION_TRIAL
-        bool "AP-Client Trial Connection"
-        depends on MTK_MT_AP_SUPPORT
-        depends on MTK_APCLI_SUPPORT
-        default n
-
-config MTK_MWDS
-	bool "Mixed WDS (MWDS)"
-	depends on MTK_MT_AP_SUPPORT
-	select MTK_APCLI_SUPPORT
-	default n
-
-config MTK_MUMIMO_SUPPORT
-        bool "MU-MIMO Support"
-        depends on MTK_WIFI_DRIVER
-        select MTK_MU_RA_SUPPORT
-        default y
-
-config MTK_MU_RA_SUPPORT
-  	bool "MU-RGA Support"
-  	depends on MTK_MUMIMO_SUPPORT
-
-config MTK_DOT11R_FT_SUPPORT
-	bool "IEEE 802.11r Fast BSS Transition"
-	depends on MTK_MT_AP_SUPPORT
-	default n
-
-config MTK_DOT11K_RRM_SUPPORT
-	bool "IEEE 802.11k Radio Resource Management"
-	depends on MTK_MT_AP_SUPPORT
-	default n
-
-config MTK_IGMP_SNOOP_SUPPORT
-	bool "IGMP snooping (for multicast --> unicast)"
-	depends on MTK_WIFI_DRIVER
-	depends on MTK_MT_AP_SUPPORT
-	default y
-
-config MTK_OFFCHANNEL_SCAN_FEATURE
-	bool "Off-Channel scan support (Channel Quality Monitor)"
-	depends on MTK_WIFI_DRIVER
-	depends on MTK_MT_AP_SUPPORT
-	default n
-
-config MTK_SNIFFER_SUPPORT
-	bool "Sniffer support"
-	depends on MTK_MT_AP_SUPPORT
-	default n
-
-config MTK_ENTERPRISE_AP_SUPPORT
-	bool "Enterprise AP Support"
-	depends on MTK_MT_AP_SUPPORT
-	default n
-
-config MTK_WIFI_EAP_FEATURE
-	bool "EAP Feature"
-	depends on MTK_WIFI_DRIVER
-	default y
-
-config MTK_RADIUS_MAC_AUTH_SUPPORT
-        bool "RADIUS MAC Auth Support"
-        depends on MTK_ENTERPRISE_AP_SUPPORT
-        depends on MTK_CFG80211_SUPPORT
-        default n
-
-config MTK_VLAN_SUPPORT
-	bool "VLAN Support"
-	depends on MTK_MT_AP_SUPPORT
-	depends on MTK_ENTERPRISE_AP_SUPPORT
-	default n
-
-config MTK_DYNAMIC_VLAN_SUPPORT
-	bool "Dynamic VLAN Support"
-	depends on MTK_MT_AP_SUPPORT
-	depends on MTK_ENTERPRISE_AP_SUPPORT
-	default n
-
-config MTK_CFG80211_SUPPORT
-	bool "Linux CFG80211 support"
-	depends on MTK_MT_AP_SUPPORT
-	default n
-
-#CUSTOMISED HOSTAPD
-config MTK_CUSTOMISED_HOSTAPD_SUPPORT
-	bool "Customised Hostapd Support"
-	depends on MTK_MT_AP_SUPPORT
-	depends on MTK_CFG80211_SUPPORT
-	default n
-
-#APCLI STA
-config MTK_APCLI_STA_SUPPORT
-	bool "APCLI STA Support"
-	depends on MTK_APCLI_SUPPORT
-	depends on MTK_CFG80211_SUPPORT
-	default n
-
-#WDS STA
-config MTK_WDS_STA_SUPPORT
-	bool "WDS STA Support"
-	depends on MTK_APCLI_SUPPORT
-	depends on MTK_CFG80211_SUPPORT
-	default n
-
-#WDS AP
-config MTK_MBSS_AS_WDS_AP_SUPPORT
-	bool "MBSS as WDS AP Support"
-	depends on MTK_MT_AP_SUPPORT
-	depends on MTK_MBSS_SUPPORT
-	default n
-
-config MTK_DSCP_QOS_MAP_SUPPORT
-	bool "Dscp Qos Mapping Support"
-	depends on MTK_MT_AP_SUPPORT
-	default n
-
-config MTK_DSCP_PRI_SUPPORT
-	bool "Dscp Priority Mapping Support"
-	depends on MTK_MT_AP_SUPPORT
-	default n
-
-config MTK_MIN_PHY_RATE_SUPPORT
-        bool "Minimum PHY rate support"
-        depends on MTK_MT_AP_SUPPORT
-        default n
-
-config MTK_FAST_UP_RATE_SUPPORT
-        bool "Fast UP rate support"
-        depends on MTK_MT_AP_SUPPORT
-        default n
-
-config MTK_CON_WPS_SUPPORT
-	bool "Concurrent WPS Support"
-	depends on MTK_MT_AP_SUPPORT
-	depends on MTK_APCLI_SUPPORT
-	depends on MTK_WSC_INCLUDED
-	depends on MTK_WSC_V2_SUPPORT
-	default n
-
-config MTK_MCAST_RATE_SPECIFIC
-	bool "User specific tx rate of mcast pkt"
-	depends on MTK_MT_AP_SUPPORT
-	default y
-
-config MTK_VOW_SUPPORT
-	bool "MediaAir (VOW) support"
-	depends on MTK_MT_AP_SUPPORT
-	default y
-
-config MTK_BAND_STEERING
-	bool "Band Steering"
-	depends on MTK_MT_AP_SUPPORT
-	default y
-
-config MTK_LED_CONTROL_SUPPORT
-	bool "LED Control Support"
-	default n
-
-config MTK_WLAN_HOOK
-       bool "WLAN hook Support"
-       depends on MTK_WIFI_DRIVER
-       default n
-
-config MTK_RADIUS_ACCOUNTING_SUPPORT
-	bool "Radius Accounting Support"
-	depends on MTK_MT_AP_SUPPORT
-	default n
-
-config MTK_GREENAP_SUPPORT
-	bool "GreenAP Support"
-	depends on MTK_MT_AP_SUPPORT
-	default y
-
-config MTK_TXRX_STAT_SUPPORT
-	bool "Tx/Rx Stats Support"
-	depends on MTK_WIFI_DRIVER
-	default n
-
-config MTK_VENDOR_FEATURE11_SUPPORT
-        bool "Enable Vendor-11 Features"
-        depends on MTK_WIFI_DRIVER
-        depends on MTK_MT_AP_SUPPORT
-        default n
-
-config MTK_PCIE_ASPM_DYM_CTRL_SUPPORT
-	bool "Pcie Aspm Dynamic Control Support"
-	depends on MTK_MT_AP_SUPPORT
-	default y
-
-config MTK_COEX_SUPPORT
-	bool "Coex Support"
-	depends on MTK_MT_AP_SUPPORT
-	default n
-
-config MTK_EASY_SETUP_SUPPORT
-	bool "Whole Home Coverage - Easy Setup"
-	depends on MTK_MT_AP_SUPPORT
-	default n
-
-config MTK_EVENT_NOTIFIER_SUPPORT
-	bool "Whole Home Coverage - Event Notifier"
-	depends on MTK_MT_AP_SUPPORT
-	default n
-
-config MTK_AIR_MONITOR
-        bool "Air Monitor"
-        depends on MTK_MT_AP_SUPPORT
-        default n
-
-config MTK_WNM_SUPPORT
-        bool "IEEE 802.11v WNM Support"
-        depends on MTK_MT_AP_SUPPORT
-        default n
-
-config MTK_INTERWORKING
-        bool "IEEE 802.11u Interworking"
-        depends on MTK_MT_AP_SUPPORT
-        default n
-
-config MTK_LINUX_NET_TXQ_SUPPORT
-	bool "NET TX Queue Support"
-	default n
-
-config  MTK_WPA3_SUPPORT
-        bool "WPA3 Support"
-        depends on MTK_MT_AP_SUPPORT
-        default y
-
-config  MTK_OWE_SUPPORT
-        bool "Enhanced Open Support"
-        depends on MTK_MT_AP_SUPPORT
-        default n
-
-config  MTK_SINGLE_SKU
-        bool "Single SKU Support"
-        depends on MTK_MT_AP_SUPPORT
-        default n
-
-config MTK_ICAP_SUPPORT
-	bool "ICAP Support"
-	depends on MTK_WIFI_DRIVER
-	depends on MTK_MT_AP_SUPPORT
-	default y
-
-config MTK_SPECTRUM_SUPPORT
-	bool "Wifi Spectrum Mgmt Support"
-	depends on MTK_WIFI_DRIVER
-	depends on MTK_MT_AP_SUPPORT
-	default y
-
-config MTK_FTM_SUPPORT
-	bool "FTM Support"
-	depends on MTK_WIFI_DRIVER
-	select MTK_PASSPOINT_R2
-	default n
-
-config MTK_PASSPOINT_R2
-	bool "Passpoint Release-2 Support"
-	depends on MTK_WIFI_DRIVER
-	select MTK_DOT11W_PMF_SUPPORT
-	depends on MTK_MT_AP_SUPPORT
-	default n
-
-config MTK_MBO_SUPPORT
-        bool "MBO Support"
-        depends on MTK_WIFI_DRIVER
-        select MTK_INTERWORKING
-        select MTK_WNM_SUPPORT
-        select MTK_DOT11K_RRM_SUPPORT
-        select MTK_DOT11R_FT_SUPPORT
-        select MTK_DOT11W_PMF_SUPPORT
-        default n
-
-config MTK_MAP_SUPPORT
-        bool "Multi-AP (MAP) Support"
-        depends on MTK_WIFI_DRIVER
-        select MTK_INTERWORKING
-        select MTK_WNM_SUPPORT
-        select MTK_DOT11K_RRM_SUPPORT
-        select MTK_DOT11R_FT_SUPPORT
-        select MTK_DOT11W_PMF_SUPPORT
-        default n
-
-endif  #MTK_MT_AP_SUPPORT

mt7603/common.config.in

@@ -1,250 +0,0 @@
-#mtk wifi common optiions
-
-menu "Common WiFi options"
-
-config MTK_WIFI_BASIC_FUNC
-	bool "Linux Wireless Extension support (for iwconfig, iwpriv etc.)"
-	select MTK_WIRELESS_EXT
-	select MTK_WEXT_SPY
-	select MTK_WEXT_PRIV
-
-config MTK_DOT11_N_SUPPORT
-	bool "IEEE 802.11n support"
-	default y
-
-config MTK_DOT11_VHT_AC
-	bool "IEEE 802.11ac support"
-	depends on MTK_DOT11_N_SUPPORT
-	default y
-
-config MTK_DOT11_HE_AX
-	bool "IEEE 802.11ax support"
-	depends on MTK_DOT11_VHT_AC
-	depends on MTK_CHIP_AXE || MTK_CHIP_MT7915
-	default y
-
-config MTK_CFG_SUPPORT_FALCON_MURU
-	bool "MURU support"
-	depends on MTK_DOT11_VHT_AC
-	depends on MTK_CHIP_AXE || MTK_CHIP_MT7915
-	default y
-
-config MTK_CFG_SUPPORT_FALCON_TXCMD_DBG
-	bool "TXCMD DBG support"
-	depends on MTK_WIFI_DRIVER
-	depends on MTK_DOT11_VHT_AC
-	depends on MTK_CHIP_AXE || MTK_CHIP_MT7915
-	default y
-
-config MTK_CFG_SUPPORT_FALCON_SR
-	bool "Spatial Reuse (SR) support"
-	depends on MTK_WIFI_DRIVER
-	depends on MTK_CHIP_MT7915
-	default y
-
-config MTK_WIFI_TWT_SUPPORT
-	bool "Target Wake Time (TWT) support"
-	depends on MTK_WIFI_DRIVER
-	depends on MTK_DOT11_HE_AX
-	depends on MTK_CHIP_AXE || MTK_CHIP_MT7915
-	default y
-
-config MTK_G_BAND_256QAM_SUPPORT
-	bool "2.4G 256-QAM support"
-	depends on MTK_WIFI_DRIVER
-	depends on MTK_DOT11_VHT_AC
-        default y
-
-config MTK_BRCM_256QAM_SUPPORT
-	bool "BRCM 2.4G 256-QAM support"
-	depends on MTK_WIFI_DRIVER
-	depends on MTK_G_BAND_256QAM_SUPPORT
-	default n
-
-config MTK_VHT_TXBF_2G_EPIGRAM_IE_SUPPORT
-	bool "BRCM 2.4G VHT Sounding support"
-	depends on MTK_WIFI_DRIVER
-	default n
-
-config MTK_MT_DFS_SUPPORT
-	bool "IEEE 802.11h DFS Support"
-	depends on MTK_WIFI_DRIVER
-	default y
-
-config MTK_TPC_SUPPORT
-	bool "IEEE 802.11h TPC Support"
-	depends on MTK_WIFI_DRIVER
-	default y
-
-config MTK_BACKGROUND_SCAN_SUPPORT
-	bool "Background Scan Support"
-	depends on MTK_WIFI_DRIVER
-	default y
-
-config MTK_SMART_CARRIER_SENSE_SUPPORT
-	bool "Smart Carrier Sense Support"
-	depends on MTK_WIFI_DRIVER
-	default y
-
-config MTK_THERMAL_PROTECT_SUPPORT
-        bool "Thermal Protection"
-        depends on MTK_WIFI_DRIVER && MTK_SMART_CARRIER_SENSE_SUPPORT
-        default n
-
-config MTK_SCS_FW_OFFLOAD
-        bool "SCS Fw Offload Support"
-        depends on MTK_WIFI_DRIVER && MTK_SMART_CARRIER_SENSE_SUPPORT
-        default n
-
-config MTK_HDR_TRANS_TX_SUPPORT
-	bool "Tx Header Translation"
-	depends on MTK_CHIP_MT7615E || MTK_CHIP_MT7622 || MTK_CHIP_MT7626 || MTK_CHIP_AXE || MTK_CHIP_MT7915
-	default y
-
-config MTK_HDR_TRANS_RX_SUPPORT
-	bool "Rx Header Translation"
-	depends on MTK_CHIP_MT7615E || MTK_CHIP_MT7622 || MTK_CHIP_MT7626 || MTK_CHIP_AXE || MTK_CHIP_MT7915
-	default y
-
-config MTK_DBDC_MODE
-	bool "Dual-Band Dual-Concurrent (DBDC) mode support"
-	depends on MTK_CHIP_MT7615E || MTK_CHIP_MT7626 || MTK_CHIP_MT7915
-	select MULTI_PROFILE_SUPPORT
-	select DEFAULT_5G_PROFILE
-	default y
-
-config MTK_MULTI_PROFILE_SUPPORT
-        bool "Multi Profile Support"
-        depends on MTK_DBDC_MODE
-        default n
-
-config MTK_DEFAULT_5G_PROFILE
-	bool "5G default profile for DBDC"
-	depends on MTK_DBDC_MODE
-	default y
-
-config MTK_WSC_INCLUDED
-	bool "WiFi Simple Config (WSC) or WPS"
-	depends on MTK_WIFI_DRIVER
-	depends on MTK_MT_AP_SUPPORT || MTK_MT_STA_SUPPORT
-	default y
-
-config MTK_WSC_V2_SUPPORT
-	bool "WiFi Simple Config ver.2 (WPS 2.0)"
-	depends on MTK_WIFI_DRIVER
-	depends on MTK_MT_AP_SUPPORT || MTK_MT_STA_SUPPORT
-	default y
-
-config MTK_DOT11W_PMF_SUPPORT
-	bool "IEEE 802.11w PMF support"
-	depends on MTK_WIFI_DRIVER
-	depends on MTK_MT_AP_SUPPORT || MTK_MT_STA_SUPPORT
-	default y
-
-config MTK_TXBF_SUPPORT
-	bool "Tx Beam Forming Support"
-	depends on MTK_WIFI_DRIVER
-	default y
-
-config MTK_FAST_NAT_SUPPORT
-       bool "Fast-NAT support"
-       default n
-
-config MTK_WHNAT_SUPPORT
-	tristate "Wifi Hardware NAT support"
-	depends on MTK_CHIP_MT7615E || MTK_CHIP_MT7915
-	depends on MTK_WLAN_HOOK
-	depends on MTK_FAST_NAT_SUPPORT
-	depends on PACKAGE_kmod-hw_nat || PACKAGE_kmod-mediatek_hnat
-	default n
-
-#config CARRIER_DETECTION_SUPPORT
-#	bool "Carrier Detect"
-#	depends on WIFI_DRIVER
-#	default n
-
-config MTK_MEMORY_SHRINK
-	bool "Memory Shrink"
-	depends on MTK_WIFI_DRIVER && MTK_CHIP_MT7626
-	default n
-
-config MTK_RPS_EFFICIENCY
-	bool "RPS Efficiency"
-	depends on MTK_WIFI_DRIVER && MTK_CHIP_MT7626
-	default n
-
-config MTK_RTMP_FLASH_SUPPORT
-	bool "Platform's Flash APIs Support"
-	depends on MTK_WIFI_DRIVER
-	default y
-
-config MTK_PRE_CAL_TRX_SET1_SUPPORT
-	bool "Calibration To Flash/BinFile Support"
-	depends on MTK_WIFI_DRIVER
-	default y
-
-config MTK_RLM_CAL_CACHE_SUPPORT
-	bool "Rlm Calibration Cache Support"
-	depends on MTK_WIFI_DRIVER
-	default y
-
-config MTK_PRE_CAL_TRX_SET2_SUPPORT
-	bool "Pre-calibration to Flash Support"
-	depends on MTK_WIFI_DRIVER
-	default y
-
-config MTK_CAL_BIN_FILE_SUPPORT
-	bool "Calibration to BinFile Support"
-	depends on MTK_WIFI_DRIVER
-	default y
-
-config MTK_RF_LOCKDOWN_SUPPORT
-	bool "RF Lockdown Support"
-	depends on MTK_WIFI_DRIVER
-	default n
-
-config MTK_LINK_TEST_SUPPORT
-	bool "Link Test Support"
-	depends on MTK_WIFI_DRIVER
-	default n
-
-config MTK_ATE_SUPPORT
-	bool "ATE/QA Support"
-	depends on MTK_WIFI_DRIVER
-	default y
-
-config MTK_WLAN_SERVICE
-        bool "Wlan Service Library Support"
-        depends on MTK_WIFI_DRIVER
-        default n
-
-config MTK_UAPSD
-	bool "UAPSD support"
-	depends on MTK_WIFI_DRIVER
-	depends on MTK_MT_AP_SUPPORT || MTK_MT_STA_SUPPORT
-	default y
-
-config MTK_TCP_RACK_SUPPORT
-	bool "TCP Reduced ACK  support"
-	depends on MTK_WIFI_DRIVER
-	default n
-
-config MTK_RED_SUPPORT
-        bool "RED (Random Early Drop) support"
-	depends on MTK_WIFI_DRIVER
-	depends on MTK_MT_AP_SUPPORT || MTK_MT_STA_SUPPORT
-        default n
-
-config MTK_FQ_SCH_SUPPORT
-        bool "Fair Queueing support"
-        depends on MTK_WIFI_DRIVER
-        depends on MTK_MT_AP_SUPPORT && MTK_VOW_SUPPORT
-        depends on MTK_CHIP_MT7622
-        default y
-
-config MTK_FDB_SUPPORT
-       bool "FW Debug Port"
-       depends on MTK_WIFI_DRIVER
-       default n
-
-endmenu

mt7603/config.in

@@ -1,250 +0,0 @@
-# Kconfig for mtk wifi
-
-config MTK_WIFI_DRIVER
-	bool
-	default y
-	depends on PACKAGE_kmod-mt7615 || PACKAGE_kmod-mt7603
-	select MTK_SUPPORT_OPENWRT
-	select MTK_MT_WIFI
-	select MTK_WIFI_BASIC_FUNC
-
-if MTK_WIFI_DRIVER
-
-menu "First WiFi card"
-choice
-	prompt "Choose First WiFi card"
-	default MTK_FIRST_IF_MT7603E
-
-	config MTK_FIRST_IF_NONE
-	bool "None"
-
-	config MTK_FIRST_IF_MT7603E
-	bool "MT7603E"
-	select RALINK_MT7603E
-	select MTK_WIFI_MT_MAC
-	select MTK_MT_MAC
-	select MTK_CHIP_MT7603E
-
-	config MTK_FIRST_IF_MT7615E
-	bool "MT7615E"
-	select MTK_WIFI_MT_MAC
-	select MTK_MT_MAC
-	select MTK_CHIP_MT7615E
-
-endchoice
-
-config  MTK_RT_FIRST_CARD
-        int
-        depends on ! MTK_FIRST_IF_NONE
-        default 7603 if MTK_FIRST_IF_MT7603E
-	default 7615 if MTK_FIRST_IF_MT7615E
-
-config MTK_MT_WIFI_PATH_FIRST_CARD
-	string "WiFi driver build directory name"
-	default "rlt_wifi"
-
-config  MTK_RT_FIRST_IF_RF_OFFSET
-        hex "RF offset of 1st card"
-        depends on ! MTK_FIRST_IF_NONE
-        default 0x0
-
-#prompt "WiFi detailed options for 1st card"
-
-choice
-	prompt "EEPROM Type of 1st Card"
-	depends on ! MTK_FIRST_IF_NONE
-	default MTK_FIRST_IF_EEPROM_EFUSE
-
-	config MTK_FIRST_IF_EEPROM_FLASH
-	bool "FLASH"
-
-	config MTK_FIRST_IF_EEPROM_PROM
-	bool "EEPROM"
-
-	config MTK_FIRST_IF_EEPROM_EFUSE
-	bool "EFUSE"
-
-endchoice
-
-config MTK_RT_FIRST_CARD_EEPROM
-	string
-	depends on ! MTK_FIRST_IF_NONE
-	default "prom" if MTK_FIRST_IF_EEPROM_PROM
-	default "efuse" if MTK_FIRST_IF_EEPROM_EFUSE
-	default "flash" if MTK_FIRST_IF_EEPROM_FLASH
-
-choice
-	prompt "PA/LNA Type of 1st Card"
-	depends on ! MTK_FIRST_IF_NONE
-	default MTK_FIRST_IF_IPAILNA
-
-	config MTK_FIRST_IF_EPAELNA
-	bool "ePAeLNA"
-	config MTK_FIRST_IF_IPAILNA
-	bool "iPAiLNA"
-	config MTK_FIRST_IF_IPAELNA
-	bool "iPAeLNA"
-endchoice
-
-menu "Operation Modes for 1st card"
-choice
-	prompt "Operating mode"
-	default MTK_WIFI_MODE_AP
-
-	config MTK_WIFI_MODE_AP
-	bool "AP"
-
-	config MTK_WIFI_MODE_STA
-	bool "STA"
-
-	config MTK_WIFI_MODE_BOTH
-	bool "AP+STA"
-	#select MTK_MT_STA_SUPPORT
-endchoice
-
-source "ap.config.in"
-
-endmenu
-endmenu
-### endmenu for 1st wifi card #######
-
-#### menu starts for 2nd wifi card ###
-menu "Second WiFi card"
-
-choice
-	prompt "Choose Second WiFi card"
-	default MTK_SECOND_IF_MT7615E
-
-	config MTK_SECOND_IF_NONE
-	bool "None"
-
-	config MTK_SECOND_IF_MT7603E
-	bool "MT7603E"
-	select RALINK_MT7603E
-	select MTK_WIFI_MT_MAC
-	select MTK_MT_MAC
-	select MTK_CHIP_MT7603E
-
-	config MTK_SECOND_IF_MT7615E
-	bool "MT7615E"
-	select MTK_WIFI_MT_MAC
-	select MTK_MT_MAC
-	select MTK_CHIP_MT7615E
-endchoice
-
-config  MTK_RT_SECOND_CARD
-        int
-        depends on ! MTK_SECOND_IF_NONE
-        default 7603 if MTK_SECOND_IF_MT7603E
-	default 7615 if MTK_SECOND_IF_MT7615E
-
-config MTK_MT_WIFI_PATH_SECOND_CARD
-	string "WiFi driver build directory name"
-	default "mt_wifi"
-
-config  MTK_RT_SECOND_IF_RF_OFFSET
-        hex "RF offset of 2nd card"
-        depends on ! MTK_SECOND_IF_NONE
-        default 0x8000
-
-#prompt "WiFi detailed options for 2nd card"
-
-choice
-	prompt "EEPROM Type of 2nd Card"
-	depends on ! MTK_SECOND_IF_NONE
-	default MTK_SECOND_IF_EEPROM_EFUSE
-
-	config MTK_SECOND_IF_EEPROM_FLASH
-	bool "FLASH"
-
-	config MTK_SECOND_IF_EEPROM_PROM
-	bool "EEPROM"
-
-	config MTK_SECOND_IF_EEPROM_EFUSE
-	bool "EFUSE"
-endchoice
-
-config MTK_RT_SECOND_CARD_EEPROM
-	string
-	depends on ! MTK_SECOND_IF_NONE
-	default "prom" if MTK_SECOND_IF_EEPROM_PROM
-	default "efuse" if MTK_SECOND_IF_EEPROM_EFUSE
-	default "flash" if MTK_SECOND_IF_EEPROM_FLASH
-
-
-choice
-        prompt "PA/LNA Type of 2nd Card"
-	depends on ! MTK_SECOND_IF_NONE
-	default MTK_SECOND_IF_IPAILNA
-
-	config MTK_SECOND_IF_EPAELNA
-	bool "ePAeLNA"
-	config MTK_SECOND_IF_IPAILNA
-	bool "iPAiLNA"
-	config MTK_SECOND_IF_IPAELNA
-	bool "iPAeLNA"
-endchoice
-
-
-menu "Operation Modes for 2nd card"
-choice
-	prompt "Operating mode"
-	default MTK_WIFI_MODE_AP
-
-	config MTK_WIFI_MODE_AP
-	bool "AP"
-
-	config MTK_WIFI_MODE_STA
-	bool "STA"
-
-	config MTK_WIFI_MODE_BOTH
-	bool "AP+STA"
-endchoice
-
-source "ap.config.in"
-
-endmenu
-
-endmenu
-### endmenu for 2nd wifi card #######
-
-
-#### placeholder for 3rd wifi card ###
-config MTK_THIRD_IF_NONE
-	bool
-	default y
-
-config  MTK_RT_THIRD_CARD
-        int
-	default 0
-
-config  MTK_RT_THIRD_IF_RF_OFFSET
-        hex
-	default 0x4000
-
-config MTK_RT_THIRD_CARD_EEPROM
-	string
-	default "efuse"
-### placehlder for 3rd wifi card #######
-
-
-config MTK_MULTI_INF_SUPPORT
-	bool
-	default y if !MTK_FIRST_IF_NONE && !MTK_SECOND_IF_NONE
-
-
-source "common.config.in"
-
-#if MTK_CHIP_MT7615E || MTK_CHIP_MT7622 || MTK_CHIP_MT7626 || MTK_CHIP_AXE || MTK_CHIP_MT7915
-#	config MTK_MT_MAC
-#		bool
-#		default y
-#		select MTK_RATE_ADAPTION
-#		select MTK_RATE_ADAPT_AGBS_SUPPORT
-#		select MTK_DOT11_N_SUPPORT
-#		select MTK_DOT11_VHT_AC
-#		select MTK_HDR_TRANS_TX_SUPPORT
-#		select MTK_HDR_TRANS_RX_SUPPORT
-#endif
-
-endif #MTK_WIFI_DRIVER#

mt7603/globalconfig.in

@@ -1,250 +0,0 @@
-# Kconfig for mtk wifi
-
-config MTK_WIFI_DRIVER
-	bool
-	default y
-	depends on (PACKAGE_kmod-mt7615e || PACKAGE_kmod-mt7603e)
-	select MTK_SUPPORT_OPENWRT
-	select MTK_MT_WIFI
-	select MTK_WIFI_BASIC_FUNC
-
-if MTK_WIFI_DRIVER
-
-menu "First WiFi card"
-choice
-	prompt "Choose First WiFi card"
-	default MTK_FIRST_IF_MT7603E
-
-	config MTK_FIRST_IF_NONE
-	bool "None"
-
-	config MTK_FIRST_IF_MT7603E
-	bool "MT7603E"
-	select RALINK_MT7603E
-	select MTK_WIFI_MT_MAC
-	select MTK_MT_MAC
-	select MTK_CHIP_MT7603E
-
-	config MTK_FIRST_IF_MT7615E
-	bool "MT7615E"
-	select MTK_WIFI_MT_MAC
-	select MTK_MT_MAC
-	select MTK_CHIP_MT7615E
-
-endchoice
-
-config  MTK_RT_FIRST_CARD
-        int
-        depends on ! MTK_FIRST_IF_NONE
-        default 7603 if MTK_FIRST_IF_MT7603E
-	default 7615 if MTK_FIRST_IF_MT7615E
-
-config MTK_MT_WIFI_PATH_FIRST_CARD
-	string "WiFi driver build directory name"
-	default "rlt_wifi"
-
-config  MTK_RT_FIRST_IF_RF_OFFSET
-        hex "RF offset of 1st card"
-        depends on ! MTK_FIRST_IF_NONE
-        default 0x0
-
-#prompt "WiFi detailed options for 1st card"
-
-choice
-	prompt "EEPROM Type of 1st Card"
-	depends on ! MTK_FIRST_IF_NONE
-	default MTK_FIRST_IF_EEPROM_EFUSE
-
-	config MTK_FIRST_IF_EEPROM_FLASH
-	bool "FLASH"
-
-	config MTK_FIRST_IF_EEPROM_PROM
-	bool "EEPROM"
-
-	config MTK_FIRST_IF_EEPROM_EFUSE
-	bool "EFUSE"
-
-endchoice
-
-config MTK_RT_FIRST_CARD_EEPROM
-	string
-	depends on ! MTK_FIRST_IF_NONE
-	default "prom" if MTK_FIRST_IF_EEPROM_PROM
-	default "efuse" if MTK_FIRST_IF_EEPROM_EFUSE
-	default "flash" if MTK_FIRST_IF_EEPROM_FLASH
-
-choice
-	prompt "PA/LNA Type of 1st Card"
-	depends on ! MTK_FIRST_IF_NONE
-	default MTK_FIRST_IF_IPAILNA
-
-	config MTK_FIRST_IF_EPAELNA
-	bool "ePAeLNA"
-	config MTK_FIRST_IF_IPAILNA
-	bool "iPAiLNA"
-	config MTK_FIRST_IF_IPAELNA
-	bool "iPAeLNA"
-endchoice
-
-menu "Operation Modes for 1st card"
-choice
-	prompt "Operating mode"
-	default MTK_WIFI_MODE_AP
-
-	config MTK_WIFI_MODE_AP
-	bool "AP"
-
-	config MTK_WIFI_MODE_STA
-	bool "STA"
-
-	config MTK_WIFI_MODE_BOTH
-	bool "AP+STA"
-	#select MTK_MT_STA_SUPPORT
-endchoice
-
-source "ap.config.in"
-
-endmenu
-endmenu
-### endmenu for 1st wifi card #######
-
-#### menu starts for 2nd wifi card ###
-menu "Second WiFi card"
-
-choice
-	prompt "Choose Second WiFi card"
-	default MTK_SECOND_IF_MT7615E
-
-	config MTK_SECOND_IF_NONE
-	bool "None"
-
-	config MTK_SECOND_IF_MT7603E
-	bool "MT7603E"
-	select RALINK_MT7603E
-	select MTK_WIFI_MT_MAC
-	select MTK_MT_MAC
-	select MTK_CHIP_MT7603E
-
-	config MTK_SECOND_IF_MT7615E
-	bool "MT7615E"
-	select MTK_WIFI_MT_MAC
-	select MTK_MT_MAC
-	select MTK_CHIP_MT7615E
-endchoice
-
-config  MTK_RT_SECOND_CARD
-        int
-        depends on ! MTK_SECOND_IF_NONE
-        default 7603 if MTK_SECOND_IF_MT7603E
-	default 7615 if MTK_SECOND_IF_MT7615E
-
-config MTK_MT_WIFI_PATH_SECOND_CARD
-	string "WiFi driver build directory name"
-	default "mt_wifi"
-
-config  MTK_RT_SECOND_IF_RF_OFFSET
-        hex "RF offset of 2nd card"
-        depends on ! MTK_SECOND_IF_NONE
-        default 0x8000
-
-#prompt "WiFi detailed options for 2nd card"
-
-choice
-	prompt "EEPROM Type of 2nd Card"
-	depends on ! MTK_SECOND_IF_NONE
-	default MTK_SECOND_IF_EEPROM_EFUSE
-
-	config MTK_SECOND_IF_EEPROM_FLASH
-	bool "FLASH"
-
-	config MTK_SECOND_IF_EEPROM_PROM
-	bool "EEPROM"
-
-	config MTK_SECOND_IF_EEPROM_EFUSE
-	bool "EFUSE"
-endchoice
-
-config MTK_RT_SECOND_CARD_EEPROM
-	string
-	depends on ! MTK_SECOND_IF_NONE
-	default "prom" if MTK_SECOND_IF_EEPROM_PROM
-	default "efuse" if MTK_SECOND_IF_EEPROM_EFUSE
-	default "flash" if MTK_SECOND_IF_EEPROM_FLASH
-
-
-choice
-        prompt "PA/LNA Type of 2nd Card"
-	depends on ! MTK_SECOND_IF_NONE
-	default MTK_SECOND_IF_IPAILNA
-
-	config MTK_SECOND_IF_EPAELNA
-	bool "ePAeLNA"
-	config MTK_SECOND_IF_IPAILNA
-	bool "iPAiLNA"
-	config MTK_SECOND_IF_IPAELNA
-	bool "iPAeLNA"
-endchoice
-
-
-menu "Operation Modes for 2nd card"
-choice
-	prompt "Operating mode"
-	default MTK_WIFI_MODE_AP
-
-	config MTK_WIFI_MODE_AP
-	bool "AP"
-
-	config MTK_WIFI_MODE_STA
-	bool "STA"
-
-	config MTK_WIFI_MODE_BOTH
-	bool "AP+STA"
-endchoice
-
-source "ap.config.in"
-
-endmenu
-
-endmenu
-### endmenu for 2nd wifi card #######
-
-
-#### placeholder for 3rd wifi card ###
-config MTK_THIRD_IF_NONE
-	bool
-	default y
-
-config  MTK_RT_THIRD_CARD
-        int
-	default 0
-
-config  MTK_RT_THIRD_IF_RF_OFFSET
-        hex
-	default 0x4000
-
-config MTK_RT_THIRD_CARD_EEPROM
-	string
-	default "efuse"
-### placehlder for 3rd wifi card #######
-
-
-config MTK_MULTI_INF_SUPPORT
-	bool
-	default y if !MTK_FIRST_IF_NONE && !MTK_SECOND_IF_NONE
-
-
-source "common.config.in"
-
-#if MTK_CHIP_MT7615E || MTK_CHIP_MT7622 || MTK_CHIP_MT7626 || MTK_CHIP_AXE || MTK_CHIP_MT7915
-#	config MTK_MT_MAC
-#		bool
-#		default y
-#		select MTK_RATE_ADAPTION
-#		select MTK_RATE_ADAPT_AGBS_SUPPORT
-#		select MTK_DOT11_N_SUPPORT
-#		select MTK_DOT11_VHT_AC
-#		select MTK_HDR_TRANS_TX_SUPPORT
-#		select MTK_HDR_TRANS_RX_SUPPORT
-#endif
-
-endif #MTK_WIFI_DRIVER#

mt7603/patches/001-mt7603e-initial-iopsys-port.patch

@@ -1,191 +0,0 @@
-diff -uprN a/mt7603_wifi/common/cmm_info.c b/mt7603_wifi/common/cmm_info.c
---- a/mt7603_wifi/common/cmm_info.c	2019-02-22 10:01:55.000000000 +0100
-+++ b/mt7603_wifi/common/cmm_info.c	2019-12-08 21:47:48.553113878 +0100
-@@ -132,7 +132,7 @@ INT Set_DriverVersion_Proc(RTMP_ADAPTER
- {
- #ifdef CONFIG_AP_SUPPORT
- 	IF_DEV_CONFIG_OPMODE_ON_AP(pAd)
--		DBGPRINT(RT_DEBUG_OFF, ("Driver version-%s %s %s\n", AP_DRIVER_VERSION, __DATE__, __TIME__));
-+		DBGPRINT(RT_DEBUG_OFF, ("Driver version-%s\n", AP_DRIVER_VERSION));
- 		DBGPRINT(RT_DEBUG_OFF, ("Driver Patch\n"));
- 		DBGPRINT(RT_DEBUG_OFF, ("001 : 4AC + MGMT PSE queue pkt stuck detect & AP tr_entry is memory currupted\n"));
- 		DBGPRINT(RT_DEBUG_OFF, ("002 : wifi_forward support\n"));
-diff -uprN a/mt7603_wifi/os/linux/rt_linux.c b/mt7603_wifi/os/linux/rt_linux.c
---- a/mt7603_wifi/os/linux/rt_linux.c	2019-02-22 10:01:39.000000000 +0100
-+++ b/mt7603_wifi/os/linux/rt_linux.c	2019-12-08 22:16:27.246150818 +0100
-@@ -47,8 +47,8 @@
- #endif
- 
- #if defined(CONFIG_RA_HW_NAT) || defined(CONFIG_RA_HW_NAT_MODULE)
--#include "../../../../../../../../net/nat/hw_nat/ra_nat.h"
--#include "../../../../../../../../net/nat/hw_nat/frame_engine.h"
-+#include <../net/nat/hw_nat/ra_nat.h>
-+#include <../net/nat/hw_nat/frame_engine.h>
- #endif
- 
- /* TODO */
-@@ -855,18 +855,27 @@ void RtmpOSFileSeek(RTMP_OS_FD osfd, int
- int RtmpOSFileRead(RTMP_OS_FD osfd, char *pDataPtr, int readLen)
- {
- 	/* The object must have a read method */
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 19, 0)
- 	if (osfd->f_op && osfd->f_op->read) {
- 		return osfd->f_op->read(osfd, pDataPtr, readLen, &osfd->f_pos);
--	} else {
--		DBGPRINT(RT_DEBUG_ERROR, ("no file read method\n"));
--		return -1;
-+#else
-+		if (osfd->f_mode & FMODE_CAN_READ) {
-+			return __vfs_read(osfd, pDataPtr, readLen,&osfd->f_pos);
-+#endif
-+		} else {
-+			DBGPRINT(RT_DEBUG_ERROR, ("no file read method\n"));
-+			return -1;
-+		}
- 	}
--}
- 
- 
- int RtmpOSFileWrite(RTMP_OS_FD osfd, char *pDataPtr, int writeLen)
- {
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 1, 0)
- 	return osfd->f_op->write(osfd, pDataPtr, (size_t) writeLen, &osfd->f_pos);
-+#else
-+	return __vfs_write(osfd, pDataPtr, (size_t) writeLen, &osfd->f_pos);
-+#endif
- }
- 
- 
-diff -uprN a/mt7603_wifi/os/linux/rt_proc.c b/mt7603_wifi/os/linux/rt_proc.c
---- a/mt7603_wifi/os/linux/rt_proc.c	2019-02-22 10:01:39.000000000 +0100
-+++ b/mt7603_wifi/os/linux/rt_proc.c	2019-12-08 21:47:48.553113878 +0100
-@@ -61,7 +61,7 @@ int wl_proc_exit(void);
- #endif /* PROCREG_DIR */
- 
- #ifdef CONFIG_PROC_FS
--extern struct proc_dir_entry *procRegDir;
-+struct proc_dir_entry *procRegDir;
- 
- #ifdef VIDEO_TURBINE_SUPPORT
- extern BOOLEAN UpdateFromGlobal;
-diff -uprN a/mt7603_wifi/os/linux/rt_profile.c b/mt7603_wifi/os/linux/rt_profile.c
---- a/mt7603_wifi/os/linux/rt_profile.c	2019-02-22 10:01:39.000000000 +0100
-+++ b/mt7603_wifi/os/linux/rt_profile.c	2019-12-09 10:27:49.609507632 +0100
-@@ -30,8 +30,8 @@
- #endif
- 
- #if defined (CONFIG_RA_HW_NAT)  || defined (CONFIG_RA_HW_NAT_MODULE)
--#include "../../../../../../../../net/nat/hw_nat/ra_nat.h"
--#include "../../../../../../../../net/nat/hw_nat/frame_engine.h"
-+#include <../net/nat/hw_nat/ra_nat.h>
-+#include <../net/nat/hw_nat/frame_engine.h>
- #endif
- 
- 
-@@ -689,7 +689,11 @@ NDIS_STATUS	RTMPReadParametersHook(RTMP_
- 		{
- #ifndef OS_ABL_SUPPORT
- 			// TODO: need to roll back when convert into OSABL code
--				 fsize = (ULONG)srcf->f_dentry->d_inode->i_size;
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 19, 0)
-+				fsize = (ULONG)srcf->f_dentry->d_inode->i_size;
-+#else
-+				fsize = (ULONG)srcf->f_path.dentry->d_inode->i_size;
-+#endif
- 				if (buf_size < (fsize + 1))
- 					buf_size = fsize + 1;
- #endif /* OS_ABL_SUPPORT */
-diff -uprN a/mt7603_wifi_ap/Makefile b/mt7603_wifi_ap/Makefile
---- a/mt7603_wifi_ap/Makefile	2019-02-22 10:01:27.000000000 +0100
-+++ b/mt7603_wifi_ap/Makefile	2019-12-08 21:52:10.253012796 +0100
-@@ -16,6 +16,90 @@ DRV_NAME = mt7603_wifi
- RT_WIFI_DIR = ../mt7603_wifi
- endif
- 
-+ifeq ($(CONFIG_SUPPORT_OPENWRT),y)
-+###EXTRA_CFLAGS += -DCONFIG_SUPPORT_OPENWRT
-+ifneq ($(CONFIG_RT_FIRST_CARD),)
-+EXTRA_CFLAGS += -DCONFIG_RT_FIRST_CARD=$(CONFIG_RT_FIRST_CARD)
-+EXTRA_CFLAGS += -DCONFIG_RT_FIRST_IF_RF_OFFSET=$(CONFIG_RT_FIRST_IF_RF_OFFSET)
-+endif
-+ifneq ($(CONFIG_RT_SECOND_CARD),)
-+EXTRA_CFLAGS += -DCONFIG_RT_SECOND_CARD=$(CONFIG_RT_SECOND_CARD)
-+EXTRA_CFLAGS += -DCONFIG_RT_SECOND_IF_RF_OFFSET=$(CONFIG_RT_SECOND_IF_RF_OFFSET)
-+endif
-+ifneq ($(CONFIG_RT_THIRD_CARD),)
-+EXTRA_CFLAGS += -DCONFIG_RT_THIRD_CARD=$(CONFIG_RT_THIRD_CARD)
-+EXTRA_CFLAGS += -DCONFIG_RT_THIRD_IF_RF_OFFSET=$(CONFIG_RT_THIRD_IF_RF_OFFSET)
-+endif
-+ifeq ($(CONFIG_FIRST_IF_EEPROM_PROM),y)
-+EXTRA_CFLAGS += -DCONFIG_RT_FIRST_CARD_EEPROM="\"prom\""
-+else
-+ifeq ($(CONFIG_FIRST_IF_EEPROM_EFUSE),y)
-+EXTRA_CFLAGS += -DCONFIG_RT_FIRST_CARD_EEPROM="\"efuse\""
-+else
-+ifeq ($(CONFIG_FIRST_IF_EEPROM_FLASH),y)
-+EXTRA_CFLAGS += -DCONFIG_RT_FIRST_CARD_EEPROM="\"flash\""
-+endif
-+endif
-+endif
-+ifeq ($(CONFIG_SECOND_IF_EEPROM_PROM),y)
-+EXTRA_CFLAGS += -DCONFIG_RT_SECOND_CARD_EEPROM="\"prom\""
-+else
-+ifeq ($(CONFIG_SECOND_IF_EEPROM_EFUSE),y)
-+EXTRA_CFLAGS += -DCONFIG_RT_SECOND_CARD_EEPROM="\"efuse\""
-+else
-+ifeq ($(CONFIG_SECOND_IF_EEPROM_FLASH),y)
-+EXTRA_CFLAGS += -DCONFIG_RT_SECOND_CARD_EEPROM="\"flash\""
-+endif
-+endif
-+endif
-+ifeq ($(CONFIG_THIRD_IF_EEPROM_PROM),y)
-+EXTRA_CFLAGS += -DCONFIG_RT_THIRD_CARD_EEPROM="\"prom\""
-+else
-+ifeq ($(CONFIG_THIRD_IF_EEPROM_EFUSE),y)
-+EXTRA_CFLAGS += -DCONFIG_RT_THIRD_CARD_EEPROM="\"efuse\""
-+else
-+ifeq ($(CONFIG_THIRD_IF_EEPROM_FLASH),y)
-+EXTRA_CFLAGS += -DCONFIG_RT_THIRD_CARD_EEPROM="\"flash\""
-+endif
-+endif
-+endif
-+endif
-+
-+ifeq ($(CONFIG_FIRST_IF_EPAELNA),y)
-+EXTRA_CFLAGS += -DCONFIG_FIRST_IF_EPAELNA
-+else
-+ifeq ($(CONFIG_FIRST_IF_IPAILNA),y)
-+EXTRA_CFLAGS += -DCONFIG_FIRST_IF_IPAILNA
-+else
-+ifeq ($(CONFIG_FIRST_IF_IPAELNA),y)
-+EXTRA_CFLAGS += -DCONFIG_FIRST_IF_IPAELNA
-+endif
-+endif
-+endif
-+ifeq ($(CONFIG_SECOND_IF_EPAELNA),y)
-+EXTRA_CFLAGS += -DCONFIG_SECOND_IF_EPAELNA
-+else
-+ifeq ($(CONFIG_SECOND_IF_IPAILNA),y)
-+EXTRA_CFLAGS += -DCONFIG_SECOND_IF_IPAILNA
-+else
-+ifeq ($(CONFIG_SECOND_IF_IPAELNA),y)
-+EXTRA_CFLAGS += -DCONFIG_SECOND_IF_IPAELNA
-+endif
-+endif
-+endif
-+ifeq ($(CONFIG_THIRD_IF_EPAELNA),y)
-+EXTRA_CFLAGS += -DCONFIG_THIRD_IF_EPAELNA
-+else
-+ifeq ($(CONFIG_THIRD_IF_IPAILNA),y)
-+EXTRA_CFLAGS += -DCONFIG_THIRD_IF_IPAILNA
-+else
-+ifeq ($(CONFIG_THIRD_IF_IPAELNA),y)
-+EXTRA_CFLAGS += -DCONFIG_THIRD_IF_IPAELNA
-+endif
-+endif
-+endif
-+
-+
- ########################################################
- # Common files
- ########################################################

mt7615/Makefile

@@ -1,256 +0,0 @@
-# All rights reserved.
-# See LICENSE for more information.
-
-include $(TOPDIR)/rules.mk
-include $(INCLUDE_DIR)/kernel.mk
-
-PKG_NAME:=mt7615e
-PKG_VERSION:=5.0.4.0_20190503
-
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=git@dev.iopsys.eu:mediatek/mt7615.git
-PKG_SOURCE_VERSION:=12c69fe1912113d16d17292bcee6415a8c9ab131
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
-
-
-PKG_KCONFIG:= \
-	AP_SUPPORT \
-	RT_FIRST_CARD \
-	RT_SECOND_CARD \
-	RT_FIRST_IF_RF_OFFSET \
-	RT_SECOND_IF_RF_OFFSET \
-	MT_WIFI \
-	WIFI_BASIC_FUNC \
-	MT_WIFI_PATH \
-	FIRST_IF_NONE \
-	FIRST_IF_EEPROM_FLASH \
-	FIRST_IF_EEPROM_EFUSE \
-	RT_FIRST_CARD_EEPROM \
-	SECOND_IF_NONE \
-	SECOND_IF_EEPROM_FLASH \
-	SECOND_IF_EEPROM_PROM \
-	SECOND_IF_EEPROM_EFUSE \
-	RT_SECOND_CARD_EEPROM \
-	MULTI_INF_SUPPORT \
-	WIFI_BASIC_FUNC \
-	WIRELESS_EXT \
-	WEXT_SPY \
-	WEXT_PRIV \
-	DOT11_N_SUPPORT \
-	DOT11_VHT_AC \
-	DOT11_HE_AX \
-	CFG_SUPPORT_FALCON_MURU \
-	CFG_SUPPORT_FALCON_TXCMD_DBG \
-	CFG_SUPPORT_FALCON_SR \
-	WIFI_DRIVER \
-	G_BAND_256QAM_SUPPORT \
-	BRCM_256QAM_SUPPORT \
-	ICAP_SUPPORT \
-	MT_AP_SUPPORT \
-	BACKGROUND_SCAN_SUPPORT \
-	SMART_CARRIER_SENSE_SUPPORT \
-	SCS_FW_OFFLOAD \
-	THERMAL_PROTECT_SUPPORT \
-	MT_DFS_SUPPORT \
-	HDR_TRANS_TX_SUPPORT \
-	CHIP_MT7615E \
-	HDR_TRANS_RX_SUPPORT \
-	SUPPORT_DYNAMIC_TXOP \
-	WSC_INCLUDED \
-	MT_STA_SUPPORT \
-	WSC_V2_SUPPORT \
-	DOT11W_PMF_SUPPORT \
-	PASSPOINT_R2 \
-	TXBF_SUPPORT \
-	IGMP_SNOOP_SUPPORT \
-	RATE_ADAPTION \
-	RATE_ADAPT_AGBS_SUPPORT \
-	RTMP_FLASH_SUPPORT \
-	ATE_SUPPORT \
-	WLAN_SERVICE \
-	UAPSD \
-	RLT_MAC \
-	RLT_BBP \
-	RLT_RF \
-	RTMP_MAC \
-	RTMP_BBP \
-	RTMP_RF \
-	RTMP_PCI_SUPPORT \
-	RTMP_USB_SUPPORT \
-	RTMP_RBUS_SUPPORT \
-	WIFI_MODE_AP \
-	WIFI_MODE_STA \
-	WIRELESS_EXT \
-	WEXT_SPY \
-	WEXT_PRIV \
-	WDS_SUPPORT \
-	MBSS_SUPPORT \
-	APCLI_SUPPORT \
-	APCLI_CERT_SUPPORT \
-	APCLI_CONNECTION_TRIAL \
-	MAC_REPEATER_SUPPORT \
-	RALINK_RT6352 \
-	RALINK_MT7620 \
-	RALINK_MT7603E \
-	CON_WPS_SUPPORT \
-	VOW_SUPPORT \
-	BAND_STEERING \
-	TXOP_ARBITER \
-	CFG_SUPPORT_DYNAMIC_TXOP \
-	WIFI_MODE_BOTH \
-	WIFI_RLT_MAC \
-	RLT_MAC \
-	WIFI_RTMP_MAC \
-	RTMP_MAC \
-	WIFI_MT_MAC \
-	CHIP_MT7603E \
-	CHIP_MT7615E \
-	MT_MAC \
-	RATE_ADAPTION \
-	SUPPORT_OPENWRT \
-	SDK_USER_LIGHTY \
-	MUMIMO_SUPPORT \
-	MU_RA_SUPPORT \
-	LED_CONTROL_SUPPORT \
-	RA_HW_NAT \
-	RA_HW_NAT_WIFI_NEW_ARCH \
-	CFG80211_SUPPORT \
-	SER_SUPPORT \
-	GREENAP_SUPPORT \
-	RADIUS_ACCOUNTING_SUPPORT \
-	TPC_SUPPORT \
-	RLM_CAL_CACHE_SUPPORT \
-	CAL_BIN_FILE_SUPPORT \
-	RF_LOCKDOWN_SUPPORT \
-	PASSPOINT_R2 \
-	RED_SUPPORT \
-	FIRST_IF_EPAELNA \
-	FIRST_IF_IPAILNA \
-	FIRST_IF_IPAELNA \
-	FIRST_IF_EPAILNA \
-	SECOND_IF_EPAELNA \
-	SECOND_IF_IPAILNA \
-	SECOND_IF_IPAELNA \
-	SECOND_IF_EPAILNA \
-	THIRD_IF_EPAELNA \
-	THIRD_IF_IPAILNA \
-	THIRD_IF_IPAELNA \
-	THIRD_IF_EPAILNA \
-	WIFI_PKT_FWD \
-	DOT11K_RRM_SUPPORT \
-	DOT11R_FT_SUPPORT \
-	ENTERPRISE_AP_SUPPORT \
-	WIFI_EAP_FEATURE \
-	RADIUS_MAC_AUTH_SUPPORT \
-	VLAN_SUPPORT \
-	DYNAMIC_VLAN_SUPPORT \
-	CUSTOMISED_HOSTAPD_SUPPORT \
-	APCLI_STA_SUPPORT \
-	WDS_STA_SUPPORT \
-	MBSS_AS_WDS_AP_SUPPORT \
-	MBO_SUPPORT \
-	MAP_SUPPORT \
-	WPA3_SUPPORT \
-	OWE_SUPPORT \
-	WIFI_PKT_FWD_V1 \
-	FIRST_IF_MT7615E \
-	FIRST_IF_MT7622 \
-	FIRST_IF_MT7626 \
-	FIRST_IF_AXE \
-	FIRST_IF_MT7915 \
-	SECOND_IF_MT7615E \
-	SECOND_IF_AXE \
-	THIRD_IF_NONE \
-	THIRD_IF_MT7615E \
-	CHIP_AXE \
-	CHIP_MT7915 \
-	RT_THIRD_CARD \
-	RT_THIRD_IF_RF_OFFSET \
-	THIRD_IF_EEPROM_FLASH \
-	THIRD_IF_EEPROM_PROM \
-	THIRD_IF_EEPROM_EFUSE \
-	RT_THIRD_CARD_EEPROM \
-	SPECTRUM_SUPPORT \
-	PRE_CAL_TRX_SET1_SUPPORT \
-	MWDS \
-	MCAST_RATE_SPECIFIC \
-	WLAN_HOOK \
-	COEX_SUPPORT \
-	EASY_SETUP_SUPPORT \
-	EVENT_NOTIFIER_SUPPORT \
-	AIR_MONITOR \
-	OFFCHANNEL_SCAN_FEATURE \
-	WNM_SUPPORT \
-	INTERWORKING \
-	LINUX_NET_TXQ_SUPPORT \
-	CHIP_MT7622 \
-	CHIP_MT7626 \
-	MEMORY_SHRINK \
-	RPS_EFFICIENCY \
-	WHNAT_SUPPORT \
-	FAST_NAT_SUPPORT \
-	PRE_CAL_TRX_SET2_SUPPORT \
-	LINK_TEST_SUPPORT \
-	TCP_RACK_SUPPORT \
-	FQ_SCH_SUPPORT \
-	BRCM_256QAM_SUPPORT \
-	VHT_TXBF_2G_EPIGRAM_IE_SUPPORT \
-	DSCP_QOS_MAP_SUPPORT \
-	DSCP_PRI_SUPPORT \
-	PCIE_ASPM_DYM_CTRL_SUPPORT \
-	MIN_PHY_RATE_SUPPORT \
-	FAST_UP_RATE_SUPPORT \
-	TXRX_STAT_SUPPORT \
-	VENDOR_FEATURE11_SUPPORT \
-	WIFI_TWT_SUPPORT \
-	SINGLE_SKU \
-	SNIFFER_SUPPORT \
-
-PKG_CONFIG_DEPENDS:=$(foreach c, $(PKG_KCONFIG),$(if $(CONFIG_MTK_$c),CONFIG_$(c)))
-
-include $(INCLUDE_DIR)/package.mk
-
-#TAR_CMD=$(HOST_TAR) -C $(1)/ $(TAR_OPTIONS)
-
-define KernelPackage/mt7615e
-  CATEGORY:=Mediatek drivers
-  TITLE:=WiFi drivers
-  DEPENDS:= +wifi-profile
-ifneq ($(CONFIG_MTK_FAST_NAT_SUPPORT), )
-ifneq ($(CONFIG_NET_MEDIATEK_HNAT), )
-  DEPENDS+=+kmod-mediatek_hnat
-endif
-endif
-ifneq ($(CONFIG_MTK_WHNAT_SUPPORT), )
-  FILES:=$(PKG_BUILD_DIR)/mt_wifi_ap/mt_wifi.ko \
-	$(PKG_BUILD_DIR)/mt_wifi/embedded/plug_in/whnat/mt_whnat.ko
-  AUTOLOAD:=$(call AutoProbe,mt_wifi mt_whnat)
-else
-  FILES:=$(PKG_BUILD_DIR)/mt_wifi_ap/mt_wifi.ko
-  AUTOLOAD:=$(call AutoProbe,mt_wifi)
-endif
-  MENU:=1
-endef
-
-define KernelPackage/mt7615e/config
-	source "$(SOURCE)/globalconfig.in"
-endef
-
-
-define Build/Compile
-	$(MAKE) $(PKG_JOBS) -C "$(LINUX_DIR)" \
-		$(KERNEL_MAKE_FLAGS) V=1 \
-		NOSTDINC_FLAGS="$(NOSTDINC_FLAGS)" \
-		SUBDIRS="$(PKG_BUILD_DIR)/mt_wifi_ap" \
-		$(foreach c, $(PKG_KCONFIG),$(if $(CONFIG_MTK_$c),CONFIG_$(c)=$(CONFIG_MTK_$(c)))) \
-		CONFIG_SUPPORT_OPENWRT=y CONFIG_MT_AP_SUPPORT=m CONFIG_CHIP_MT7615E=y CONFIG_MT_MAC=y \
-		CONFIG_FIRST_IF_MT7603E=y CONFIG_SECOND_IF_MT7615E=y \
-		modules
-endef
-
-define KernelPackage/mt7615e/install
-	$(INSTALL_DIR) $(1)/etc/wireless
-	$(CP) ./files/l1profile.dat $(1)/etc/wireless
-endef
-
-$(eval $(call KernelPackage,mt7615e))

mt7615/ap.config.in

@@ -1,317 +0,0 @@
-config MTK_MT_AP_SUPPORT
-	bool
-	default y
-	depends on MTK_WIFI_MODE_AP
-
-if MTK_MT_AP_SUPPORT
-
-config MTK_WDS_SUPPORT
-	bool "WDS"
-	depends on MTK_MT_AP_SUPPORT
-	default y
-
-config MTK_MBSS_SUPPORT
-	bool "Multi-BSS (MBSSID)"
-	depends on MTK_MT_AP_SUPPORT
-	default y
-
-config MTK_APCLI_SUPPORT
-	bool "AP-Client Support"
-	depends on MTK_MT_AP_SUPPORT
-	default y
-
-config MTK_APCLI_CERT_SUPPORT
-	bool "AP-Client TGn Cert Support"
-	depends on MTK_MT_AP_SUPPORT
-	depends on MTK_APCLI_SUPPORT
-        default n
-
-config MTK_MAC_REPEATER_SUPPORT
-	bool "MAC Repeater Support"
-	depends on MTK_MT_AP_SUPPORT
-	depends on MTK_APCLI_SUPPORT
-	default y
-
-config MTK_APCLI_CONNECTION_TRIAL
-        bool "AP-Client Trial Connection"
-        depends on MTK_MT_AP_SUPPORT
-        depends on MTK_APCLI_SUPPORT
-        default n
-
-config MTK_MWDS
-	bool "Mixed WDS (MWDS)"
-	depends on MTK_MT_AP_SUPPORT
-	select MTK_APCLI_SUPPORT
-	default n
-
-config MTK_MUMIMO_SUPPORT
-        bool "MU-MIMO Support"
-        depends on MTK_WIFI_DRIVER
-        select MTK_MU_RA_SUPPORT
-        default y
-
-config MTK_MU_RA_SUPPORT
-  	bool "MU-RGA Support"
-  	depends on MTK_MUMIMO_SUPPORT
-
-config MTK_DOT11R_FT_SUPPORT
-	bool "IEEE 802.11r Fast BSS Transition"
-	depends on MTK_MT_AP_SUPPORT
-	default n
-
-config MTK_DOT11K_RRM_SUPPORT
-	bool "IEEE 802.11k Radio Resource Management"
-	depends on MTK_MT_AP_SUPPORT
-	default n
-
-config MTK_IGMP_SNOOP_SUPPORT
-	bool "IGMP snooping (for multicast --> unicast)"
-	depends on MTK_WIFI_DRIVER
-	depends on MTK_MT_AP_SUPPORT
-	default y
-
-config MTK_OFFCHANNEL_SCAN_FEATURE
-	bool "Off-Channel scan support (Channel Quality Monitor)"
-	depends on MTK_WIFI_DRIVER
-	depends on MTK_MT_AP_SUPPORT
-	default n
-
-config MTK_SNIFFER_SUPPORT
-	bool "Sniffer support"
-	depends on MTK_MT_AP_SUPPORT
-	default n
-
-config MTK_ENTERPRISE_AP_SUPPORT
-	bool "Enterprise AP Support"
-	depends on MTK_MT_AP_SUPPORT
-	default n
-
-config MTK_WIFI_EAP_FEATURE
-	bool "EAP Feature"
-	depends on MTK_WIFI_DRIVER
-	default y
-
-config MTK_RADIUS_MAC_AUTH_SUPPORT
-        bool "RADIUS MAC Auth Support"
-        depends on MTK_ENTERPRISE_AP_SUPPORT
-        depends on MTK_CFG80211_SUPPORT
-        default n
-
-config MTK_VLAN_SUPPORT
-	bool "VLAN Support"
-	depends on MTK_MT_AP_SUPPORT
-	depends on MTK_ENTERPRISE_AP_SUPPORT
-	default n
-
-config MTK_DYNAMIC_VLAN_SUPPORT
-	bool "Dynamic VLAN Support"
-	depends on MTK_MT_AP_SUPPORT
-	depends on MTK_ENTERPRISE_AP_SUPPORT
-	default n
-
-config MTK_CFG80211_SUPPORT
-	bool "Linux CFG80211 support"
-	depends on MTK_MT_AP_SUPPORT
-	default n
-
-#CUSTOMISED HOSTAPD
-config MTK_CUSTOMISED_HOSTAPD_SUPPORT
-	bool "Customised Hostapd Support"
-	depends on MTK_MT_AP_SUPPORT
-	depends on MTK_CFG80211_SUPPORT
-	default n
-
-#APCLI STA
-config MTK_APCLI_STA_SUPPORT
-	bool "APCLI STA Support"
-	depends on MTK_APCLI_SUPPORT
-	depends on MTK_CFG80211_SUPPORT
-	default n
-
-#WDS STA
-config MTK_WDS_STA_SUPPORT
-	bool "WDS STA Support"
-	depends on MTK_APCLI_SUPPORT
-	depends on MTK_CFG80211_SUPPORT
-	default n
-
-#WDS AP
-config MTK_MBSS_AS_WDS_AP_SUPPORT
-	bool "MBSS as WDS AP Support"
-	depends on MTK_MT_AP_SUPPORT
-	depends on MTK_MBSS_SUPPORT
-	default n
-
-config MTK_DSCP_QOS_MAP_SUPPORT
-	bool "Dscp Qos Mapping Support"
-	depends on MTK_MT_AP_SUPPORT
-	default n
-
-config MTK_DSCP_PRI_SUPPORT
-	bool "Dscp Priority Mapping Support"
-	depends on MTK_MT_AP_SUPPORT
-	default n
-
-config MTK_MIN_PHY_RATE_SUPPORT
-        bool "Minimum PHY rate support"
-        depends on MTK_MT_AP_SUPPORT
-        default n
-
-config MTK_FAST_UP_RATE_SUPPORT
-        bool "Fast UP rate support"
-        depends on MTK_MT_AP_SUPPORT
-        default n
-
-config MTK_CON_WPS_SUPPORT
-	bool "Concurrent WPS Support"
-	depends on MTK_MT_AP_SUPPORT
-	depends on MTK_APCLI_SUPPORT
-	depends on MTK_WSC_INCLUDED
-	depends on MTK_WSC_V2_SUPPORT
-	default n
-
-config MTK_MCAST_RATE_SPECIFIC
-	bool "User specific tx rate of mcast pkt"
-	depends on MTK_MT_AP_SUPPORT
-	default y
-
-config MTK_VOW_SUPPORT
-	bool "MediaAir (VOW) support"
-	depends on MTK_MT_AP_SUPPORT
-	default y
-
-config MTK_BAND_STEERING
-	bool "Band Steering"
-	depends on MTK_MT_AP_SUPPORT
-	default y
-
-config MTK_LED_CONTROL_SUPPORT
-	bool "LED Control Support"
-	default n
-
-config MTK_WLAN_HOOK
-       bool "WLAN hook Support"
-       depends on MTK_WIFI_DRIVER
-       default n
-
-config MTK_RADIUS_ACCOUNTING_SUPPORT
-	bool "Radius Accounting Support"
-	depends on MTK_MT_AP_SUPPORT
-	default n
-
-config MTK_GREENAP_SUPPORT
-	bool "GreenAP Support"
-	depends on MTK_MT_AP_SUPPORT
-	default y
-
-config MTK_TXRX_STAT_SUPPORT
-	bool "Tx/Rx Stats Support"
-	depends on MTK_WIFI_DRIVER
-	default n
-
-config MTK_VENDOR_FEATURE11_SUPPORT
-        bool "Enable Vendor-11 Features"
-        depends on MTK_WIFI_DRIVER
-        depends on MTK_MT_AP_SUPPORT
-        default n
-
-config MTK_PCIE_ASPM_DYM_CTRL_SUPPORT
-	bool "Pcie Aspm Dynamic Control Support"
-	depends on MTK_MT_AP_SUPPORT
-	default y
-
-config MTK_COEX_SUPPORT
-	bool "Coex Support"
-	depends on MTK_MT_AP_SUPPORT
-	default n
-
-config MTK_EASY_SETUP_SUPPORT
-	bool "Whole Home Coverage - Easy Setup"
-	depends on MTK_MT_AP_SUPPORT
-	default n
-
-config MTK_EVENT_NOTIFIER_SUPPORT
-	bool "Whole Home Coverage - Event Notifier"
-	depends on MTK_MT_AP_SUPPORT
-	default n
-
-config MTK_AIR_MONITOR
-        bool "Air Monitor"
-        depends on MTK_MT_AP_SUPPORT
-        default n
-
-config MTK_WNM_SUPPORT
-        bool "IEEE 802.11v WNM Support"
-        depends on MTK_MT_AP_SUPPORT
-        default n
-
-config MTK_INTERWORKING
-        bool "IEEE 802.11u Interworking"
-        depends on MTK_MT_AP_SUPPORT
-        default n
-
-config MTK_LINUX_NET_TXQ_SUPPORT
-	bool "NET TX Queue Support"
-	default n
-
-config  MTK_WPA3_SUPPORT
-        bool "WPA3 Support"
-        depends on MTK_MT_AP_SUPPORT
-        default y
-
-config  MTK_OWE_SUPPORT
-        bool "Enhanced Open Support"
-        depends on MTK_MT_AP_SUPPORT
-        default n
-
-config  MTK_SINGLE_SKU
-        bool "Single SKU Support"
-        depends on MTK_MT_AP_SUPPORT
-        default n
-
-config MTK_ICAP_SUPPORT
-	bool "ICAP Support"
-	depends on MTK_WIFI_DRIVER
-	depends on MTK_MT_AP_SUPPORT
-	default y
-
-config MTK_SPECTRUM_SUPPORT
-	bool "Wifi Spectrum Mgmt Support"
-	depends on MTK_WIFI_DRIVER
-	depends on MTK_MT_AP_SUPPORT
-	default y
-
-config MTK_FTM_SUPPORT
-	bool "FTM Support"
-	depends on MTK_WIFI_DRIVER
-	select MTK_PASSPOINT_R2
-	default n
-
-config MTK_PASSPOINT_R2
-	bool "Passpoint Release-2 Support"
-	depends on MTK_WIFI_DRIVER
-	select MTK_DOT11W_PMF_SUPPORT
-	depends on MTK_MT_AP_SUPPORT
-	default n
-
-config MTK_MBO_SUPPORT
-        bool "MBO Support"
-        depends on MTK_WIFI_DRIVER
-        select MTK_INTERWORKING
-        select MTK_WNM_SUPPORT
-        select MTK_DOT11K_RRM_SUPPORT
-        select MTK_DOT11R_FT_SUPPORT
-        select MTK_DOT11W_PMF_SUPPORT
-        default n
-
-config MTK_MAP_SUPPORT
-        bool "Multi-AP (MAP) Support"
-        depends on MTK_WIFI_DRIVER
-        select MTK_INTERWORKING
-        select MTK_WNM_SUPPORT
-        select MTK_DOT11K_RRM_SUPPORT
-        select MTK_DOT11R_FT_SUPPORT
-        select MTK_DOT11W_PMF_SUPPORT
-        default n
-
-endif  #MTK_MT_AP_SUPPORT

mt7615/common.config.in

@@ -1,250 +0,0 @@
-#mtk wifi common optiions
-
-menu "Common WiFi options"
-
-config MTK_WIFI_BASIC_FUNC
-	bool "Linux Wireless Extension support (for iwconfig, iwpriv etc.)"
-	select MTK_WIRELESS_EXT
-	select MTK_WEXT_SPY
-	select MTK_WEXT_PRIV
-
-config MTK_DOT11_N_SUPPORT
-	bool "IEEE 802.11n support"
-	default y
-
-config MTK_DOT11_VHT_AC
-	bool "IEEE 802.11ac support"
-	depends on MTK_DOT11_N_SUPPORT
-	default y
-
-config MTK_DOT11_HE_AX
-	bool "IEEE 802.11ax support"
-	depends on MTK_DOT11_VHT_AC
-	depends on MTK_CHIP_AXE || MTK_CHIP_MT7915
-	default y
-
-config MTK_CFG_SUPPORT_FALCON_MURU
-	bool "MURU support"
-	depends on MTK_DOT11_VHT_AC
-	depends on MTK_CHIP_AXE || MTK_CHIP_MT7915
-	default y
-
-config MTK_CFG_SUPPORT_FALCON_TXCMD_DBG
-	bool "TXCMD DBG support"
-	depends on MTK_WIFI_DRIVER
-	depends on MTK_DOT11_VHT_AC
-	depends on MTK_CHIP_AXE || MTK_CHIP_MT7915
-	default y
-
-config MTK_CFG_SUPPORT_FALCON_SR
-	bool "Spatial Reuse (SR) support"
-	depends on MTK_WIFI_DRIVER
-	depends on MTK_CHIP_MT7915
-	default y
-
-config MTK_WIFI_TWT_SUPPORT
-	bool "Target Wake Time (TWT) support"
-	depends on MTK_WIFI_DRIVER
-	depends on MTK_DOT11_HE_AX
-	depends on MTK_CHIP_AXE || MTK_CHIP_MT7915
-	default y
-
-config MTK_G_BAND_256QAM_SUPPORT
-	bool "2.4G 256-QAM support"
-	depends on MTK_WIFI_DRIVER
-	depends on MTK_DOT11_VHT_AC
-        default y
-
-config MTK_BRCM_256QAM_SUPPORT
-	bool "BRCM 2.4G 256-QAM support"
-	depends on MTK_WIFI_DRIVER
-	depends on MTK_G_BAND_256QAM_SUPPORT
-	default n
-
-config MTK_VHT_TXBF_2G_EPIGRAM_IE_SUPPORT
-	bool "BRCM 2.4G VHT Sounding support"
-	depends on MTK_WIFI_DRIVER
-	default n
-
-config MTK_MT_DFS_SUPPORT
-	bool "IEEE 802.11h DFS Support"
-	depends on MTK_WIFI_DRIVER
-	default y
-
-config MTK_TPC_SUPPORT
-	bool "IEEE 802.11h TPC Support"
-	depends on MTK_WIFI_DRIVER
-	default y
-
-config MTK_BACKGROUND_SCAN_SUPPORT
-	bool "Background Scan Support"
-	depends on MTK_WIFI_DRIVER
-	default y
-
-config MTK_SMART_CARRIER_SENSE_SUPPORT
-	bool "Smart Carrier Sense Support"
-	depends on MTK_WIFI_DRIVER
-	default y
-
-config MTK_THERMAL_PROTECT_SUPPORT
-        bool "Thermal Protection"
-        depends on MTK_WIFI_DRIVER && MTK_SMART_CARRIER_SENSE_SUPPORT
-        default n
-
-config MTK_SCS_FW_OFFLOAD
-        bool "SCS Fw Offload Support"
-        depends on MTK_WIFI_DRIVER && MTK_SMART_CARRIER_SENSE_SUPPORT
-        default n
-
-config MTK_HDR_TRANS_TX_SUPPORT
-	bool "Tx Header Translation"
-	depends on MTK_CHIP_MT7615E || MTK_CHIP_MT7622 || MTK_CHIP_MT7626 || MTK_CHIP_AXE || MTK_CHIP_MT7915
-	default y
-
-config MTK_HDR_TRANS_RX_SUPPORT
-	bool "Rx Header Translation"
-	depends on MTK_CHIP_MT7615E || MTK_CHIP_MT7622 || MTK_CHIP_MT7626 || MTK_CHIP_AXE || MTK_CHIP_MT7915
-	default y
-
-config MTK_DBDC_MODE
-	bool "Dual-Band Dual-Concurrent (DBDC) mode support"
-	depends on MTK_CHIP_MT7615E || MTK_CHIP_MT7626 || MTK_CHIP_MT7915
-	select MULTI_PROFILE_SUPPORT
-	select DEFAULT_5G_PROFILE
-	default y
-
-config MTK_MULTI_PROFILE_SUPPORT
-        bool "Multi Profile Support"
-        depends on MTK_DBDC_MODE
-        default n
-
-config MTK_DEFAULT_5G_PROFILE
-	bool "5G default profile for DBDC"
-	depends on MTK_DBDC_MODE
-	default y
-
-config MTK_WSC_INCLUDED
-	bool "WiFi Simple Config (WSC) or WPS"
-	depends on MTK_WIFI_DRIVER
-	depends on MTK_MT_AP_SUPPORT || MTK_MT_STA_SUPPORT
-	default y
-
-config MTK_WSC_V2_SUPPORT
-	bool "WiFi Simple Config ver.2 (WPS 2.0)"
-	depends on MTK_WIFI_DRIVER
-	depends on MTK_MT_AP_SUPPORT || MTK_MT_STA_SUPPORT
-	default y
-
-config MTK_DOT11W_PMF_SUPPORT
-	bool "IEEE 802.11w PMF support"
-	depends on MTK_WIFI_DRIVER
-	depends on MTK_MT_AP_SUPPORT || MTK_MT_STA_SUPPORT
-	default y
-
-config MTK_TXBF_SUPPORT
-	bool "Tx Beam Forming Support"
-	depends on MTK_WIFI_DRIVER
-	default y
-
-config MTK_FAST_NAT_SUPPORT
-       bool "Fast-NAT support"
-       default n
-
-config MTK_WHNAT_SUPPORT
-	tristate "Wifi Hardware NAT support"
-	depends on MTK_CHIP_MT7615E || MTK_CHIP_MT7915
-	depends on MTK_WLAN_HOOK
-	depends on MTK_FAST_NAT_SUPPORT
-	depends on PACKAGE_kmod-hw_nat || PACKAGE_kmod-mediatek_hnat
-	default n
-
-#config CARRIER_DETECTION_SUPPORT
-#	bool "Carrier Detect"
-#	depends on WIFI_DRIVER
-#	default n
-
-config MTK_MEMORY_SHRINK
-	bool "Memory Shrink"
-	depends on MTK_WIFI_DRIVER && MTK_CHIP_MT7626
-	default n
-
-config MTK_RPS_EFFICIENCY
-	bool "RPS Efficiency"
-	depends on MTK_WIFI_DRIVER && MTK_CHIP_MT7626
-	default n
-
-config MTK_RTMP_FLASH_SUPPORT
-	bool "Platform's Flash APIs Support"
-	depends on MTK_WIFI_DRIVER
-	default y
-
-config MTK_PRE_CAL_TRX_SET1_SUPPORT
-	bool "Calibration To Flash/BinFile Support"
-	depends on MTK_WIFI_DRIVER
-	default y
-
-config MTK_RLM_CAL_CACHE_SUPPORT
-	bool "Rlm Calibration Cache Support"
-	depends on MTK_WIFI_DRIVER
-	default y
-
-config MTK_PRE_CAL_TRX_SET2_SUPPORT
-	bool "Pre-calibration to Flash Support"
-	depends on MTK_WIFI_DRIVER
-	default y
-
-config MTK_CAL_BIN_FILE_SUPPORT
-	bool "Calibration to BinFile Support"
-	depends on MTK_WIFI_DRIVER
-	default y
-
-config MTK_RF_LOCKDOWN_SUPPORT
-	bool "RF Lockdown Support"
-	depends on MTK_WIFI_DRIVER
-	default n
-
-config MTK_LINK_TEST_SUPPORT
-	bool "Link Test Support"
-	depends on MTK_WIFI_DRIVER
-	default n
-
-config MTK_ATE_SUPPORT
-	bool "ATE/QA Support"
-	depends on MTK_WIFI_DRIVER
-	default y
-
-config MTK_WLAN_SERVICE
-        bool "Wlan Service Library Support"
-        depends on MTK_WIFI_DRIVER
-        default n
-
-config MTK_UAPSD
-	bool "UAPSD support"
-	depends on MTK_WIFI_DRIVER
-	depends on MTK_MT_AP_SUPPORT || MTK_MT_STA_SUPPORT
-	default y
-
-config MTK_TCP_RACK_SUPPORT
-	bool "TCP Reduced ACK  support"
-	depends on MTK_WIFI_DRIVER
-	default n
-
-config MTK_RED_SUPPORT
-        bool "RED (Random Early Drop) support"
-	depends on MTK_WIFI_DRIVER
-	depends on MTK_MT_AP_SUPPORT || MTK_MT_STA_SUPPORT
-        default n
-
-config MTK_FQ_SCH_SUPPORT
-        bool "Fair Queueing support"
-        depends on MTK_WIFI_DRIVER
-        depends on MTK_MT_AP_SUPPORT && MTK_VOW_SUPPORT
-        depends on MTK_CHIP_MT7622
-        default y
-
-config MTK_FDB_SUPPORT
-       bool "FW Debug Port"
-       depends on MTK_WIFI_DRIVER
-       default n
-
-endmenu

mt7615/config.in

@@ -1,250 +0,0 @@
-# Kconfig for mtk wifi
-
-config MTK_WIFI_DRIVER
-	bool
-	default y
-	depends on PACKAGE_kmod-mt7615 || PACKAGE_kmod-mt7603
-	select MTK_SUPPORT_OPENWRT
-	select MTK_MT_WIFI
-	select MTK_WIFI_BASIC_FUNC
-
-if MTK_WIFI_DRIVER
-
-menu "First WiFi card"
-choice
-	prompt "Choose First WiFi card"
-	default MTK_FIRST_IF_MT7603E
-
-	config MTK_FIRST_IF_NONE
-	bool "None"
-
-	config MTK_FIRST_IF_MT7603E
-	bool "MT7603E"
-	select RALINK_MT7603E
-	select MTK_WIFI_MT_MAC
-	select MTK_MT_MAC
-	select MTK_CHIP_MT7603E
-
-	config MTK_FIRST_IF_MT7615E
-	bool "MT7615E"
-	select MTK_WIFI_MT_MAC
-	select MTK_MT_MAC
-	select MTK_CHIP_MT7615E
-
-endchoice
-
-config  MTK_RT_FIRST_CARD
-        int
-        depends on ! MTK_FIRST_IF_NONE
-        default 7603 if MTK_FIRST_IF_MT7603E
-	default 7615 if MTK_FIRST_IF_MT7615E
-
-config MTK_MT_WIFI_PATH_FIRST_CARD
-	string "WiFi driver build directory name"
-	default "rlt_wifi"
-
-config  MTK_RT_FIRST_IF_RF_OFFSET
-        hex "RF offset of 1st card"
-        depends on ! MTK_FIRST_IF_NONE
-        default 0x0
-
-#prompt "WiFi detailed options for 1st card"
-
-choice
-	prompt "EEPROM Type of 1st Card"
-	depends on ! MTK_FIRST_IF_NONE
-	default MTK_FIRST_IF_EEPROM_EFUSE
-
-	config MTK_FIRST_IF_EEPROM_FLASH
-	bool "FLASH"
-
-	config MTK_FIRST_IF_EEPROM_PROM
-	bool "EEPROM"
-
-	config MTK_FIRST_IF_EEPROM_EFUSE
-	bool "EFUSE"
-
-endchoice
-
-config MTK_RT_FIRST_CARD_EEPROM
-	string
-	depends on ! MTK_FIRST_IF_NONE
-	default "prom" if MTK_FIRST_IF_EEPROM_PROM
-	default "efuse" if MTK_FIRST_IF_EEPROM_EFUSE
-	default "flash" if MTK_FIRST_IF_EEPROM_FLASH
-
-choice
-	prompt "PA/LNA Type of 1st Card"
-	depends on ! MTK_FIRST_IF_NONE
-	default MTK_FIRST_IF_IPAILNA
-
-	config MTK_FIRST_IF_EPAELNA
-	bool "ePAeLNA"
-	config MTK_FIRST_IF_IPAILNA
-	bool "iPAiLNA"
-	config MTK_FIRST_IF_IPAELNA
-	bool "iPAeLNA"
-endchoice
-
-menu "Operation Modes for 1st card"
-choice
-	prompt "Operating mode"
-	default MTK_WIFI_MODE_AP
-
-	config MTK_WIFI_MODE_AP
-	bool "AP"
-
-	config MTK_WIFI_MODE_STA
-	bool "STA"
-
-	config MTK_WIFI_MODE_BOTH
-	bool "AP+STA"
-	#select MTK_MT_STA_SUPPORT
-endchoice
-
-source "ap.config.in"
-
-endmenu
-endmenu
-### endmenu for 1st wifi card #######
-
-#### menu starts for 2nd wifi card ###
-menu "Second WiFi card"
-
-choice
-	prompt "Choose Second WiFi card"
-	default MTK_SECOND_IF_MT7615E
-
-	config MTK_SECOND_IF_NONE
-	bool "None"
-
-	config MTK_SECOND_IF_MT7603E
-	bool "MT7603E"
-	select RALINK_MT7603E
-	select MTK_WIFI_MT_MAC
-	select MTK_MT_MAC
-	select MTK_CHIP_MT7603E
-
-	config MTK_SECOND_IF_MT7615E
-	bool "MT7615E"
-	select MTK_WIFI_MT_MAC
-	select MTK_MT_MAC
-	select MTK_CHIP_MT7615E
-endchoice
-
-config  MTK_RT_SECOND_CARD
-        int
-        depends on ! MTK_SECOND_IF_NONE
-        default 7603 if MTK_SECOND_IF_MT7603E
-	default 7615 if MTK_SECOND_IF_MT7615E
-
-config MTK_MT_WIFI_PATH_SECOND_CARD
-	string "WiFi driver build directory name"
-	default "mt_wifi"
-
-config  MTK_RT_SECOND_IF_RF_OFFSET
-        hex "RF offset of 2nd card"
-        depends on ! MTK_SECOND_IF_NONE
-        default 0x8000
-
-#prompt "WiFi detailed options for 2nd card"
-
-choice
-	prompt "EEPROM Type of 2nd Card"
-	depends on ! MTK_SECOND_IF_NONE
-	default MTK_SECOND_IF_EEPROM_EFUSE
-
-	config MTK_SECOND_IF_EEPROM_FLASH
-	bool "FLASH"
-
-	config MTK_SECOND_IF_EEPROM_PROM
-	bool "EEPROM"
-
-	config MTK_SECOND_IF_EEPROM_EFUSE
-	bool "EFUSE"
-endchoice
-
-config MTK_RT_SECOND_CARD_EEPROM
-	string
-	depends on ! MTK_SECOND_IF_NONE
-	default "prom" if MTK_SECOND_IF_EEPROM_PROM
-	default "efuse" if MTK_SECOND_IF_EEPROM_EFUSE
-	default "flash" if MTK_SECOND_IF_EEPROM_FLASH
-
-
-choice
-        prompt "PA/LNA Type of 2nd Card"
-	depends on ! MTK_SECOND_IF_NONE
-	default MTK_SECOND_IF_IPAILNA
-
-	config MTK_SECOND_IF_EPAELNA
-	bool "ePAeLNA"
-	config MTK_SECOND_IF_IPAILNA
-	bool "iPAiLNA"
-	config MTK_SECOND_IF_IPAELNA
-	bool "iPAeLNA"
-endchoice
-
-
-menu "Operation Modes for 2nd card"
-choice
-	prompt "Operating mode"
-	default MTK_WIFI_MODE_AP
-
-	config MTK_WIFI_MODE_AP
-	bool "AP"
-
-	config MTK_WIFI_MODE_STA
-	bool "STA"
-
-	config MTK_WIFI_MODE_BOTH
-	bool "AP+STA"
-endchoice
-
-source "ap.config.in"
-
-endmenu
-
-endmenu
-### endmenu for 2nd wifi card #######
-
-
-#### placeholder for 3rd wifi card ###
-config MTK_THIRD_IF_NONE
-	bool
-	default y
-
-config  MTK_RT_THIRD_CARD
-        int
-	default 0
-
-config  MTK_RT_THIRD_IF_RF_OFFSET
-        hex
-	default 0x4000
-
-config MTK_RT_THIRD_CARD_EEPROM
-	string
-	default "efuse"
-### placehlder for 3rd wifi card #######
-
-
-config MTK_MULTI_INF_SUPPORT
-	bool
-	default y if !MTK_FIRST_IF_NONE && !MTK_SECOND_IF_NONE
-
-
-source "common.config.in"
-
-#if MTK_CHIP_MT7615E || MTK_CHIP_MT7622 || MTK_CHIP_MT7626 || MTK_CHIP_AXE || MTK_CHIP_MT7915
-#	config MTK_MT_MAC
-#		bool
-#		default y
-#		select MTK_RATE_ADAPTION
-#		select MTK_RATE_ADAPT_AGBS_SUPPORT
-#		select MTK_DOT11_N_SUPPORT
-#		select MTK_DOT11_VHT_AC
-#		select MTK_HDR_TRANS_TX_SUPPORT
-#		select MTK_HDR_TRANS_RX_SUPPORT
-#endif
-
-endif #MTK_WIFI_DRIVER#

mt7615/defconfig.in

@@ -1,60 +0,0 @@
-#defconfig for mt7615
-CONFIG_WIFI_DRIVER=y
-CONFIG_SUPPORT_OPENWRT=y
-CONFIG_RT_FIRST_CARD=7603
-CONFIG_RT_FIRST_IF_RF_OFFSET=0x0
-CONFIG_FIRST_IF_EEPROM_EFUSE=y
-CONFIG_RT_FIRST_CARD_EEPROM="efuse"
-CONFIG_FIRST_IF_IPAILNA=y
-CONFIG_RT_SECOND_CARD=7615
-CONFIG_RT_SECOND_IF_RF_OFFSET=0x8000
-CONFIG_SECOND_IF_EEPROM_EFUSE=y
-CONFIG_RT_SECOND_CARD_EEPROM="efuse"
-CONFIG_SECOND_IF_IPAILNA=y
-CONFIG_RT_THIRD_CARD=0
-CONFIG_RT_THIRD_IF_RF_OFFSET=0x4000
-CONFIG_RT_THIRD_CARD_EEPROM="efuse"
-CONFIG_MULTI_INF_SUPPORT=y
-CONFIG_FIRST_IF_MT7603E=y
-CONFIG_SECOND_IF_MT7615E=y
-CONFIG_THIRD_IF_NONE=y
-CONFIG_WIFI_BASIC_FUNC=y
-CONFIG_DOT11_N_SUPPORT=y
-CONFIG_DOT11_VHT_AC=y
-CONFIG_G_BAND_256QAM_SUPPORT=y
-CONFIG_ICAP_SUPPORT=y
-CONFIG_MT_MAC=y
-#CONFIG_MT_AP_SUPPORT=y
-CONFIG_MT_DFS_SUPPORT=y
-CONFIG_BACKGROUND_SCAN_SUPPORT=y
-CONFIG_SMART_CARRIER_SENSE_SUPPORT=y
-CONFIG_WSC_INCLUDED=y
-CONFIG_WSC_V2_SUPPORT=y
-CONFIG_DOT11W_PMF_SUPPORT=y
-CONFIG_TXBF_SUPPORT=y
-CONFIG_IGMP_SNOOP_SUPPORT=y
-CONFIG_RTMP_FLASH_SUPPORT=y
-CONFIG_ATE_SUPPORT=y
-CONFIG_UAPSD=y
-CONFIG_WIFI_MODE_AP=y
-CONFIG_WDS_SUPPORT=y
-CONFIG_MBSS_SUPPORT=y
-CONFIG_APCLI_SUPPORT=y
-CONFIG_MAC_REPEATER_SUPPORT=y
-CONFIG_VOW_SUPPORT=y
-CONFIG_BAND_STEERING=y
-CONFIG_MUMIMO_SUPPORT=y
-CONFIG_MU_RA_SUPPORT=y
-CONFIG_GREENAP_SUPPORT=y
-CONFIG_TPC_SUPPORT=y
-CONFIG_RLM_CAL_CACHE_SUPPORT=y
-CONFIG_CAL_BIN_FILE_SUPPORT=y
-CONFIG_WIFI_EAP_FEATURE=y
-CONFIG_WPA3_SUPPORT=y
-CONFIG_SPECTRUM_SUPPORT=y
-CONFIG_PRE_CAL_TRX_SET1_SUPPORT=y
-CONFIG_MCAST_RATE_SPECIFIC=y
-CONFIG_PRE_CAL_TRX_SET2_SUPPORT=y
-CONFIG_PCIE_ASPM_DYM_CTRL_SUPPORT=y
-CONFIG_MT_AP_SUPPORT=m
-CONFIG_CHIP_MT7615E=y

mt7615/files/iNic_ap.dat

@@ -1,406 +0,0 @@
-Default
-AccessControlList0=
-AccessControlList1=
-AccessControlList10=
-AccessControlList11=
-AccessControlList12=
-AccessControlList13=
-AccessControlList14=
-AccessControlList15=
-AccessControlList2=
-AccessControlList3=
-AccessControlList4=
-AccessControlList5=
-AccessControlList6=
-AccessControlList7=
-AccessControlList8=
-AccessControlList9=
-AccessPolicy0=0
-AccessPolicy1=0
-AccessPolicy10=0
-AccessPolicy11=0
-AccessPolicy12=0
-AccessPolicy13=0
-AccessPolicy14=0
-AccessPolicy15=0
-AccessPolicy2=0
-AccessPolicy3=0
-AccessPolicy4=0
-AccessPolicy5=0
-AccessPolicy6=0
-AccessPolicy7=0
-AccessPolicy8=0
-AccessPolicy9=0
-AckPolicy=0;0;0;0
-APACM=0;0;0;0
-APAifsn=3;7;1;1
-ApCliAuthMode=
-ApCliBssid=
-ApCliDefaultKeyID=
-ApCliEnable=
-ApCliEncrypType=
-ApCliKey1Str=
-ApCliKey1Str1=
-ApCliKey1Type=
-ApCliKey2Str=
-ApCliKey2Str1=
-ApCliKey2Type=
-ApCliKey3Str=
-ApCliKey3Str1=
-ApCliKey3Type=
-ApCliKey4Str=
-ApCliKey4Str1=
-ApCliKey4Type=
-ApCliSsid=
-ApCliWirelessMode=
-ApCliWPAPSK=
-ApCliWPAPSK1=
-APCwmax=6;10;4;3
-APCwmin=4;4;3;2
-APSDCapable=1
-APTxop=0;0;94;47
-AuthMode=OPEN
-AutoChannelSelect=0
-AutoChannelSkipList=
-AutoProvisionEn=0
-BandSteering=0
-BasicRate=15
-BeaconPeriod=100
-BFBACKOFFenable=0
-BgndScanSkipCh=
-BGProtection=0
-BndStrgBssIdx=
-BSSACM=0;0;0;0
-BSSAifsn=3;7;2;2
-BSSCwmax=10;10;4;3
-BSSCwmin=4;4;3;2
-BssidNum=1
-BSSTxop=0;0;94;47
-BW_Enable=0
-BW_Guarantee_Rate=
-BW_Maximum_Rate=
-BW_Priority=
-BW_Root=0
-CalCacheApply=0
-CarrierDetect=0
-Channel=100
-ChannelGrp=
-CountryCode=US
-CountryRegion=5
-CountryRegionABand=7
-CP_SUPPORT=2
-CSPeriod=6
-DBDC_MODE=0
-DebugFlags=0
-DefaultKeyID=1
-DfsCalibration=0
-DfsEnable=0
-DfsFalseAlarmPrevent=1
-DfsZeroWait=0
-DfsZeroWaitCacTime=255
-DisableOLBC=0
-DtimPeriod=1
-E2pAccessMode=1
-EAPifname=br0
-EDCCAEnable=1
-EncrypType=NONE
-EthConvertMode=dongle
-EtherTrafficBand=0
-Ethifname=
-ETxBfEnCond=1
-FineAGC=0
-FixedTxMode=
-ForceRoamSupport=
-FragThreshold=2346
-FreqDelta=0
-FtSupport=0
-GreenAP=1
-G_BAND_256QAM=1
-HideSSID=0
-HT_AMSDU=1
-HT_AutoBA=1
-HT_BADecline=0
-HT_BAWinSize=64
-HT_BSSCoexistence=1
-HT_BW=1
-HT_DisallowTKIP=1
-HT_EXTCHA=1
-HT_GI=1
-HT_HTC=1
-HT_LDPC=1
-HT_LinkAdapt=0
-HT_MCS=33
-HT_MpduDensity=5
-HT_OpMode=0
-HT_PROTECT=1
-HT_RDG=0
-HT_RxStream=4
-HT_STBC=1
-HT_TxStream=4
-IcapMode=0
-idle_timeout_interval=0
-IEEE80211H=1
-IEEE8021X=0
-IgmpSnEnable=0
-ITxBfEn=1
-Key1Str=
-Key1Str1=
-Key1Str10=
-Key1Str11=
-Key1Str12=
-Key1Str13=
-Key1Str14=
-Key1Str15=
-Key1Str16=
-Key1Str2=
-Key1Str3=
-Key1Str4=
-Key1Str5=
-Key1Str6=
-Key1Str7=
-Key1Str8=
-Key1Str9=
-Key1Type=0
-Key2Str=
-Key2Str1=
-Key2Str10=
-Key2Str11=
-Key2Str12=
-Key2Str13=
-Key2Str14=
-Key2Str15=
-Key2Str16=
-Key2Str2=
-Key2Str3=
-Key2Str4=
-Key2Str5=
-Key2Str6=
-Key2Str7=
-Key2Str8=
-Key2Str9=
-Key2Type=0
-Key3Str=
-Key3Str1=
-Key3Str10=
-Key3Str11=
-Key3Str12=
-Key3Str13=
-Key3Str14=
-Key3Str15=
-Key3Str16=
-Key3Str2=
-Key3Str3=
-Key3Str4=
-Key3Str5=
-Key3Str6=
-Key3Str7=
-Key3Str8=
-Key3Str9=
-Key3Type=0
-Key4Str=
-Key4Str1=
-Key4Str10=
-Key4Str11=
-Key4Str12=
-Key4Str13=
-Key4Str14=
-Key4Str15=
-Key4Str16=
-Key4Str2=
-Key4Str3=
-Key4Str4=
-Key4Str5=
-Key4Str6=
-Key4Str7=
-Key4Str8=
-Key4Str9=
-Key4Type=0
-LinkTestSupport=0
-MACRepeaterEn=
-MACRepeaterOuiMode=2
-MeshAuthMode=
-MeshAutoLink=0
-MeshDefaultkey=0
-MeshEncrypType=
-MeshId=
-MeshWEPKEY=
-MeshWPAKEY=
-MUTxRxEnable=0
-NoForwarding=0
-NoForwardingBTNBSSID=0
-own_ip_addr=10.10.10.254
-
-PcieAspm=0
-PERCENTAGEenable=0
-PhyRateLimit=0
-PMFMFPC=1
-PMFMFPR=0
-PMFSHA256=0
-PMKCachePeriod=10
-PowerUpCckOfdm=0:0:0:0:0:0:0
-PowerUpHT20=0:0:0:0:0:0:0
-PowerUpHT40=0:0:0:0:0:0:0
-PowerUpVHT160=0:0:0:0:0:0:0
-PowerUpVHT20=0:0:0:0:0:0:0
-PowerUpVHT40=0:0:0:0:0:0:0
-PowerUpVHT80=0:0:0:0:0:0:0
-PreAntSwitch=
-PreAuth=0
-PreAuthifname=br0
-RadioLinkSelection=0
-RadioOn=1
-RADIUS_Acct_Key=
-RADIUS_Acct_Port=1813
-RADIUS_Acct_Server=
-RADIUS_Key1=
-RADIUS_Key10=
-RADIUS_Key11=
-RADIUS_Key12=
-RADIUS_Key13=
-RADIUS_Key14=
-RADIUS_Key15=
-RADIUS_Key16=
-RADIUS_Key2=
-RADIUS_Key3=
-RADIUS_Key4=
-RADIUS_Key5=
-RADIUS_Key6=
-RADIUS_Key7=
-RADIUS_Key8=
-RADIUS_Key9=
-RADIUS_Port=1812
-RADIUS_Server=0
-RDRegion=
-RED_Enable=1
-RekeyInterval=3600
-RekeyMethod=DISABLE
-RRMEnable=0
-RTSThreshold=2347
-session_timeout_interval=0
-ShortSlot=1
-SKUenable=0
-SSID=
-SSID1=MTK_AP2
-SSID10=
-SSID11=
-SSID12=
-SSID13=
-SSID14=
-SSID15=
-SSID16=
-SSID2=
-SSID3=
-SSID4=
-SSID5=
-SSID6=
-SSID7=
-SSID8=
-SSID9=
-StationKeepAlive=0
-StreamMode=0
-StreamModeMac0=
-StreamModeMac1=
-StreamModeMac2=
-StreamModeMac3=
-TGnWifiTest=0
-ThermalRecal=0
-TxBurst=1
-TxPower=100
-TxPreamble=1
-VHT_BW=1
-VHT_BW_SIGNAL=0
-VHT_LDPC=1
-VHT_Sec80_Channel=0
-VHT_SGI=1
-VHT_STBC=1
-VLANID=0
-VLANPriority=0
-VLANTag=0
-VOW_Airtime_Ctrl_En=
-VOW_Airtime_Fairness_En=1
-VOW_BW_Ctrl=0
-VOW_Group_Backlog=
-VOW_Group_DWRR_Max_Wait_Time=
-VOW_Group_DWRR_Quantum=
-VOW_Group_Max_Airtime_Bucket_Size=
-VOW_Group_Max_Rate=
-VOW_Group_Max_Rate_Bucket_Size=
-VOW_Group_Max_Ratio=
-VOW_Group_Max_Wait_Time=
-VOW_Group_Min_Airtime_Bucket_Size=
-VOW_Group_Min_Rate=
-VOW_Group_Min_Rate_Bucket_Size=
-VOW_Group_Min_Ratio=
-VOW_Rate_Ctrl_En=
-VOW_Refill_Period=
-VOW_RX_En=1
-VOW_Sta_BE_DWRR_Quantum=
-VOW_Sta_BK_DWRR_Quantum=
-VOW_Sta_DWRR_Max_Wait_Time=
-VOW_Sta_VI_DWRR_Quantum=
-VOW_Sta_VO_DWRR_Quantum=
-VOW_WATF_Enable=
-VOW_WATF_MAC_LV0=
-VOW_WATF_MAC_LV1=
-VOW_WATF_MAC_LV2=
-VOW_WATF_MAC_LV3=
-VOW_WATF_Q_LV0=
-VOW_WATF_Q_LV1=
-VOW_WATF_Q_LV2=
-VOW_WATF_Q_LV3=
-VOW_WMM_Search_Rule_Band0=
-VOW_WMM_Search_Rule_Band1=
-WapiAsCertPath=
-WapiAsIpAddr=
-WapiAsPort=
-Wapiifname=
-WapiPsk1=
-WapiPsk10=
-WapiPsk11=
-WapiPsk12=
-WapiPsk13=
-WapiPsk14=
-WapiPsk15=
-WapiPsk16=
-WapiPsk2=
-WapiPsk3=
-WapiPsk4=
-WapiPsk5=
-WapiPsk6=
-WapiPsk7=
-WapiPsk8=
-WapiPsk9=
-WapiPskType=
-WapiUserCertPath=
-WCNTest=0
-Wds0Key=
-Wds1Key=
-Wds2Key=
-Wds3Key=
-WdsEnable=0
-WdsEncrypType=NONE
-WdsList=
-WdsPhyMode=0
-WHNAT=1
-WiFiTest=0
-WirelessMode=14
-WmmCapable=1
-WPAPSK=
-WPAPSK1=12345678
-WPAPSK10=
-WPAPSK11=
-WPAPSK12=
-WPAPSK13=
-WPAPSK14=
-WPAPSK15=
-WPAPSK16=
-WPAPSK2=
-WPAPSK3=
-WPAPSK4=
-WPAPSK5=
-WPAPSK6=
-WPAPSK7=
-WPAPSK8=
-WPAPSK9=
-WscConfMode=0
-WscConfStatus=2

mt7615/files/l1profile.dat

@@ -1,27 +0,0 @@
-Default
-INDEX0=MT7603
-INDEX0_profile_path=/etc/Wireless/RT2860/RT2860.dat
-INDEX0_EEPROM_offset=0x0
-INDEX0_EEPROM_size=0x4000
-INDEX0_EEPROM_name=e2p
-INDEX0_main_ifname=ra0
-INDEX0_ext_ifname=ra
-INDEX0_wds_ifname=wds
-INDEX0_apcli_ifname=apcli
-INDEX0_mesh_ifname=mesh
-INDEX0_nvram_zone=dev1
-INDEX0_single_sku_path=/etc_ro/Wireless/RT2860AP/SingleSKU.dat
-INDEX0_bf_sku_path=/etc_ro/Wireless/RT2860AP/SingleSKU_BF.dat
-INDEX1=MT7615
-INDEX1_profile_path=/etc/Wireless/iNIC/iNIC_ap.dat
-INDEX1_EEPROM_offset=0x4000
-INDEX1_EEPROM_size=0x4000
-INDEX1_EEPROM_name=e2p
-INDEX1_main_ifname=rai0
-INDEX1_ext_ifname=rai
-INDEX1_wds_ifname=wdsi
-INDEX1_apcli_ifname=apclii
-INDEX1_mesh_ifname=meshi
-INDEX1_nvram_zone=dev2
-INDEX1_single_sku_path=/etc_ro/Wireless/RT2860AP/SingleSKU.dat
-INDEX1_bf_sku_path=/etc_ro/Wireless/RT2860AP/SingleSKU_BF.dat

mt7615/globalconfig.in

@@ -1,250 +0,0 @@
-# Kconfig for mtk wifi
-
-config MTK_WIFI_DRIVER
-	bool
-	default y
-	depends on (PACKAGE_kmod-mt7615e || PACKAGE_kmod-mt7603e)
-	select MTK_SUPPORT_OPENWRT
-	select MTK_MT_WIFI
-	select MTK_WIFI_BASIC_FUNC
-
-if MTK_WIFI_DRIVER
-
-menu "First WiFi card"
-choice
-	prompt "Choose First WiFi card"
-	default MTK_FIRST_IF_MT7603E
-
-	config MTK_FIRST_IF_NONE
-	bool "None"
-
-	config MTK_FIRST_IF_MT7603E
-	bool "MT7603E"
-	select RALINK_MT7603E
-	select MTK_WIFI_MT_MAC
-	select MTK_MT_MAC
-	select MTK_CHIP_MT7603E
-
-	config MTK_FIRST_IF_MT7615E
-	bool "MT7615E"
-	select MTK_WIFI_MT_MAC
-	select MTK_MT_MAC
-	select MTK_CHIP_MT7615E
-
-endchoice
-
-config  MTK_RT_FIRST_CARD
-        int
-        depends on ! MTK_FIRST_IF_NONE
-        default 7603 if MTK_FIRST_IF_MT7603E
-	default 7615 if MTK_FIRST_IF_MT7615E
-
-config MTK_MT_WIFI_PATH_FIRST_CARD
-	string "WiFi driver build directory name"
-	default "rlt_wifi"
-
-config  MTK_RT_FIRST_IF_RF_OFFSET
-        hex "RF offset of 1st card"
-        depends on ! MTK_FIRST_IF_NONE
-        default 0x0
-
-#prompt "WiFi detailed options for 1st card"
-
-choice
-	prompt "EEPROM Type of 1st Card"
-	depends on ! MTK_FIRST_IF_NONE
-	default MTK_FIRST_IF_EEPROM_EFUSE
-
-	config MTK_FIRST_IF_EEPROM_FLASH
-	bool "FLASH"
-
-	config MTK_FIRST_IF_EEPROM_PROM
-	bool "EEPROM"
-
-	config MTK_FIRST_IF_EEPROM_EFUSE
-	bool "EFUSE"
-
-endchoice
-
-config MTK_RT_FIRST_CARD_EEPROM
-	string
-	depends on ! MTK_FIRST_IF_NONE
-	default "prom" if MTK_FIRST_IF_EEPROM_PROM
-	default "efuse" if MTK_FIRST_IF_EEPROM_EFUSE
-	default "flash" if MTK_FIRST_IF_EEPROM_FLASH
-
-choice
-	prompt "PA/LNA Type of 1st Card"
-	depends on ! MTK_FIRST_IF_NONE
-	default MTK_FIRST_IF_IPAILNA
-
-	config MTK_FIRST_IF_EPAELNA
-	bool "ePAeLNA"
-	config MTK_FIRST_IF_IPAILNA
-	bool "iPAiLNA"
-	config MTK_FIRST_IF_IPAELNA
-	bool "iPAeLNA"
-endchoice
-
-menu "Operation Modes for 1st card"
-choice
-	prompt "Operating mode"
-	default MTK_WIFI_MODE_AP
-
-	config MTK_WIFI_MODE_AP
-	bool "AP"
-
-	config MTK_WIFI_MODE_STA
-	bool "STA"
-
-	config MTK_WIFI_MODE_BOTH
-	bool "AP+STA"
-	#select MTK_MT_STA_SUPPORT
-endchoice
-
-source "ap.config.in"
-
-endmenu
-endmenu
-### endmenu for 1st wifi card #######
-
-#### menu starts for 2nd wifi card ###
-menu "Second WiFi card"
-
-choice
-	prompt "Choose Second WiFi card"
-	default MTK_SECOND_IF_MT7615E
-
-	config MTK_SECOND_IF_NONE
-	bool "None"
-
-	config MTK_SECOND_IF_MT7603E
-	bool "MT7603E"
-	select RALINK_MT7603E
-	select MTK_WIFI_MT_MAC
-	select MTK_MT_MAC
-	select MTK_CHIP_MT7603E
-
-	config MTK_SECOND_IF_MT7615E
-	bool "MT7615E"
-	select MTK_WIFI_MT_MAC
-	select MTK_MT_MAC
-	select MTK_CHIP_MT7615E
-endchoice
-
-config  MTK_RT_SECOND_CARD
-        int
-        depends on ! MTK_SECOND_IF_NONE
-        default 7603 if MTK_SECOND_IF_MT7603E
-	default 7615 if MTK_SECOND_IF_MT7615E
-
-config MTK_MT_WIFI_PATH_SECOND_CARD
-	string "WiFi driver build directory name"
-	default "mt_wifi"
-
-config  MTK_RT_SECOND_IF_RF_OFFSET
-        hex "RF offset of 2nd card"
-        depends on ! MTK_SECOND_IF_NONE
-        default 0x8000
-
-#prompt "WiFi detailed options for 2nd card"
-
-choice
-	prompt "EEPROM Type of 2nd Card"
-	depends on ! MTK_SECOND_IF_NONE
-	default MTK_SECOND_IF_EEPROM_EFUSE
-
-	config MTK_SECOND_IF_EEPROM_FLASH
-	bool "FLASH"
-
-	config MTK_SECOND_IF_EEPROM_PROM
-	bool "EEPROM"
-
-	config MTK_SECOND_IF_EEPROM_EFUSE
-	bool "EFUSE"
-endchoice
-
-config MTK_RT_SECOND_CARD_EEPROM
-	string
-	depends on ! MTK_SECOND_IF_NONE
-	default "prom" if MTK_SECOND_IF_EEPROM_PROM
-	default "efuse" if MTK_SECOND_IF_EEPROM_EFUSE
-	default "flash" if MTK_SECOND_IF_EEPROM_FLASH
-
-
-choice
-        prompt "PA/LNA Type of 2nd Card"
-	depends on ! MTK_SECOND_IF_NONE
-	default MTK_SECOND_IF_IPAILNA
-
-	config MTK_SECOND_IF_EPAELNA
-	bool "ePAeLNA"
-	config MTK_SECOND_IF_IPAILNA
-	bool "iPAiLNA"
-	config MTK_SECOND_IF_IPAELNA
-	bool "iPAeLNA"
-endchoice
-
-
-menu "Operation Modes for 2nd card"
-choice
-	prompt "Operating mode"
-	default MTK_WIFI_MODE_AP
-
-	config MTK_WIFI_MODE_AP
-	bool "AP"
-
-	config MTK_WIFI_MODE_STA
-	bool "STA"
-
-	config MTK_WIFI_MODE_BOTH
-	bool "AP+STA"
-endchoice
-
-source "ap.config.in"
-
-endmenu
-
-endmenu
-### endmenu for 2nd wifi card #######
-
-
-#### placeholder for 3rd wifi card ###
-config MTK_THIRD_IF_NONE
-	bool
-	default y
-
-config  MTK_RT_THIRD_CARD
-        int
-	default 0
-
-config  MTK_RT_THIRD_IF_RF_OFFSET
-        hex
-	default 0x4000
-
-config MTK_RT_THIRD_CARD_EEPROM
-	string
-	default "efuse"
-### placehlder for 3rd wifi card #######
-
-
-config MTK_MULTI_INF_SUPPORT
-	bool
-	default y if !MTK_FIRST_IF_NONE && !MTK_SECOND_IF_NONE
-
-
-source "common.config.in"
-
-#if MTK_CHIP_MT7615E || MTK_CHIP_MT7622 || MTK_CHIP_MT7626 || MTK_CHIP_AXE || MTK_CHIP_MT7915
-#	config MTK_MT_MAC
-#		bool
-#		default y
-#		select MTK_RATE_ADAPTION
-#		select MTK_RATE_ADAPT_AGBS_SUPPORT
-#		select MTK_DOT11_N_SUPPORT
-#		select MTK_DOT11_VHT_AC
-#		select MTK_HDR_TRANS_TX_SUPPORT
-#		select MTK_HDR_TRANS_RX_SUPPORT
-#endif
-
-endif #MTK_WIFI_DRIVER#

natalie-dect-h/Makefile

@@ -16,7 +16,7 @@ PKG_SOURCE_PROTO:=git
 PKG_SOURCE_VERSION:=9e2236989ff58d0db897f938b6b07b535144e0e2
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 
-PKG_LICENSE:=PROPRIETARY
+PKG_LICENSE:=PROPRIETARY RTX
 
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/image.mk

netmode/files/lib/functions/netmode.sh

@@ -244,17 +244,16 @@ revert_netmode() {
 
 	ubus call leds set  '{"state" : "allflash"}'
 	logger -s -p user.info -t "netmode" "Could not switch to '$from' mode; going back to '$to' mode" > /dev/console
+	cp -af $CONF_BACKUP_DIR/* /etc/config/
+	sync
 	uci -q set netmode.setup.curmode="$to"
 	uci -q set netmode.setup.repeaterready="$rready"
 	uci commit netmode
-	cp -af $CONF_BACKUP_DIR/* /etc/config/
-	sync
 	rm -rf $CONF_BACKUP_DIR
 	rm -rf $OLD_MODE_FILE
 
 	logger -s -p user.info -t "netmode" "Restarting network services" > /dev/console
-	ubus call network reload
-	wifi reload
+	/etc/init.d/network restart
 	ubus call router.network reload
 	ubus call leds set  '{"state" : "normal"}'
 }

opkgd/Makefile

@@ -0,0 +1,48 @@
+#
+# Copyright (C) 2019 IOPSYS
+#
+# 
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=opkgd
+PKG_VERSION:=1.0.0
+
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_VERSION:=d3da32eca6e50b6be6e846a7f82c8e93c74c45a4
+PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/opkgd.git
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/opkgd
+	SECTION:=utils
+	CATEGORY:=Utilities
+	TITLE:=OPKG ubus backend
+	DEPENDS:=+libuci +libubox +ubus +libuuid
+endef
+
+define Package/opkgd/description
+	Ubus based backend for OPKG which can be used by other applications running on top of it.
+endef
+
+define Build/Prepare
+	$(CP) ./src/* $(PKG_BUILD_DIR)/
+endef
+
+TARGET_CFLAGS += \
+	-I$(STAGING_DIR)/usr/include \
+	-D_GNU_SOURCE
+
+define Package/opkgd/install
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_BIN) ./files/opkgd.init $(1)/etc/init.d/opkgd
+	$(INSTALL_DIR) $(1)/etc/opkg
+	$(INSTALL_CONF) ./files/map_du $(1)/etc/opkg/map_du
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/opkgd $(1)/usr/sbin/opkgd
+endef
+
+$(eval $(call BuildPackage,opkgd))

opkgd/files/opkgd.init

@@ -0,0 +1,20 @@
+#!/bin/sh /etc/rc.common
+
+START=94
+STOP=10
+
+USE_PROCD=1
+PROG=/usr/sbin/opkgd
+
+start_service() {
+	procd_open_instance
+	procd_set_param command ${PROG}
+	procd_set_param respawn
+	procd_close_instance
+}
+
+reload_service() {
+	stop
+	start
+}
+

owsd/Makefile

@@ -10,7 +10,7 @@ PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/owsd.git
-PKG_SOURCE_VERSION:=a83448ed65e1c76411b9c6553d64b5d623b8bcd7
+PKG_SOURCE_VERSION:=1c6efa76a23b9a8236a8f6d3b43349cf1e23655a
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_SOURCE_SUBDIR:=${PKG_NAME}-${PKG_VERSION}
 PKG_INSTALL:=1

peripheral_manager/Makefile

@@ -39,7 +39,7 @@ define Package/peripheral_manager
 	CATEGORY:=Utilities
 	TITLE:=Application deamon for handling of peripheral
 	URL:=
-	DEPENDS:=+libuci +libubus +libblobmsg-json @+PACKAGE_bcmkernel:bcmkernel @+PACKAGE_bcmopen:bcmopen
+	DEPENDS:=+libuci +libubus +libblobmsg-json +PACKAGE_bcmkernel:bcmkernel +PACKAGE_bcmopen:bcmopen
 endef
 
 define Package/peripheral_manager/description

picolisp/Makefile

@@ -0,0 +1,86 @@
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=picolisp
+PKG_VERSION=3.1.10
+PKG_RELEASE:=1
+
+PKG_BUILD_DIR := $(BUILD_DIR)/picoLisp
+PKG_SOURCE:=picoLisp-$(PKG_VERSION).tgz
+PKG_SOURCE_URL:=http://software-lab.de/
+PKG_MD5SUM:=ac19fd6ff4d05dd2b15ea00d1ed591e7
+
+PKG_BUILD_DEPENDS+= +libopenssl +@OPENSSL_WITH_EC2M
+
+PKG_LICENSE:=MIT-X11
+PKG_LICENSE_FILES:=COPYING
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/picolisp
+SECTION:=lang
+CATEGORY:=Languages
+TITLE:=PicoLisp interpreter
+DEPENDS:= +libopenssl +@OPENSSL_WITH_EC2M
+URL:=http://www.picolisp.org/
+MAINTAINER:=Jeronimo Pellegrini <j_p@aleph0.info>
+endef
+
+define Package/picolisp/description
+  Picolisp is yet another dialect of the Lisp language, specially written to be radically practical and simple.
+endef
+
+TARGET_LDFLAGS += -L$(STAGING_DIR)/usr/lib
+TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include
+
+# A hack to make picoLisp's Makefile see the include path:
+MAKE_FLAGS += C_INCLUDE_PATH+=$(STAGING_DIR)/usr/include/ 
+
+define Package/picolisp/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(INSTALL_DIR) $(1)/usr/lib/picolisp/
+	$(INSTALL_DIR) $(1)/usr/lib/picolisp/lib
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bin/pil      $(1)/usr/bin/
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bin/psh      $(1)/usr/bin/
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bin/watchdog $(1)/usr/bin/
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bin/picolisp $(1)/usr/bin/
+	$(CP) $(PKG_BUILD_DIR)/*.l        $(1)/usr/lib/picolisp/
+	$(CP) $(PKG_BUILD_DIR)/lib/ht \
+	   		$(PKG_BUILD_DIR)/lib/ext \
+	   		$(PKG_BUILD_DIR)/lib/adm.l \
+	   		$(PKG_BUILD_DIR)/lib/app.l \
+	   		$(PKG_BUILD_DIR)/lib/boss.l \
+	   		$(PKG_BUILD_DIR)/lib/btree.l \
+	   		$(PKG_BUILD_DIR)/lib/conDbgc.l \
+	   		$(PKG_BUILD_DIR)/lib/db.l \
+		   	$(PKG_BUILD_DIR)/lib/debug.l \
+	   		$(PKG_BUILD_DIR)/lib/edit.l \
+			$(PKG_BUILD_DIR)/lib/ed.l \
+			$(PKG_BUILD_DIR)/lib/form.l \
+	   		$(PKG_BUILD_DIR)/lib/frac.l \
+	   		$(PKG_BUILD_DIR)/lib/heartbeat.l \
+	   		$(PKG_BUILD_DIR)/lib/http.l \
+	   		$(PKG_BUILD_DIR)/lib/import.l \
+	   		$(PKG_BUILD_DIR)/lib/led.l \
+	   		$(PKG_BUILD_DIR)/lib/lint.l \
+	   		$(PKG_BUILD_DIR)/lib/math32.l \
+	   		$(PKG_BUILD_DIR)/lib/math64.l \
+	   		$(PKG_BUILD_DIR)/lib/math.l \
+	   		$(PKG_BUILD_DIR)/lib/misc.l \
+	   		$(PKG_BUILD_DIR)/lib/pilog.l \
+	   		$(PKG_BUILD_DIR)/lib/prof.l \
+	   		$(PKG_BUILD_DIR)/lib/ps.l \
+	   		$(PKG_BUILD_DIR)/lib/rsa.l \
+	   		$(PKG_BUILD_DIR)/lib/scrape.l \
+	   		$(PKG_BUILD_DIR)/lib/simul.l \
+			$(PKG_BUILD_DIR)/lib/sq.l \
+			$(PKG_BUILD_DIR)/lib/too.l \
+			$(PKG_BUILD_DIR)/lib/xhtml.l \
+	   		$(PKG_BUILD_DIR)/lib/xm.l \
+	   		$(PKG_BUILD_DIR)/lib/xml.l \
+	   		$(PKG_BUILD_DIR)/lib/xmlrpc.l	$(1)/usr/lib/picolisp/lib/
+	touch $(1)/usr/lib/picolisp/lib/tags
+	$(STRIP) $(1)/usr/bin/picolisp
+endef
+
+$(eval $(call BuildPackage,picolisp))

picolisp/patches/001-mips.diff

@@ -0,0 +1,43 @@
+diff -Nur picoLisp/Makefile picoLisp-new/Makefile
+--- picoLisp/Makefile	1969-12-31 21:00:00.000000000 -0300
++++ picoLisp-new/Makefile	2015-06-02 15:38:07.469726899 -0300
+@@ -0,0 +1,6 @@
++all:
++	(cd src; make)
++
++clean:
++	(cd src; make clean)
++
+diff -Nur picoLisp/src/Makefile picoLisp-new/src/Makefile
+--- picoLisp/src/Makefile	2015-03-31 15:48:22.000000000 -0300
++++ picoLisp-new/src/Makefile	2015-06-02 15:40:43.541491599 -0300
+@@ -6,9 +6,13 @@
+ 
+ picoFiles = main.c gc.c apply.c flow.c sym.c subr.c big.c io.c net.c tab.c
+ 
+-CC = gcc
++#CC = gcc
+ # CCLD is the cc (compiler frontend) to use for the link step.
+-CCLD = gcc
++#CCLD = gcc
++
++# Honor the $(CC) variable, inherited form the environment (it's essential
++# when cross-compiling)
++CCLD = $(CC)
+ 
+ CFLAGS = -c -O2 -pipe \
+ 	-falign-functions=32 -fomit-frame-pointer -fno-strict-aliasing \
+@@ -19,10 +23,10 @@
+ 
+ ifeq ($(shell uname), Linux)
+ 	OS = Linux
+-	CFLAGS += -m32
+-	PICOLISP-FLAGS = -m32 -rdynamic
++	CFLAGS += -mabi=32 -fPIC
++	PICOLISP-FLAGS = -rdynamic
+ 	LIB-FLAGS = -lm -ldl
+-	DYNAMIC-LIB-FLAGS = -m32 -shared -export-dynamic
++	DYNAMIC-LIB-FLAGS = -shared -export-dynamic -fPIC
+ 	LCRYPT = -lcrypt
+ 	STRIP = strip
+ else

questd/Makefile

@@ -8,7 +8,7 @@ include $(INCLUDE_DIR)/kernel.mk
 PKG_NAME:=questd
 PKG_VERSION:=4.1.1
 
-PKG_SOURCE_VERSION:=04eb78c28d96801951b204bc434f84d43d4a0d03
+PKG_SOURCE_VERSION:=89619c1ae8243812a71cdc0ae31491e74866f4be
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/questd
 

samba2/Makefile

@@ -0,0 +1,223 @@
+#
+# Copyright (C) 2006-2011 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=samba2
+PKG_VERSION:=2.2.12
+PKG_RELEASE:=1
+
+PKG_SOURCE_URL:=https://dev.iopsys.eu/fork/samba2.git
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_VERSION:=d687d07a137981f4fe78cc289b040e6426c61e29
+PKG_BUILD_DIR=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
+PKG_LICENSE:=GPL-2.0-only
+include $(INCLUDE_DIR)/package.mk
+
+define Package/samba2/Default
+  SUBMENU:=Filesystem
+  SECTION:=net
+  CATEGORY:=Network
+  TITLE:=samba - NetBIOS/SMB implementation
+  DEPENDS:= +libreadline +ncurses +popt
+  URL:=http://www.samba.org/
+endef  
+
+define Package/samba2/Default/description
+The Samba software suite is a collection of programs that implements the
+	SMB protocol for unix systems, allowing you to serve files and printers to
+	Windows, NT, OS/2 and DOS clients. This protocol is sometimes also referred
+	to as the LanManager or Netbios protocol.
+endef
+
+define Package/samba2-common
+  $(call Package/samba2/Default)
+  MENU:=1
+  TITLE:=NetBIOS/SMB server and client shared files
+endef
+
+#define Package/samba2-server
+#  $(call Package/samba2/Default)
+#  TITLE:=NetBIOS/SMB file and print server
+#  DEPENDS:=samba2-common
+#endef
+
+define Package/samba2-client
+  $(call Package/samba2/Default)
+  TITLE:=NetBIOS/SMB simple client
+  DEPENDS:=samba2-common
+endef
+
+TARGET_CFLAGS += $(FPIC)
+WERR := -Werror=format-security
+TARGET_CFLAGS_WITHOUT_WERR := $(filter-out $(WERR),$(TARGET_CFLAGS))
+
+define Build/Compile	
+	rm -rf $(PKG_INSTALL_DIR)
+	mkdir -p $(PKG_INSTALL_DIR)
+	(cd $(PKG_BUILD_DIR)/source ; rm -rf config.{cache,status} ; \
+		CFLAGS="-D_LARGEFILE64_SOURCE -D_GNU_SOURCE" \
+		./configure \
+			$(HOST_CONFIGURE_VARS) \
+			$(HOST_CONFIGURE_ARGS) \
+			--program-prefix="" \
+			--program-suffix="" \
+			--prefix=/usr \
+			--exec-prefix=/usr \
+			--bindir=/usr/bin \
+			--datadir=/usr/share \
+			--includedir=/usr/include \
+			--infodir=/usr/share/info \
+			--libdir=/usr/lib \
+			--libexecdir=/usr/lib \
+			--localstatedir=/var/log/samba2 \
+			--mandir=/usr/share/man \
+			--sbindir=/usr/sbin \
+			--sysconfdir=/etc/samba2 \
+			$(DISABLE_NLS) \
+			--with-included-popt \
+			--with-lockdir=/var/run/samba2 \
+			--with-privatedir=/etc/samba2 \
+			--with-readline=no \
+	);
+	$(MAKE) -C $(PKG_BUILD_DIR)/source \
+		bin/make_smbcodepage bin/make_unicodemap
+	(cd $(PKG_BUILD_DIR)/source/bin ; \
+		mv -f make_smbcodepage make_smbcodepage.old ; \
+		mv -f make_unicodemap make_unicodemap.old ; \
+	);
+	$(MAKE) -C $(PKG_BUILD_DIR)/source \
+		clean
+	(cd $(PKG_BUILD_DIR)/source; rm -rf config.{cache,status}; \
+		$(TARGET_CONFIGURE_OPTS) \
+		CFLAGS="$(TARGET_CFLAGS_WITHOUT_WERR) -D_GNU_SOURCE -DNDEBUG -DSHMEM_SIZE=524288" \
+		CPPFLAGS="$(TARGET_CPPFLAGS)" \
+		LDFLAGS="$(TARGET_LDFLAGS) $(LIBGCC_S)" \
+		ac_cv_lib_cups_httpConnect=no \
+		samba_cv_FTRUNCATE_NEEDS_ROOT=no \
+		samba_cv_HAVE_BROKEN_FCNTL64_LOCKS=no \
+		samba_cv_HAVE_BROKEN_GETGROUPS=no \
+		samba_cv_HAVE_BROKEN_READDIR=no \
+		samba_cv_HAVE_FCNTL_LOCK=yes \
+		samba_cv_HAVE_FNMATCH=yes \
+		samba_cv_HAVE_FTRUNCATE_EXTEND=no \
+		samba_cv_HAVE_GETTIMEOFDAY_TZ=yes \
+		samba_cv_HAVE_IFACE_AIX=no \
+		samba_cv_HAVE_IFACE_IFCONF=yes \
+		samba_cv_HAVE_IFACE_IFREQ=yes \
+		samba_cv_HAVE_INO64_T=yes \
+		samba_cv_HAVE_IRIX_SPECIFIC_CAPABILITIES=no \
+		samba_cv_HAVE_OFF64_T=yes \
+		samba_cv_HAVE_ROOT=yes \
+		samba_cv_HAVE_SECURE_MKSTEMP=yes \
+		samba_cv_HAVE_SHARED_MMAP=yes \
+		samba_cv_HAVE_STRUCT_FLOCK64=yes \
+		samba_cv_HAVE_SYSV_IPC=no \
+		samba_cv_HAVE_TRUNCATED_SALT=no \
+		samba_cv_HAVE_UNION_SEMUN=no \
+		samba_cv_HAVE_UNSIGNED_CHAR=yes \
+		samba_cv_NEED_SGI_SEMUN_HACK=no \
+		samba_cv_REPLACE_INET_NTOA=no \
+		samba_cv_SIZEOF_INO_T=4 \
+		samba_cv_SIZEOF_OFF_T=4 \
+		samba_cv_SYSCONF_SC_NGROUPS_MAX=yes \
+		samba_cv_USE_SETEUID=yes \
+		samba_cv_USE_SETRESUID=no \
+		samba_cv_USE_SETREUID=yes \
+		samba_cv_USE_SETUIDX=no \
+		samba_cv_have_longlong=yes \
+		samba_cv_have_setresgid=no \
+		samba_cv_have_setresuid=no \
+		./configure \
+			--target=$(GNU_TARGET_NAME) \
+			--host=$(GNU_TARGET_NAME) \
+			--build=$(GNU_HOST_NAME) \
+			--program-prefix="" \
+			--program-suffix="" \
+			--prefix=/usr \
+			--exec-prefix=/usr \
+			--bindir=/usr/bin \
+			--datadir=/usr/share \
+			--includedir=/usr/include \
+			--infodir=/usr/share/info \
+			--libdir=/usr/lib \
+			--libexecdir=/usr/lib \
+			--localstatedir=/var/log/samba2 \
+			--mandir=/usr/share/man \
+			--sbindir=/usr/sbin \
+			--sysconfdir=/etc/samba2 \
+			$(DISABLE_NLS) \
+			--with-included-popt \
+			--with-lockdir=/var/run/samba2 \
+			--with-privatedir=/etc/samba2 \
+			--with-readline=no \
+			--with-syslog \
+	);
+	$(MAKE) -C $(PKG_BUILD_DIR)/source \
+		$(TARGET_CONFIGURE_OPTS) \
+		CODEPAGEDIR="/usr/share/samba2" \
+		all 
+	(cd $(PKG_BUILD_DIR)/source/bin ; \
+		mv -f make_smbcodepage.old make_smbcodepage ; touch make_smbcodepage ; \
+		mv -f make_unicodemap.old make_unicodemap ; touch make_unicodemap ; \
+	);
+	mkdir -p $(PKG_INSTALL_DIR)/usr/share/samba2
+	mkdir -p $(PKG_INSTALL_DIR)/var/log
+	$(MAKE) -C $(PKG_BUILD_DIR)/source \
+		BASEDIR="$(PKG_INSTALL_DIR)/usr" \
+		BINDIR="$(PKG_INSTALL_DIR)/usr/bin" \
+		SBINDIR="$(PKG_INSTALL_DIR)/usr/bin" \
+		LIBDIR="$(PKG_INSTALL_DIR)/usr/lib" \
+		VARDIR="$(PKG_INSTALL_DIR)/var/log/samba2" \
+		MANDIR="$(PKG_INSTALL_DIR)/usr/share/man" \
+		CONFIGDIR="$(PKG_INSTALL_DIR)/etc/samba2" \
+		PRIVATEDIR="$(PKG_INSTALL_DIR)/etc/samba2" \
+		SWATDIR="$(PKG_INSTALL_DIR)/usr/swat" \
+		LOCKDIR="$(PKG_INSTALL_DIR)/var/run/samba2" \
+		SAMBABOOK="$(PKG_INSTALL_DIR)/usr/swat/using_samba2" \
+		CODEPAGEDIR="$(PKG_INSTALL_DIR)/usr/share/samba2" \
+		install
+endef
+
+define Package/samba2-common/install
+	$(INSTALL_DIR) $(1)/etc/samba2
+#	$(INSTALL_DATA) ./files/smb.conf $(1)/etc/samba2/smb.conf
+	$(INSTALL_DIR) $(1)/usr/bin
+#	$(INSTALL_BIN) $(PKG_BUILD_DIR)/source/bin/smbpasswd.shared $(1)/usr/bin/smbpasswd
+	$(INSTALL_DIR) $(1)/usr/share/samba2
+	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/share/samba2/codepage.{437,850} $(1)/usr/share/samba2/
+	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/share/samba2/unicode_map.{437,850,ISO8859-1,ISO8859-15} $(1)/usr/share/samba2/
+	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/share/samba2/codepage.852 $(1)/usr/share/samba2/
+	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/share/samba2/unicode_map.{852,ISO8859-2} $(1)/usr/share/samba2/
+	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/share/samba2/codepage.{866,1251} $(1)/usr/share/samba2/
+	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/share/samba2/unicode_map.{866,ISO8859-5,KOI8-R,1251} $(1)/usr/share/samba2/
+endef
+
+define Package/samba2-common/conffiles
+/etc/samba2/smb.conf
+endef
+
+#define Package/samba2-server/install
+#	$(INSTALL_DIR) $(1)/etc/init.d
+#	$(INSTALL_BIN) ./files/samba2.init $(1)/etc/init.d/samba2
+#	$(INSTALL_DIR) $(1)/usr/lib
+#	$(INSTALL_BIN) $(PKG_BUILD_DIR)/source/bin/libsmb.so $(1)/usr/lib/
+#	$(INSTALL_DIR) $(1)/usr/sbin
+#	$(INSTALL_BIN) $(PKG_BUILD_DIR)/source/bin/nmbd.shared $(1)/usr/sbin/nmbd
+#	$(INSTALL_BIN) $(PKG_BUILD_DIR)/source/bin/smbd.shared $(1)/usr/sbin/smbd
+#endef
+
+define Package/samba2-client/install
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/rpcclient $(1)/usr/bin/
+endef
+
+$(eval $(call BuildPackage,samba2-common))
+#$(eval $(call BuildPackage,samba2-server))
+$(eval $(call BuildPackage,samba2-client))

shflags/Makefile

@@ -1,50 +0,0 @@
-#
-# Copyright (C) 2012-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=shflags
-PKG_VERSION:=2012-06-11
-PKG_RELEASE=$(PKG_SOURCE_VERSION)
-
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://github.com/kward/shflags.git
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=c12b30cebb92b49c5edb6df255c0952c65b4ddc6
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
-PKG_LICENSE:=LGPL-2.1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/shflags
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE:=shflags
-  DEPENDS:=+getopt
-  URL:=http://code.google.com/p/shflags/
-  MAINTAINER:=Luka Perkov <luka@openwrt.org>
-endef
-
-define Package/shflags/description
- command-line flags module for Unix shell scripts
-endef
-
-define Build/Configure
-endef
-
-define Build/Compile
-endef
-
-define Build/Install
-endef
-
-define Package/shflags/install
-	$(INSTALL_DIR) $(1)/usr/share/shflags
-	$(CP) $(PKG_BUILD_DIR)/source/1.0/src/shflags  $(1)/usr/share/shflags/shflags.sh
-endef
-
-$(eval $(call BuildPackage,shflags))

shflags/patches/000-strip.patch

@@ -1,763 +0,0 @@
---- a/source/1.0/src/shflags
-+++ b/source/1.0/src/shflags
-@@ -1,91 +1,10 @@
--# $Id$
--# vim:et:ft=sh:sts=2:sw=2
--#
--# Copyright 2008 Kate Ward. All Rights Reserved.
--# Released under the LGPL (GNU Lesser General Public License)
--#
--# shFlags -- Advanced command-line flag library for Unix shell scripts.
--# http://code.google.com/p/shflags/
--#
--# Author: kate.ward@forestent.com (Kate Ward)
--#
--# This module implements something like the google-gflags library available
--# from http://code.google.com/p/google-gflags/.
--#
--# FLAG TYPES: This is a list of the DEFINE_*'s that you can do.  All flags take
--# a name, default value, help-string, and optional 'short' name (one-letter
--# name).  Some flags have other arguments, which are described with the flag.
--#
--# DEFINE_string: takes any input, and intreprets it as a string.
--#
--# DEFINE_boolean: typically does not take any argument: say --myflag to set
--#   FLAGS_myflag to true, or --nomyflag to set FLAGS_myflag to false.
--#   Alternately, you can say
--#     --myflag=true  or --myflag=t or --myflag=0  or
--#     --myflag=false or --myflag=f or --myflag=1
--#   Passing an option has the same affect as passing the option once.
--#
--# DEFINE_float: takes an input and intreprets it as a floating point number. As
--#   shell does not support floats per-se, the input is merely validated as
--#   being a valid floating point value.
--#
--# DEFINE_integer: takes an input and intreprets it as an integer.
--#
--# SPECIAL FLAGS: There are a few flags that have special meaning:
--#   --help (or -?)  prints a list of all the flags in a human-readable fashion
--#   --flagfile=foo  read flags from foo.  (not implemented yet)
--#   --              as in getopt(), terminates flag-processing
--#
--# EXAMPLE USAGE:
--#
--#   -- begin hello.sh --
--#   #! /bin/sh
--#   . ./shflags
--#   DEFINE_string name 'world' "somebody's name" n
--#   FLAGS "$@" || exit $?
--#   eval set -- "${FLAGS_ARGV}"
--#   echo "Hello, ${FLAGS_name}."
--#   -- end hello.sh --
--#
--#   $ ./hello.sh -n Kate
--#   Hello, Kate.
--#
--# NOTE: Not all systems include a getopt version that supports long flags. On
--# these systems, only short flags are recognized.
--
--#==============================================================================
--# shFlags
--#
--# Shared attributes:
--#   flags_error: last error message
--#   flags_return: last return value
--#
--#   __flags_longNames: list of long names for all flags
--#   __flags_shortNames: list of short names for all flags
--#   __flags_boolNames: list of boolean flag names
--#
--#   __flags_opts: options parsed by getopt
--#
--# Per-flag attributes:
--#   FLAGS_<flag_name>: contains value of flag named 'flag_name'
--#   __flags_<flag_name>_default: the default flag value
--#   __flags_<flag_name>_help: the flag help string
--#   __flags_<flag_name>_short: the flag short name
--#   __flags_<flag_name>_type: the flag type
--#
--# Notes:
--# - lists of strings are space separated, and a null value is the '~' char.
--
--# return if FLAGS already loaded
- [ -n "${FLAGS_VERSION:-}" ] && return 0
- FLAGS_VERSION='1.0.3'
- 
--# return values
- FLAGS_TRUE=0
- FLAGS_FALSE=1
- FLAGS_ERROR=2
- 
--# reserved flag names
- FLAGS_RESERVED='ARGC ARGV ERROR FALSE HELP PARENT RESERVED TRUE VERSION'
- 
- _flags_debug() { echo "flags:DEBUG $@" >&2; }
-@@ -93,7 +12,6 @@ _flags_warn() { echo "flags:WARN $@" >&2
- _flags_error() { echo "flags:ERROR $@" >&2; }
- _flags_fatal() { echo "flags:FATAL $@" >&2; }
- 
--# specific shell checks
- if [ -n "${ZSH_VERSION:-}" ]; then
-   setopt |grep "^shwordsplit$" >/dev/null
-   if [ $? -ne ${FLAGS_TRUE} ]; then
-@@ -107,20 +25,15 @@ if [ -n "${ZSH_VERSION:-}" ]; then
-   fi
- fi
- 
--#
--# constants
--#
- 
--# getopt version
- __FLAGS_GETOPT_VERS_STD=0
- __FLAGS_GETOPT_VERS_ENH=1
- __FLAGS_GETOPT_VERS_BSD=2
- 
- getopt >/dev/null 2>&1
- case $? in
--  0) __FLAGS_GETOPT_VERS=${__FLAGS_GETOPT_VERS_STD} ;;  # bsd getopt
-+  0) __FLAGS_GETOPT_VERS=${__FLAGS_GETOPT_VERS_STD} ;;
-   2)
--    # TODO(kward): look into '-T' option to test the internal getopt() version
-     if [ "`getopt --version`" = '-- ' ]; then
-       __FLAGS_GETOPT_VERS=${__FLAGS_GETOPT_VERS_STD}
-     else
-@@ -133,82 +46,49 @@ case $? in
-     ;;
- esac
- 
--# getopt optstring lengths
- __FLAGS_OPTSTR_SHORT=0
- __FLAGS_OPTSTR_LONG=1
- 
- __FLAGS_NULL='~'
- 
--# flag info strings
- __FLAGS_INFO_DEFAULT='default'
- __FLAGS_INFO_HELP='help'
- __FLAGS_INFO_SHORT='short'
- __FLAGS_INFO_TYPE='type'
- 
--# flag lengths
- __FLAGS_LEN_SHORT=0
- __FLAGS_LEN_LONG=1
- 
--# flag types
- __FLAGS_TYPE_NONE=0
- __FLAGS_TYPE_BOOLEAN=1
- __FLAGS_TYPE_FLOAT=2
- __FLAGS_TYPE_INTEGER=3
- __FLAGS_TYPE_STRING=4
- 
--# set the constants readonly
- __flags_constants=`set |awk -F= '/^FLAGS_/ || /^__FLAGS_/ {print $1}'`
- for __flags_const in ${__flags_constants}; do
--  # skip certain flags
-   case ${__flags_const} in
-     FLAGS_HELP) continue ;;
-     FLAGS_PARENT) continue ;;
-   esac
--  # set flag readonly
-   if [ -z "${ZSH_VERSION:-}" ]; then
-     readonly ${__flags_const}
--  else  # handle zsh
-+  else
-     case ${ZSH_VERSION} in
-       [123].*) readonly ${__flags_const} ;;
--      *) readonly -g ${__flags_const} ;;  # declare readonly constants globally
-+      *) readonly -g ${__flags_const} ;;
-     esac
-   fi
- done
- unset __flags_const __flags_constants
- 
--#
--# internal variables
--#
--
--__flags_boolNames=' '  # space separated list of boolean flag names
--__flags_longNames=' '  # space separated list of long flag names
--__flags_shortNames=' '  # space separated list of short flag names
--
--__flags_columns=''  # screen width in columns
--__flags_opts=''  # temporary storage for parsed getopt flags
--
--#------------------------------------------------------------------------------
--# private functions
--#
--
--# Define a flag.
--#
--# Calling this function will define the following info variables for the
--# specified flag:
--#   FLAGS_flagname - the name for this flag (based upon the long flag name)
--#   __flags_<flag_name>_default - the default value
--#   __flags_flagname_help - the help string
--#   __flags_flagname_short - the single letter alias
--#   __flags_flagname_type - the type of flag (one of __FLAGS_TYPE_*)
--#
--# Args:
--#   _flags__type: integer: internal type of flag (__FLAGS_TYPE_*)
--#   _flags__name: string: long flag name
--#   _flags__default: default flag value
--#   _flags__help: string: help string
--#   _flags__short: string: (optional) short flag name
--# Returns:
--#   integer: success of operation, or error
-+
-+__flags_boolNames=' '
-+__flags_longNames=' '
-+__flags_shortNames=' '
-+__flags_columns=''
-+__flags_opts=''
-+
- _flags_define()
- {
-   if [ $# -lt 4 ]; then
-@@ -226,16 +106,13 @@ _flags_define()
- 
-   _flags_return_=${FLAGS_TRUE}
- 
--  # TODO(kward): check for validity of the flag name (e.g. dashes)
- 
--  # check whether the flag name is reserved
-   echo " ${FLAGS_RESERVED} " |grep " ${_flags_name_} " >/dev/null
-   if [ $? -eq 0 ]; then
-     flags_error="flag name (${_flags_name_}) is reserved"
-     _flags_return_=${FLAGS_ERROR}
-   fi
- 
--  # require short option for getopt that don't support long options
-   if [ ${_flags_return_} -eq ${FLAGS_TRUE} \
-       -a ${__FLAGS_GETOPT_VERS} -ne ${__FLAGS_GETOPT_VERS_ENH} \
-       -a "${_flags_short_}" = "${__FLAGS_NULL}" ]
-@@ -244,7 +121,6 @@ _flags_define()
-     _flags_return_=${FLAGS_ERROR}
-   fi
- 
--  # check for existing long name definition
-   if [ ${_flags_return_} -eq ${FLAGS_TRUE} ]; then
-     if _flags_itemInList "${_flags_name_}" \
-         ${__flags_longNames} ${__flags_boolNames}
-@@ -255,7 +131,6 @@ _flags_define()
-     fi
-   fi
- 
--  # check for existing short name definition
-   if [ ${_flags_return_} -eq ${FLAGS_TRUE} \
-       -a "${_flags_short_}" != "${__FLAGS_NULL}" ]
-   then
-@@ -266,9 +141,6 @@ _flags_define()
-     fi
-   fi
- 
--  # handle default value. note, on several occasions the 'if' portion of an
--  # if/then/else contains just a ':' which does nothing. a binary reversal via
--  # '!' is not done because it does not work on all shells.
-   if [ ${_flags_return_} -eq ${FLAGS_TRUE} ]; then
-     case ${_flags_type_} in
-       ${__FLAGS_TYPE_BOOLEAN})
-@@ -301,7 +173,7 @@ _flags_define()
-         fi
-         ;;
- 
--      ${__FLAGS_TYPE_STRING}) ;;  # everything in shell is a valid string
-+      ${__FLAGS_TYPE_STRING}) ;;
- 
-       *)
-         flags_error="unrecognized flag type '${_flags_type_}'"
-@@ -311,7 +183,6 @@ _flags_define()
-   fi
- 
-   if [ ${_flags_return_} -eq ${FLAGS_TRUE} ]; then
--    # store flag information
-     eval "FLAGS_${_flags_name_}='${_flags_default_}'"
-     eval "__flags_${_flags_name_}_${__FLAGS_INFO_TYPE}=${_flags_type_}"
-     eval "__flags_${_flags_name_}_${__FLAGS_INFO_DEFAULT}=\
-@@ -319,7 +190,6 @@ _flags_define()
-     eval "__flags_${_flags_name_}_${__FLAGS_INFO_HELP}=\"${_flags_help_}\""
-     eval "__flags_${_flags_name_}_${__FLAGS_INFO_SHORT}='${_flags_short_}'"
- 
--    # append flag name(s) to list of names
-     __flags_longNames="${__flags_longNames}${_flags_name_} "
-     __flags_shortNames="${__flags_shortNames}${_flags_short_} "
-     [ ${_flags_type_} -eq ${__FLAGS_TYPE_BOOLEAN} ] && \
-@@ -333,17 +203,6 @@ _flags_define()
-   return ${flags_return}
- }
- 
--# Return valid getopt options using currently defined list of long options.
--#
--# This function builds a proper getopt option string for short (and long)
--# options, using the current list of long options for reference.
--#
--# Args:
--#   _flags_optStr: integer: option string type (__FLAGS_OPTSTR_*)
--# Output:
--#   string: generated option string for getopt
--# Returns:
--#   boolean: success of operation (always returns True)
- _flags_genOptStr()
- {
-   _flags_optStrType_=$1
-@@ -358,7 +217,6 @@ _flags_genOptStr()
-             ${_flags_flag_} ${__FLAGS_INFO_SHORT}`
-         if [ "${_flags_shortName_}" != "${__FLAGS_NULL}" ]; then
-           _flags_opts_="${_flags_opts_}${_flags_shortName_}"
--          # getopt needs a trailing ':' to indicate a required argument
-           [ ${_flags_type_} -ne ${__FLAGS_TYPE_BOOLEAN} ] && \
-               _flags_opts_="${_flags_opts_}:"
-         fi
-@@ -366,7 +224,6 @@ _flags_genOptStr()
- 
-       ${__FLAGS_OPTSTR_LONG})
-         _flags_opts_="${_flags_opts_:+${_flags_opts_},}${_flags_flag_}"
--        # getopt needs a trailing ':' to indicate a required argument
-         [ ${_flags_type_} -ne ${__FLAGS_TYPE_BOOLEAN} ] && \
-             _flags_opts_="${_flags_opts_}:"
-         ;;
-@@ -379,15 +236,6 @@ _flags_genOptStr()
-   return ${FLAGS_TRUE}
- }
- 
--# Returns flag details based on a flag name and flag info.
--#
--# Args:
--#   string: long flag name
--#   string: flag info (see the _flags_define function for valid info types)
--# Output:
--#   string: value of dereferenced flag variable
--# Returns:
--#   integer: one of FLAGS_{TRUE|FALSE|ERROR}
- _flags_getFlagInfo()
- {
-   _flags_name_=$1
-@@ -399,13 +247,6 @@ _flags_getFlagInfo()
-   if [ -n "${_flags_value_}" ]; then
-     flags_return=${FLAGS_TRUE}
-   else
--    # see if the _flags_name_ variable is a string as strings can be empty...
--    # note: the DRY principle would say to have this function call itself for
--    # the next three lines, but doing so results in an infinite loop as an
--    # invalid _flags_name_ will also not have the associated _type variable.
--    # Because it doesn't (it will evaluate to an empty string) the logic will
--    # try to find the _type variable of the _type variable, and so on. Not so
--    # good ;-)
-     _flags_typeVar_="__flags_${_flags_name_}_${__FLAGS_INFO_TYPE}"
-     _flags_strToEval_="_flags_type_=\"\${${_flags_typeVar_}:-}\""
-     eval "${_flags_strToEval_}"
-@@ -424,15 +265,6 @@ _flags_getFlagInfo()
-   return ${flags_return}
- }
- 
--# check for presense of item in a list. passed a string (e.g. 'abc'), this
--# function will determine if the string is present in the list of strings (e.g.
--# ' foo bar abc ').
--#
--# Args:
--#   _flags__str: string: string to search for in a list of strings
--#   unnamed: list: list of strings
--# Returns:
--#   boolean: true if item is in the list
- _flags_itemInList()
- {
-   _flags_str_=$1
-@@ -449,34 +281,22 @@ _flags_itemInList()
-   return ${flags_return}
- }
- 
--# Returns the width of the current screen.
--#
--# Output:
--#   integer: width in columns of the current screen.
- _flags_columns()
- {
-   if [ -z "${__flags_columns}" ]; then
--    # determine the value and store it
-     if eval stty size >/dev/null 2>&1; then
--      # stty size worked :-)
-       set -- `stty size`
-       __flags_columns=$2
-     elif eval tput cols >/dev/null 2>&1; then
-       set -- `tput cols`
-       __flags_columns=$1
-     else
--      __flags_columns=80  # default terminal width
-+      __flags_columns=80
-     fi
-   fi
-   echo ${__flags_columns}
- }
- 
--# Validate a boolean.
--#
--# Args:
--#   _flags__bool: boolean: value to validate
--# Returns:
--#   bool: true if the value is a valid boolean
- _flags_validateBoolean()
- {
-   _flags_bool_=$1
-@@ -492,12 +312,6 @@ _flags_validateBoolean()
-   return ${flags_return}
- }
- 
--# Validate a float.
--#
--# Args:
--#   _flags__float: float: value to validate
--# Returns:
--#   bool: true if the value is a valid float
- _flags_validateFloat()
- {
-   _flags_float_=$1
-@@ -507,10 +321,10 @@ _flags_validateFloat()
-   else
-     flags_return=${FLAGS_TRUE}
-     case ${_flags_float_} in
--      -*)  # negative floats
-+      -*)
-         _flags_test_=`expr "${_flags_float_}" : '\(-[0-9][0-9]*\.[0-9][0-9]*\)'`
-         ;;
--      *)  # positive floats
-+      *)
-         _flags_test_=`expr "${_flags_float_}" : '\([0-9][0-9]*\.[0-9][0-9]*\)'`
-         ;;
-     esac
-@@ -521,22 +335,16 @@ _flags_validateFloat()
-   return ${flags_return}
- }
- 
--# Validate an integer.
--#
--# Args:
--#   _flags__integer: interger: value to validate
--# Returns:
--#   bool: true if the value is a valid integer
- _flags_validateInteger()
- {
-   _flags_int_=$1
- 
-   flags_return=${FLAGS_TRUE}
-   case ${_flags_int_} in
--    -*)  # negative ints
-+    -*)
-       _flags_test_=`expr "${_flags_int_}" : '\(-[0-9][0-9]*\)'`
-       ;;
--    *)  # positive ints
-+    *)
-       _flags_test_=`expr "${_flags_int_}" : '\([0-9][0-9]*\)'`
-       ;;
-   esac
-@@ -546,23 +354,12 @@ _flags_validateInteger()
-   return ${flags_return}
- }
- 
--# Parse command-line options using the standard getopt.
--#
--# Note: the flag options are passed around in the global __flags_opts so that
--# the formatting is not lost due to shell parsing and such.
--#
--# Args:
--#   @: varies: command-line options to parse
--# Returns:
--#   integer: a FLAGS success condition
- _flags_getoptStandard()
- {
-   flags_return=${FLAGS_TRUE}
-   _flags_shortOpts_=`_flags_genOptStr ${__FLAGS_OPTSTR_SHORT}`
- 
--  # check for spaces in passed options
-   for _flags_opt_ in "$@"; do
--    # note: the silliness with the x's is purely for ksh93 on Ubuntu 6.06
-     _flags_match_=`echo "x${_flags_opt_}x" |sed 's/ //g'`
-     if [ "${_flags_match_}" != "x${_flags_opt_}x" ]; then
-       flags_error='the available getopt does not support spaces in options'
-@@ -585,15 +382,6 @@ _flags_getoptStandard()
-   return ${flags_return}
- }
- 
--# Parse command-line options using the enhanced getopt.
--#
--# Note: the flag options are passed around in the global __flags_opts so that
--# the formatting is not lost due to shell parsing and such.
--#
--# Args:
--#   @: varies: command-line options to parse
--# Returns:
--#   integer: a FLAGS success condition
- _flags_getoptEnhanced()
- {
-   flags_return=${FLAGS_TRUE}
-@@ -617,17 +405,6 @@ _flags_getoptEnhanced()
-   return ${flags_return}
- }
- 
--# Dynamically parse a getopt result and set appropriate variables.
--#
--# This function does the actual conversion of getopt output and runs it through
--# the standard case structure for parsing. The case structure is actually quite
--# dynamic to support any number of flags.
--#
--# Args:
--#   argc: int: original command-line argument count
--#   @: varies: output from getopt parsing
--# Returns:
--#   integer: a FLAGS success condition
- _flags_parseGetopt()
- {
-   _flags_argc_=$1
-@@ -638,35 +415,26 @@ _flags_parseGetopt()
-   if [ ${__FLAGS_GETOPT_VERS} -ne ${__FLAGS_GETOPT_VERS_ENH} ]; then
-     set -- $@
-   else
--    # note the quotes around the `$@' -- they are essential!
-     eval set -- "$@"
-   fi
- 
--  # provide user with number of arguments to shift by later
--  # NOTE: the FLAGS_ARGC variable is obsolete as of 1.0.3 because it does not
--  # properly give user access to non-flag arguments mixed in between flag
--  # arguments. Its usage was replaced by FLAGS_ARGV, and it is being kept only
--  # for backwards compatibility reasons.
-   FLAGS_ARGC=`expr $# - 1 - ${_flags_argc_}`
- 
--  # handle options. note options with values must do an additional shift
-   while true; do
-     _flags_opt_=$1
-     _flags_arg_=${2:-}
-     _flags_type_=${__FLAGS_TYPE_NONE}
-     _flags_name_=''
- 
--    # determine long flag name
-     case "${_flags_opt_}" in
--      --) shift; break ;;  # discontinue option parsing
-+      --) shift; break ;;
- 
--      --*)  # long option
-+      --*)
-         _flags_opt_=`expr "${_flags_opt_}" : '--\(.*\)'`
-         _flags_len_=${__FLAGS_LEN_LONG}
-         if _flags_itemInList "${_flags_opt_}" ${__flags_longNames}; then
-           _flags_name_=${_flags_opt_}
-         else
--          # check for negated long boolean version
-           if _flags_itemInList "${_flags_opt_}" ${__flags_boolNames}; then
-             _flags_name_=`expr "${_flags_opt_}" : 'no\(.*\)'`
-             _flags_type_=${__FLAGS_TYPE_BOOLEAN}
-@@ -675,12 +443,10 @@ _flags_parseGetopt()
-         fi
-         ;;
- 
--      -*)  # short option
-+      -*)
-         _flags_opt_=`expr "${_flags_opt_}" : '-\(.*\)'`
-         _flags_len_=${__FLAGS_LEN_SHORT}
-         if _flags_itemInList "${_flags_opt_}" ${__flags_shortNames}; then
--          # yes. match short name to long name. note purposeful off-by-one
--          # (too high) with awk calculations.
-           _flags_pos_=`echo "${__flags_shortNames}" \
-               |awk 'BEGIN{RS=" ";rn=0}$0==e{rn=NR}END{print rn}' \
-                   e=${_flags_opt_}`
-@@ -690,14 +456,12 @@ _flags_parseGetopt()
-         ;;
-     esac
- 
--    # die if the flag was unrecognized
-     if [ -z "${_flags_name_}" ]; then
-       flags_error="unrecognized option (${_flags_opt_})"
-       flags_return=${FLAGS_ERROR}
-       break
-     fi
- 
--    # set new flag value
-     [ ${_flags_type_} -eq ${__FLAGS_TYPE_NONE} ] && \
-         _flags_type_=`_flags_getFlagInfo \
-             "${_flags_name_}" ${__FLAGS_INFO_TYPE}`
-@@ -746,7 +510,6 @@ _flags_parseGetopt()
-         ;;
-     esac
- 
--    # handle special case help flag
-     if [ "${_flags_name_}" = 'help' ]; then
-       if [ ${FLAGS_help} -eq ${FLAGS_TRUE} ]; then
-         flags_help
-@@ -756,12 +519,10 @@ _flags_parseGetopt()
-       fi
-     fi
- 
--    # shift the option and non-boolean arguements out.
-     shift
-     [ ${_flags_type_} != ${__FLAGS_TYPE_BOOLEAN} ] && shift
-   done
- 
--  # give user back non-flag arguments
-   FLAGS_ARGV=''
-   while [ $# -gt 0 ]; do
-     FLAGS_ARGV="${FLAGS_ARGV:+${FLAGS_ARGV} }'$1'"
-@@ -773,43 +534,18 @@ _flags_parseGetopt()
-   return ${flags_return}
- }
- 
--#------------------------------------------------------------------------------
--# public functions
--#
--
--# A basic boolean flag. Boolean flags do not take any arguments, and their
--# value is either 1 (false) or 0 (true). For long flags, the false value is
--# specified on the command line by prepending the word 'no'. With short flags,
--# the presense of the flag toggles the current value between true and false.
--# Specifying a short boolean flag twice on the command results in returning the
--# value back to the default value.
--#
--# A default value is required for boolean flags.
--#
--# For example, lets say a Boolean flag was created whose long name was 'update'
--# and whose short name was 'x', and the default value was 'false'. This flag
--# could be explicitly set to 'true' with '--update' or by '-x', and it could be
--# explicitly set to 'false' with '--noupdate'.
-+
- DEFINE_boolean() { _flags_define ${__FLAGS_TYPE_BOOLEAN} "$@"; }
- 
--# Other basic flags.
- DEFINE_float()   { _flags_define ${__FLAGS_TYPE_FLOAT} "$@"; }
- DEFINE_integer() { _flags_define ${__FLAGS_TYPE_INTEGER} "$@"; }
- DEFINE_string()  { _flags_define ${__FLAGS_TYPE_STRING} "$@"; }
- 
--# Parse the flags.
--#
--# Args:
--#   unnamed: list: command-line flags to parse
--# Returns:
--#   integer: success of operation, or error
- FLAGS()
- {
--  # define a standard 'help' flag if one isn't already defined
-   [ -z "${__flags_help_type:-}" ] && \
-       DEFINE_boolean 'help' false 'show this help' 'h'
- 
--  # parse options
-   if [ $# -gt 0 ]; then
-     if [ ${__FLAGS_GETOPT_VERS} -ne ${__FLAGS_GETOPT_VERS_ENH} ]; then
-       _flags_getoptStandard "$@"
-@@ -818,7 +554,6 @@ FLAGS()
-     fi
-     flags_return=$?
-   else
--    # nothing passed; won't bother running getopt
-     __flags_opts='--'
-     flags_return=${FLAGS_TRUE}
-   fi
-@@ -832,23 +567,11 @@ FLAGS()
-   return ${flags_return}
- }
- 
--# This is a helper function for determining the `getopt` version for platforms
--# where the detection isn't working. It simply outputs debug information that
--# can be included in a bug report.
--#
--# Args:
--#   none
--# Output:
--#   debug info that can be included in a bug report
--# Returns:
--#   nothing
- flags_getoptInfo()
- {
--  # platform info
-   _flags_debug "uname -a: `uname -a`"
-   _flags_debug "PATH: ${PATH}"
- 
--  # shell info
-   if [ -n "${BASH_VERSION:-}" ]; then
-     _flags_debug 'shell: bash'
-     _flags_debug "BASH_VERSION: ${BASH_VERSION}"
-@@ -857,7 +580,6 @@ flags_getoptInfo()
-     _flags_debug "ZSH_VERSION: ${ZSH_VERSION}"
-   fi
- 
--  # getopt info
-   getopt >/dev/null
-   _flags_getoptReturn=$?
-   _flags_debug "getopt return: ${_flags_getoptReturn}"
-@@ -866,39 +588,16 @@ flags_getoptInfo()
-   unset _flags_getoptReturn
- }
- 
--# Returns whether the detected getopt version is the enhanced version.
--#
--# Args:
--#   none
--# Output:
--#   none
--# Returns:
--#   bool: true if getopt is the enhanced version
- flags_getoptIsEnh()
- {
-   test ${__FLAGS_GETOPT_VERS} -eq ${__FLAGS_GETOPT_VERS_ENH}
- }
- 
--# Returns whether the detected getopt version is the standard version.
--#
--# Args:
--#   none
--# Returns:
--#   bool: true if getopt is the standard version
- flags_getoptIsStd()
- {
-   test ${__FLAGS_GETOPT_VERS} -eq ${__FLAGS_GETOPT_VERS_STD}
- }
- 
--# This is effectively a 'usage()' function. It prints usage information and
--# exits the program with ${FLAGS_FALSE} if it is ever found in the command line
--# arguments. Note this function can be overridden so other apps can define
--# their own --help flag, replacing this one, if they want.
--#
--# Args:
--#   none
--# Returns:
--#   integer: success of operation (always returns true)
- flags_help()
- {
-   if [ -n "${FLAGS_HELP:-}" ]; then
-@@ -953,19 +652,14 @@ flags_help()
-         echo "${flags_helpStr_}" >&2
-       else
-         echo "  ${flags_flagStr_}  ${flags_help_}" >&2
--        # note: the silliness with the x's is purely for ksh93 on Ubuntu 6.06
--        # because it doesn't like empty strings when used in this manner.
-         flags_emptyStr_="`echo \"x${flags_flagStr_}x\" \
-             |awk '{printf "%"length($0)-2"s", ""}'`"
-         flags_helpStr_="  ${flags_emptyStr_}  ${flags_defaultStr_}"
-         flags_helpStrLen_=`expr "${flags_helpStr_}" : '.*'`
-         if [ ${__FLAGS_GETOPT_VERS} -eq ${__FLAGS_GETOPT_VERS_STD} \
-             -o ${flags_helpStrLen_} -lt ${flags_columns_} ]; then
--          # indented to match help string
-           echo "${flags_helpStr_}" >&2
-         else
--          # indented four from left to allow for longer defaults as long flag
--          # names might be used too, making things too long
-           echo "    ${flags_defaultStr_}" >&2
-         fi
-       fi
-@@ -978,12 +672,6 @@ flags_help()
-   return ${FLAGS_TRUE}
- }
- 
--# Reset shflags back to an uninitialized state.
--#
--# Args:
--#   none
--# Returns:
--#   nothing
- flags_reset()
- {
-   for flags_name_ in ${__flags_longNames}; do
-@@ -1000,7 +688,6 @@ flags_reset()
-     eval ${flags_strToEval_}
-   done
- 
--  # reset internal variables
-   __flags_boolNames=' '
-   __flags_longNames=' '
-   __flags_shortNames=' '

sipcalc/Makefile

@@ -24,6 +24,7 @@ define Package/sipcalc
   CATEGORY:=Network
   TITLE:=IPv6 IPv4 Calculation Program
   URL:=http://www.routemeister.net/projects/sipcalc/
+  DEPENDS:=+kmod-ipv6
 endef
 
 define Package/sipcalc/description

speedtest-cli/Makefile

@@ -0,0 +1,43 @@
+#
+# Copyright (C) 2009 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+
+PKG_NAME:=speedtest-cli
+PKG_RELEASE:=1
+PKG_SOURCE:=speedtest_cli.py
+PKG_SOURCE_URL:=https://raw.githubusercontent.com/sivel/speedtest-cli/master
+PKG_LICENSE:=Apache-2.0
+PKG_LICENSE_FILES:=LICENSE
+include $(INCLUDE_DIR)/package.mk
+
+define Package/speedtest-cli
+  SECTION:=utils
+  CATEGORY:=Utilities
+  TITLE:=speedtest-cli utility
+  DEPENDS:=+python +python-mini +python-openssl +python-expat
+  URL:=https://github.com/sivel/speedtest-cli
+endef
+
+define Package/speedtest-cli/description
+  Command line interface for testing internet bandwidth using speedtest.net.
+endef
+
+define Build/Prepare
+endef
+
+define Build/Compile
+endef
+
+define Package/speedtest-cli/install
+	$(INSTALL_DIR) $(1)/sbin
+	$(CP) $(DL_DIR)/speedtest_cli.py $(1)/sbin/
+	chmod 744 $(1)/sbin/speedtest_cli.py
+endef
+
+$(eval $(call BuildPackage,speedtest-cli))

tr064/Makefile

@@ -24,7 +24,7 @@ define Package/tr064
   SECTION:=utils
   CATEGORY:=Utilities
   TITLE:=tr064
-  DEPENDS:=+libubus +libuci +libubox +libmicroxml +libjson-c +libpthread +libopenssl +libubus +libubox
+  DEPENDS:=+libubus +libuci +libubox +libmicroxml +libjson-c +libpthread +libdatamodel +libopenssl +libubus +libubox
 endef
 
 define Package/tr064/description

tr098/Makefile

@@ -5,11 +5,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libtr098
-PKG_VERSION:=1.0-2019-09-25
+PKG_VERSION:=1.0-2019-12-11
 PKG_FIXUP:=autoreconf
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/tr-098
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=65bd1d77eb85a2d5d3d55e5c68abd38268b89ec8
+PKG_SOURCE_VERSION:=ce93aebda4c14cfc43a7a60d67d4716a576171fd
 PKG_RELEASE=$(PKG_SOURCE_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)

voice-client/files/etc/init.d/voice_client

@@ -153,7 +153,6 @@ assemble_and_copy_config()
 	[ -f $TMPL_ASTERISK ]		&& cp $TMPL_ASTERISK		$WORKDIR/asterisk.conf
 	[ -f $TMPL_CDR ]		&& cp $TMPL_CDR			$WORKDIR/cdr.conf
 	[ -f $TMPL_CEL ]		&& cp $TMPL_CEL			$WORKDIR/cel.conf
-	[ -f $TMPL_INDICATIONS ]	&& cp $TMPL_INDICATIONS		$WORKDIR/indications.conf
 	[ -f $TMPL_MANAGER ]		&& cp $TMPL_MANAGER		$WORKDIR/manager.conf
 	[ -f $TMPL_MODULES ]		&& cp $TMPL_MODULES		$WORKDIR/modules.conf
 	[ -f $TMPL_EXTENSIONS_MACRO ]	&& cp $TMPL_EXTENSIONS_MACRO	$WORKDIR/extensions_macro.conf
@@ -165,6 +164,14 @@ assemble_and_copy_config()
 	[ -f $TMPL_UDPTL ]	        && cp $TMPL_UDPTL	        $WORKDIR/udptl.conf
 	[ -f $SPECRATECFG ]		&& cp $SPECRATECFG		$WORKDIR/special_rate_nr.cfg
 	
+	[ -f $TMPL_INDICATIONS ]	&&  {
+		cp $TMPL_INDICATIONS		$WORKDIR/indications.conf
+
+		config_get country TEL country
+		country_code=$(supportedCountries |grep $country |cut -d':' -f3 |tr [A-Z] [a-z])
+		sed -i "s/^country=.*/country=${country_code}/g" $WORKDIR/indications.conf
+	}
+
 	test -e $TMPL_MEETME && cp $TMPL_MEETME $WORKDIR/meetme.conf
 	
 	# Handle extensions_extra, carry over old file to new config if there is one
@@ -256,9 +263,7 @@ read_codecs_ptime()
 #
 read_lines()
 {
-	local line call_lines lineid ldx lines llength clength
-	local loffset=$(ubus -t 1 call voice.asterisk platform | jsonfilter -e @.lineoffset)
-	loffset=${loffset:-0}
+	local line call_lines lines clength
 
 	config_get call_lines $1 call_lines
 
@@ -267,28 +272,17 @@ read_lines()
 		# convert line format to <LINENAME><LINEID>
 		case $line in
 			[0-9])
-				line="$LINENAME$line"
 			;;
 			"$CHANNELNAME"/[0-9])
+				# get the index from channel name
 				clength=$(echo $CHANNELNAME | wc -c)
-				line="$LINENAME${line:$clength}"
+				line="${line:$clength}"
 			;;
 		esac
 
-		# get the index from line name
-		# llength=$(echo $LINENAME | wc -c)
-		# lineid="${lineid:$llength}"
+		[ -n "$line" ] || continue
 
-		# get the index from uci config order
-		lineid="$(uci show voice_client | grep =tel_line | grep -wn $line | cut -d ':' -f1)"
-
-		[ -n "$lineid" ] || continue
-
-		# -1 to match the line's uci config index number
-		# +loffset to match the correct number in channel driver
-		ldx=$((lineid-1+loffset))
-
-		lines="$lines$CHANNELNAME/$ldx&"
+		lines="$lines$CHANNELNAME/$line&"
 	done
 
 	lines=$(escape_sed_substitution $lines)
@@ -1795,6 +1789,7 @@ configure_tel()
 	local fac
 	local echocancel
 	local hold_target_before_refer
+	local calleridtype
 
 	config_get jbenable TEL jbenable
 	config_get jbforce TEL jbforce
@@ -1805,6 +1800,7 @@ configure_tel()
 	config_get fac TEL fac
 	config_get echocancel TEL echo_cancel
 	config_get hold_target_before_refer TEL hold_target_before_refer
+	config_get calleridtype TEL calleridtype
 
 	CHANNEL_FAC="$CHANNEL_FAC $fac"
 	# Convert whitespace to commas
@@ -1823,6 +1819,12 @@ configure_tel()
 	sed -i "s/|CHANNELS|/$(db get hw.board.VoicePorts)/"	$WORKDIR/$LINENAME.tmp
 	sed -i "s/|ECHOCANCEL|/$(getEchoCancellingValue $echocancel)/"	$WORKDIR/$LINENAME.tmp
 
+	if [ -n "${calleridtype}" ] ; then
+		sed -i "s/^calleridtype *=.*/calleridtype = ${calleridtype}/g" $WORKDIR/$LINENAME.tmp
+	else
+		sed -i "/^calleridtype *=.*/d" $WORKDIR/$LINENAME.tmp
+	fi
+
 	if [ "$dtmfmode" == "compatibility" ] ; then
 		dtmfcompatibility="1"
 	else
@@ -2243,6 +2245,7 @@ reload_service() {
 	# FXS channel module must be reloaded before sip module. Otherwise some attributes like
 	# line's registration state which is updated by SIP module through callback might be
 	# reset.
+	asterisk -rx "config reload $ASTERISKDIR/indications.conf"
 	asterisk -rx "$(getChipVendor) reload"
 	asterisk -rx "config reload $ASTERISKDIR/sip.conf"
 	sleep 1

voice-client/files/lib/voice/broadcom.sh

@@ -22,7 +22,7 @@ getBaseMAC() {
 }
 
 getAllLines() {
-    echo "BRCM/0&BRCM/1&BRCM/2&BRCM/3&BRCM/4&BRCM/5&BRCM/6"
+    echo "BRCM/0&BRCM/1&BRCM/2&BRCM/3&BRCM/4&BRCM/5"
 }
 
 getLineIdx() {

voice-client/files/lib/voice/intel.sh

@@ -28,12 +28,11 @@ getBaseMAC() {
 }
 
 getAllLines() {
-    echo "TAPI/1&TAPI/2&TAPI/3&TAPI/4&TAPI/5&TAPI/6"
+    echo "TAPI/0&TAPI/1"
 }
 
 getLineIdx() {
-    i=$1
-    echo $((i+1))
+    echo $1
 }
 
 getEchoCancellingValue() {
@@ -52,5 +51,14 @@ getEchoCancellingValue() {
 }
 
 supportedCountries() {
-	echo "ETSI:ETS"
+	echo "Austria:AUT:AT"
+	echo "Denmark:DNK:DK"
+	echo "Estonia:EST:EE"
+	echo "Germany:DEU:DE"
+	echo "Netherlands:NLD:NL"
+	echo "Norway:NOR:NO"
+	echo "Spain:ESP:ES"
+	echo "Sweden:SWE:SE"
+	echo "Switzerland:CHE:CH"
+	echo "United Kingdom:GBR:UK"
 }

voice-client/files/usr/libexec/rpcd/voice.asterisk

@@ -137,8 +137,8 @@ case "$1" in
 					    json_add_int chanoffset 0
 				    ;;
 				    "tapi")
-					    json_add_int lineoffset 1
-					    json_add_int chanoffset -1
+					    json_add_int lineoffset 0
+					    json_add_int chanoffset 0
 				    ;;
 			        *)
 				    # Error, unknown platform

wifilife/Makefile

@@ -10,7 +10,7 @@ PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE_VERSION:=878ad93c0f1ad49bd187f776808e0b86402b2238
 PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@iopsys.eu>
 
-PKG_LICENSE:=PROPRIETARY
+PKG_LICENSE:=PROPRIETARY IOPSYS
 PKG_LICENSE_FILES:=LICENSE
 
 ifeq ($(CONFIG_WIFILIFE_OPEN),y)

wifimngr/Makefile

@@ -8,7 +8,7 @@ PKG_NAME:=wifimngr
 PKG_VERSION:=2.4.0
 
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=c4063e9c5581fed6e75037d0b13698b7cb2d6c2a
+PKG_SOURCE_VERSION:=4b876ccabc1df73202bfb165b35fd6464ed019aa
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/wifimngr.git
 PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@iopsys.eu>
 

wifixd/Makefile

@@ -0,0 +1,57 @@
+#
+# Copyright (C) 2018 Iopsys
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=wifixd
+PKG_VERSION:=1.0.2
+
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_VERSION:=cd63143c262e079d4a782ccfa60111f342e42e3e
+PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/wifimngr.git
+PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@iopsys.eu>
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_LICENSE:=GPL-2.0-only
+PKG_LICENSE_FILES:=LICENSE
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/wifixd
+  SECTION:=utils
+  CATEGORY:=Utilities
+  TITLE:=WiFi status and configration utility (Deprecated)
+  DEPENDS:=+libwifix +libuci +libubox +ubus +libpthread +libnl-genl
+endef
+
+define Package/wifixd/description
+ This package can be used to configure and provide status about
+ the WiFi modules through UBUS.
+ It does this in an implementation agnostic manner through APIs
+ exposed by the libwifi library.
+endef
+
+TARGET_CFLAGS += \
+	-I$(STAGING_DIR)/usr/include \
+	-I$(STAGING_DIR)/usr/include/libnl3 \
+	-D_GNU_SOURCE
+
+#MAKE_FLAGS += \
+	CFLAGS="$(TARGET_CFLAGS)" \
+	LDFLAGS="$(TARGET_LDFLAGS)" \
+	FPIC="$(FPIC)"
+
+#define Build/Compile
+#	+$(MAKE_VARS) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS)
+#endef
+
+define Package/wifixd/install
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_BIN) ./files/wifix.init $(1)/etc/init.d/wifix
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/wifixd $(1)/usr/sbin/wifixd
+endef
+
+$(eval $(call BuildPackage,wifixd))

wifixd/files/wifix.init

@@ -0,0 +1,20 @@
+#!/bin/sh /etc/rc.common
+
+START=96
+STOP=10
+
+USE_PROCD=1
+PROG=/usr/sbin/wifixd
+
+start_service() {
+	procd_open_instance
+	procd_set_param command ${PROG}
+#	procd_set_param env IOP_LLA_LIBS_DEBUG=3    #for debugging only
+	procd_set_param respawn
+	procd_close_instance
+}
+
+reload_service() {
+        stop
+        start
+}