mt7603, mt7615: add Mediatek wifi driver packages

for now just print that it does not exist.
add some help text.

ated/Makefile

@@ -1,8 +1,15 @@
 #
-# Copyright (C) 2016 inteno
+# Copyright (C) 2019 iopsys Software Solutions AB. All rights reserved.
 #
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# version 2 as published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
 #
 
 include $(TOPDIR)/rules.mk
@@ -20,6 +27,9 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)-$(PKG_SOURCE_VERSION).tar.
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 
+PKG_LICENSE:=GPLv2
+PKG_LICENSE_FILES:=LICENSE
+
 # support parallel build
 #PKG_BUILD_PARALLEL:=1
 

bashdb/Makefile

@@ -13,6 +13,9 @@ PKG_MD5SUM:=b72c17870bfab2fd791b1f6de4d79f9e
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
+PKG_LICENSE:=GPLv2
+PKG_LICENSE_FILES:=none
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/$(PKG_NAME)

bbf/Config_bbfdm.in

@@ -0,0 +1,27 @@
+if PACKAGE_libbbfdm
+
+config LIBBBFDM_VENDOR_PREFIX
+    string "Vendor Prefix"
+    default "X_IOPSYS_EU_"
+
+config BBF_TR181
+	bool "Compile with tr181 device features"
+	default y
+
+config BBF_TR104
+	bool "Compile with tr104 voice features"
+	default y
+
+config BBF_TR143
+	bool "Compile with tr143 diagnostics features"
+	default y
+
+config BBF_TR157
+	bool "Compile with tr157 bulkdata collector features"
+	default y
+	
+config BBF_TR064
+	bool "Compile with tr064 features"
+	default n
+
+endif

bbf/Makefile

@@ -0,0 +1,88 @@
+#
+# Copyright (C) 2019 Iopsys
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=libbbfdm
+PKG_VERSION:=1.0-2019-11-02
+PKG_FIXUP:=autoreconf
+PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/bbf.git
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_VERSION:=a33b47b9c34bdd174e39b54525b082259c60850c
+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_FILES:=LICENSE
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/libbbfdm
+  SECTION:=libs
+  CATEGORY:=Libraries
+  TITLE:=Library for broadband-forum data model
+  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c +libtrace
+endef
+
+define Package/libbbfdm/config
+	source "$(SOURCE)/Config_bbfdm.in"
+endef
+
+define Package/libbbfdm/description
+ Test description will update later.
+endef
+
+TARGET_CFLAGS += -DCUSTOM_PREFIX=\\\"$(CONFIG_LIBBBFDM_VENDOR_PREFIX)\\\"
+
+TARGET_CFLAGS += \
+	-D_GNU_SOURCE -D_AADJ
+
+ifeq ($(CONFIG_BBF_TR181),y)
+CONFIGURE_ARGS += \
+	--enable-tr181
+endif
+
+ifeq ($(CONFIG_BBF_TR104),y)
+CONFIGURE_ARGS += \
+	--enable-tr104
+endif
+
+ifeq ($(CONFIG_BBF_TR143),y)
+CONFIGURE_ARGS += \
+	--enable-tr143
+endif
+
+ifeq ($(CONFIG_BBF_TR157),y)
+CONFIGURE_ARGS += \
+	--enable-tr157
+endif
+
+ifeq ($(CONFIG_BBF_TR064),y)
+CONFIGURE_ARGS += \
+	--enable-tr064
+endif
+
+define Package/libbbfdm/install
+	$(INSTALL_DIR) $(1)/lib
+	$(CP) $(PKG_BUILD_DIR)/bin/.libs/libbbfdm.so* $(1)/lib/
+	$(INSTALL_DIR) $(1)/etc/bbfdm
+	$(INSTALL_DIR) $(1)/etc/bbfdm/json
+	$(INSTALL_CONF) $(PKG_BUILD_DIR)/config/dmmap $(1)/etc/bbfdm
+	$(INSTALL_DIR) $(1)/usr/share/bbfdm
+	$(CP) $(PKG_BUILD_DIR)/scripts/functions $(1)/usr/share/bbfdm
+endef
+
+define Build/InstallDev
+	$(INSTALL_DIR) $(1)/usr/include
+	$(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/
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_BUILD_DIR)/bin/.libs/libbbfdm.{a,so*} $(1)/usr/lib/
+endef
+
+$(eval $(call BuildPackage,libbbfdm))

bbk_cli/Makefile

@@ -0,0 +1,42 @@
+#
+# Copright (C) 2018 The Internet Foundation In Sweden
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=bbk_cli
+PKG_SOURCE_VERSION:=7b810a696c78b746185c11282bdbe3fb7f8c5d4b
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=https://github.com/dotse/bbk.git
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
+
+PKG_LICENSE:=GPLv2
+PKG_LICENSE_FILES:=LICENSE
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/bbk_cli
+	CATEGORY:=Utilities
+	DEPENDS:=+libpthread +libstdcpp
+	TITLE:=Bredbandskollen CLI - A bandwidth measurement tool
+endef
+
+define Package/bbk_cli/description
+	To measure connection speed in an environment that is missing a web browser, 
+	for example, in a server, you can use our command line interface bbk_cli, 
+	which is available for some of the most common operating systems.
+endef
+
+define Build/Compile
+	$(MAKE) -C $(PKG_BUILD_DIR)/src/cli CROSS_COMPILE="$(TARGET_CROSS)"
+endef
+
+define Package/bbk_cli/install
+	$(INSTALL_DIR) $(1)/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/cli/cli $(1)/sbin/bbk_cli
+endef
+
+$(eval $(call BuildPackage,bbk_cli))

bbk_cli/patches/0001-add-openwrt-cross-compile-support.patch

@@ -0,0 +1,25 @@
+diff --git a/src/framework/engine.h b/src/framework/engine.h
+index 57a48ad..9e1bc36 100644
+--- a/src/framework/engine.h
++++ b/src/framework/engine.h
+@@ -10,6 +10,7 @@
+ #include <map>
+ #include <vector>
+ #include <string>
++#include <sys/select.h>
+ 
+ #include "logger.h"
+ 
+diff --git a/src/framework/mk.inc b/src/framework/mk.inc
+index 793e211..13275be 100644
+--- a/src/framework/mk.inc
++++ b/src/framework/mk.inc
+@@ -7,7 +7,7 @@ OS:=$(shell uname)
+ CXXFLAGS += -O2 -W -Wall -I$(DIRLEVEL)
+ 
+ ifeq ($(OS),Linux)
+-CXX = g++
++CXX = $(CROSS_COMPILE)g++
+ endif
+ 
+ ifeq ($(OS),Darwin)

bootchart2/Makefile

@@ -18,6 +18,9 @@ PKG_SOURCE_VERSION:=3ab81137cafe25c2ca4bc3a5f322a63646f9ce8d
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 
+PKG_LICENSE:=GPLv2
+PKG_LICENSE_FILES:=none
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/bootchart2

catv/Makefile

@@ -1,9 +1,19 @@
+#
+# Copyright (C) 2018 iopsys Software Solutions AB
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=catv
 PKG_RELEASE:=1
 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
 
+PKG_LICENSE:=GPLv2
+PKG_LICENSE_FILES:=none
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/catv

crashlog/Makefile

@@ -1,9 +1,18 @@
+#
+# Copyright (C) 2019 iopsys Software Solutions AB
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=crashlog
 PKG_VERSION:=1.0.0
 PKG_RELEASE:=1
 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
+PKG_LICENSE:=GPLv2
+PKG_LICENSE_FILES:=none
 
 include $(INCLUDE_DIR)/package.mk
 

dectmngr2/Makefile

@@ -1,19 +1,20 @@
 #
-# Copyright (C) 2006-2010 OpenWrt.org
+# Copyright (C) 2019 iopsys Software Solutions AB
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-
 include $(TOPDIR)/rules.mk
 
 PKG_RELEASE:=1
 PKG_VERSION:=1.3.0
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/dectmngr.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=5a5c94b289c79bc3a635b8d742dd9b73dcc0615f
+PKG_SOURCE_VERSION:=2c8990fd5275d469e8ab6c7a99e17fe0a56052ea
 PKG_NAME:=dectmngr2
 
+PKG_LICENSE:=GPLv2
+PKG_LICENSE_FILES:=LICENSE
 
 RSTRIP:=true
 export BUILD_DIR
@@ -29,7 +30,7 @@ define Package/dectmngr2
   CATEGORY:=Utilities
   TITLE:=Dectmngr2
   URL:=
-  DEPENDS:= +natalie-dect-h bcmkernel +libubox +ubus +libpicoevent
+  DEPENDS:= +natalie-dect-h bcmkernel +libubox +ubus +libpicoevent endptmngr
 endef
 
 define Package/dectmngr2/description

dslmngr/Makefile

@@ -19,6 +19,9 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 endif
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_LICENSE:=GPLv2
+PKG_LICENSE_FILES:=LICENSE
+
 
 include $(INCLUDE_DIR)/package.mk
 

easy-qos/Makefile

@@ -1,19 +1,29 @@
+#
+# 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-qos
-PKG_VERSION:=1.0
+PKG_VERSION:=1.1
 PKG_RELEASE:=0
 
+PKG_LICENSE:=GPLv2
+PKG_LICENSE_FILES:=none
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/easy-qos
   SECTION:=net
   CATEGORY:=Network
   TITLE:=Easy QoS
+  DEPENDS:=@(TARGET_intel_mips||TARGET_iopsys_brcm63xx_arm||TARGET_iopsys_brcm63xx_mips)
 endef
 
 define Package/easy-qos/description
-	This package contains Easy QoS utitie
+	This package contains Easy QoS utility
 endef
 
 define Build/Prepare
@@ -29,7 +39,11 @@ define Package/easy-qos/install
 	$(INSTALL_DIR) $(1)/etc/init.d
 	$(INSTALL_DIR) $(1)/etc/uci-defaults
 	$(CP) ./files/etc/config/easy_qos $(1)/etc/config/
+ifeq ($(CONFIG_TARGET_intel_mips),y)
+	$(CP) ./files/etc/init.d/easy_qos.classcfg $(1)/etc/init.d/easy_qos
+else
 	$(CP) ./files/etc/init.d/easy_qos.iptables $(1)/etc/init.d/easy_qos
+endif
 	$(CP) ./files/etc/uci-defaults/* $(1)/etc/uci-defaults/
 	$(CP) ./files/etc/firewall.easyqos $(1)/etc/firewall.easyqos
 endef

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

@@ -0,0 +1,165 @@
+#!/bin/sh /etc/rc.common
+
+START=99
+USE_PROCD=1
+
+RULE_LIST="/tmp/easy_qos_rule.list"
+BRIDGE_INTF=""
+
+[ -f /etc/profile.d/intel.sh ] && {
+	. /etc/profile.d/intel.sh
+	sh /etc/profile.d/intel.sh
+}
+
+log() {
+	echo "${@}"|logger -t easy_qos_class -p debug
+}
+
+exec_log() {
+	${@} |grep -i successful
+	if [ "${?}" -ne 0 ]; then
+		log "Failed to create ${@}";
+		return 1
+	fi
+	return 0
+}
+
+get_priority() {
+	local prio=$(echo $1|tr [A-Z] [a-z]);
+	case "${prio}" in
+		"lowest")
+			echo 8;;
+		"low")
+			echo 7;;
+		"besteffort")
+			echo 6;;
+		"normal")
+			echo 5;;
+		"video")
+			echo 4;;
+		"medium")
+			echo 3;;
+		"high")
+			echo 2;;
+		"highest")
+			echo 1;;
+	esac
+}
+
+is_lan_bridge() {
+	local _section=$1
+	local _type
+	local _is_lan
+
+	config_get _type "$section" "type"
+	config_get _is_lan "$section" "is_lan"
+
+	if [ "${_type}" == "bridge" -a "${_is_lan}" == "1" ]; then
+		BRIDGE_INTF="br-${_section}"
+	fi
+}
+
+get_bridge_interface() {
+	config_load network
+	config_foreach is_lan_bridge interface
+}
+
+validate_rule_section()
+{
+	uci_validate_section easy_qos rule "${1}" \
+		'priority:string:none' \
+		'macaddr:string:none' \
+		'proto:string:none' \
+		'port:list(uinteger):none' \
+		'comment:string:none'
+}
+
+# Clear existing rules before applying new rules
+clear_existing_rules() {
+	# execute the delete rules written onto a file then delete the file
+	[ -f ${RULE_LIST} ] || return 0
+
+	while read line
+	do
+		log "Deleting old classification rules"
+		exec_log classcfg -D ${line} -i ${BRIDGE_INTF}
+	done <${RULE_LIST}
+	sync
+
+	[ -f ${RULE_LIST} ] && rm ${RULE_LIST}
+}
+
+# classcfg -M local_dhcp -i lo -p udp --dport 67:67 --dport 68:68 -j mark --mark 1
+create_rule() {
+	local proto=$1; shift
+	local mac_addr=$1; shift
+	local mark=$1; shift
+	local ports=$1;
+	local cmd="";
+	# Rule name is uniqe, so we take hash of all the input as rule_name
+	local rule_name="$(echo ${mac_addr}${proto}${mark}${ports} |md5sum |head -c 30)"
+
+	cmd="-j mark --mark ${mark}";
+
+	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=' '
+	fi
+	if [ "${proto}" != "none" ]; then
+		cmd="-p ${proto} $cmd"
+	fi
+	cmd="-i ${BRIDGE_INTF} $cmd"
+	cmd="-A ${rule_name} $cmd"
+
+	# Store the rule_names for cleanup on reload
+	exec_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
+
+	validate_rule_section "${1}" || {
+		log "Validation of section failed"
+		return 1;
+	}
+
+	prio_num=$(get_priority ${priority})
+	port_list=$(echo ${port}|sed 's/ /,/g')
+
+	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}
+		else
+			create_rule ${proto} ${macaddr} ${prio_num} ${port_list}
+		fi
+	fi
+}
+
+reload_service() {
+	get_bridge_interface
+	clear_existing_rules
+	config_load easy_qos
+	config_foreach manage_rule rule
+}
+
+start_service() {
+	[ -x /opt/intel/usr/sbin/classcfg ] || exit 0
+	reload_service
+	log "Easy QoS class installed"
+}
+
+service_triggers() {
+	procd_add_reload_trigger "easy_qos" "network"
+}
+

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

@@ -102,7 +102,7 @@ manage_rule() {
 	prio_num=$(get_priority ${priority})
 	if [ -n "${macaddr}" -a -n "${prio_num}" ]; then
 		for p in ${port}; do
-			if [ "${protocol}" == "none" ]; then
+			if [ "${protocol}" == "none" -o "${protocol}" == "tcpudp" ]; then
 				create_rule tcp ${macaddr} ${prio_num} ${p}
 				create_rule udp ${macaddr} ${prio_num} ${p}
 			else
@@ -111,7 +111,7 @@ manage_rule() {
 		done
 		# Create rule for all ports if port is not mentioned in uci
 		if [ -z "${port}" ]; then
-			if [ "${protocol}" == "none" ]; then
+			if [ "${protocol}" == "none" -o "${protocol}" == "tcpudp" ]; then
 				create_rule tcp ${macaddr} ${prio_num}
 				create_rule udp ${macaddr} ${prio_num}
 			else

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

@@ -158,7 +158,7 @@ manage_rule() {
 	port_list=$(echo ${port}|sed 's/ /,/g')
 
 	if [ -n "${ip}" -a -n "${prio_num}" ]; then
-		if [ "${proto}" == "none" ]; then
+		if [ "${proto}" == "none" -o "${proto}" == "tcpudp" ]; then
 			create_rule tcp ${ip} ${prio_num} ${port_list}
 			create_rule udp ${ip} ${prio_num} ${port_list}
 		else

easy-soc-libs/Makefile

@@ -1,24 +1,29 @@
 #
-# Copyright (C) 2018 Iopsys
+# 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
-PKG_VERSION:=1.0.1
+PKG_VERSION:=2.4.1
 PKG_RELEASE:=1
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=a0ec330f74d0ef5ec6d7e61ac4079de9c93f36ab
+PKG_SOURCE_VERSION:=63f749faa67670229a5cbaf39ee0fef92d8276f3
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/easy-soc-libs.git
-PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@inteno.se>
+PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@iopsys.eu>
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
 endif
 
 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
@@ -37,7 +42,7 @@ endef
 define Package/libwifi
   $(call Package/easy-soc-libs)
   TITLE:= WiFi library (libwifi)
-  DEPENDS+=+TARGET_intel_mips:libnl +TARGET_intel_mips:libnl-route
+  DEPENDS+=+libnl +libnl-route
 endef
 
 define Package/libethernet
@@ -77,7 +82,7 @@ endif
 define Package/libdsl
   $(call Package/easy-soc-libs)
   TITLE:= XDSL library (libdsl)
-  DEPENDS+=+TARGET_intel_mips:dsl-cpe-api-vrx +TARGET_intel_mips:dsl-cpe-fapi
+  DEPENDS+=+TARGET_intel_mips:dsl-cpe-api-vrx +TARGET_intel_mips:dsl-cpe-fapi +TARGET_intel_mips:kmod-ppa-drv
 endef
 
 subdirs := \
@@ -107,7 +112,7 @@ define Build/InstallDev/libwifi
 	$(INSTALL_DIR) $(1)/usr/include
 	$(INSTALL_DIR) $(1)/usr/lib
 	$(CP) $(PKG_BUILD_DIR)/libwifi/wifi.h $(1)/usr/include/
-	$(CP) $(PKG_BUILD_DIR)/libwifi/libwifi.so* $(1)/usr/lib/
+	$(CP) $(PKG_BUILD_DIR)/libwifi/libwifi*.so* $(1)/usr/lib/
 endef
 
 define Build/InstallDev/libdsl
@@ -137,7 +142,7 @@ endef
 
 define Package/libwifi/install
 	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/libwifi/libwifi.so* $(1)/usr/lib/
+	$(CP) $(PKG_BUILD_DIR)/libwifi/libwifi*.so* $(1)/usr/lib/
 endef
 
 define Package/libethernet/install
@@ -157,3 +162,4 @@ endef
 $(eval $(call BuildPackage,libwifi))
 $(eval $(call BuildPackage,libdsl))
 $(eval $(call BuildPackage,libethernet))
+$(eval $(call BuildPackage,easy-soc-libs))

endptmngr/Makefile

@@ -1,22 +1,23 @@
 #
-# Copyright (C) 2006-2010 OpenWrt.org
+# Copyright (C) 2018 IOPSYS Software Solutions AB
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-
 include $(TOPDIR)/rules.mk
 
 PKG_RELEASE:=1
 PKG_VERSION:=0.2
-PKG_SOURCE_VERSION:=631e61b7ab5d86f2f4c86756a117badff9fb0f2c
-
+PKG_SOURCE_VERSION:=ef49d57c3824df4dfb4921d39461e2bd14f918a7
+PKG_LICENSE:=GPLv2
+PKG_LICENSE_FILES:=LICENSE
 
 ifeq ($(CONFIG_ENDPT_OPEN),y)
 BRCM_KERNEL_PROFILE=$(shell echo $(CONFIG_BCM_KERNEL_PROFILE) | sed s/\"//g)
 PKG_SOURCE:=endptmngr-$(BRCM_KERNEL_PROFILE)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
-PKG_SOURCE_URL:=http://iopsys.inteno.se/iopsys/consumer/
+PKG_SOURCE_URL:=http://download.iopsys.eu/iopsys/opensdk/
 PKG_NAME:=endptmngr-open
+PATCH_DIR:=
 else
 PKG_SOURCE_URL:=git@dev.iopsys.eu:iopsys/endptmngr
 PKG_SOURCE_PROTO:=git
@@ -41,7 +42,7 @@ define Package/endptmngr
   CATEGORY:=Utilities
   TITLE:=Brcmslic
   URL:=
-  DEPENDS:= +libubox +ubus +libpicoevent +PACKAGE_bcmkernel:bcmkernel +PACKAGE_bcmopen:bcmopen
+  DEPENDS:= +libubox +ubus +libpicoevent @(PACKAGE_bcmkernel||PACKAGE_bcmopen) @TARGET_HAS_VOICE
 endef
 
 define Package/endptmngr/description

fatrace/Makefile

@@ -1,7 +1,7 @@
 #
 # Copyright (C) 2006-2010 OpenWrt.org
 #
-# This is free software, licensed under the GNU General Public License v2.
+# This is free software, licensed under the GNU General Public License v3.
 # See /LICENSE for more information.
 #
 
@@ -20,6 +20,9 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)-$(PKG_SOURCE_VERSION).tar.
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 
+PKG_LICENSE:=GPL-3.0
+PKG_LICENSE_FILES:=LICENSE
+
 # support parallel build
 #PKG_BUILD_PARALLEL:=1
 

gigaset-elements/.gitignore

@@ -1,3 +0,0 @@
-
-git-src
-

gigaset-elements/Makefile

@@ -1,65 +0,0 @@
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=gigaset-elements
-
-PKG_VERSION:=2.4.2
-# PKG_RELEASE=$(PKG_SOURCE_VERSION)
-
-PKG_GIGASET_ELEMENTS_SRC_URL ?= git@dev.iopsys.eu:3rdparty/gigaset-elements.git
-PKG_GIGASET_ELEMENTS_VERSION ?= v$(PKG_VERSION)
-
-PKG_SOURCE_URL:=$(PKG_GIGASET_ELEMENTS_SRC_URL)
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=aa906b37062b6d7937a9c0f8e7b62b32afe4bdeb
-
-
-PKG_MAINTAINER:=Magier Marcin, Figlarek Piotr
-
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-
-include $(INCLUDE_DIR)/package.mk
-
-######################################################
-
-define Package/gigaset-elements
-  SECTION:=utils
-  CATEGORY:=Utilities
-  DEPENDS:=+libjson-c +libcurl +libpthread
-  TITLE:=Gigaset elements
-endef
-
-######################################################
-
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) all
-endef
-
-
-
-define Package/gigaset-elements/install
-	$(CP) -r $(PKG_BUILD_DIR)/sysroot_common/* $(1)/
-	$(CP) -r $(PKG_BUILD_DIR)/sysroot_$(CONFIG_ARCH)/* $(1)/
-endef
-
-
-
-define Package/gigaset-elements/preinst
-#!/bin/sh
-mkdir -p $${IPKG_INSTROOT}/usr/gigaset/data/cert
-mkdir -p $${IPKG_INSTROOT}/usr/gigaset/data/fw
-endef
-
-
-define Package/gigaset-elements/postrm
-#!/bin/sh
-rm -rf $${IPKG_INSTROOT}/usr/gigaset/data
-rm -rf /usr/share/gigaset
-endef
-
-
-######################################################
-
-$(eval $(call BuildPackage,gigaset-elements))
-

gryphon-led-module/Makefile

@@ -28,7 +28,7 @@ define KernelPackage/$(PKG_NAME)
   FILES:=$(PKG_BUILD_DIR)/$(PKG_NAME).$(LINUX_KMOD_SUFFIX)
   KCONFIG:=CONFIG_PACKAGE_kmod-gryphon-led-kernel-module=y
   AUTOLOAD:=$(call AutoLoad,60,$(PKG_NAME))
-  PKG_LICENSE:=Genexis
+  PKG_LICENSE:=GPLv2
   PKG_LICENSE_URL:=
 endef
 

gryphon-led-module/src/sk9822.h

@@ -22,7 +22,7 @@
 #include <linux/types.h>
 
 #define SK9822_DEFAULT_NUM_LEDS 32 // U16, used if DT param fails
-#define SK9822_DEFAULT_BRIGHTNESS 1  // 5-bit brightness, 0-31
+#define SK9822_DEFAULT_BRIGHTNESS 15  // 5-bit brightness, 0-31
 
 typedef struct {
 	uint8_t b;

ice-client/Config.in

@@ -1,4 +0,0 @@
-
-config ICE_OPEN
-       bool "Use pre-compiled version for Open SDK"
-       default n

ice-client/files/ice-client.uci_default

@@ -1,74 +0,0 @@
-#!/bin/sh
-
-grep -rq "^ice:" /etc/passwd || {
-	adduser -D -H -s /bin/false ice
-}
-
-uci -q delete passwords.ice
-uci -q set passwords.ice=usertype
-uci -q set passwords.ice.password="\$WPAKEY"
-uci -q del_list passwords.ice._access_w=root
-uci -q add_list passwords.ice._access_w=root
-uci -q del_list passwords.ice._access_r=root
-uci -q add_list passwords.ice._access_r=root
-uci -q commit passwords
-
-uci show rpcd | grep username=.*ice.* >/dev/null || {
-cat >> /etc/config/rpcd << EOF
-
-config login
-	option username 'ice'
-	option password '\$p\$ice'
-	list _access_w 'none'
-	list write 'user-user'
-	list write 'juci-broadcom-dsl'
-	list write 'juci-broadcom-dsl-admin'
-	list write 'juci-broadcom-ethernet'
-	list write 'juci-broadcom-iptv'
-	list write 'juci-broadcom-vlan'
-	list write 'juci-broadcom-vlan-admin'
-	list write 'juci-wireless'
-	list write 'juci-wireless-admin'
-	list write 'juci-catv'
-	list write 'juci-ddns'
-	list write 'juci-diagnostics'
-	list write 'juci-dnsmasq-dhcp'
-	list write 'juci-dropbear'
-	list write 'juci-ethernet'
-	list write 'juci-event'
-	list write 'juci-firewall-fw3'
-	list write 'juci-iconnect'
-	list write 'juci-igmpinfo'
-	list write 'juci-inteno-backup'
-	list write 'juci-inteno-multiwan'
-	list write 'juci-inteno-provisioning'
-	list write 'juci-inteno-qos'
-	list write 'juci-inteno-voice-client'
-	list write 'juci-minidlna'
-	list write 'juci-mod-status'
-	list write 'juci-mod-system'
-	list write 'juci-natalie-dect'
-	list write 'juci-netmode'
-	list write 'juci-network-netifd'
-	list write 'juci-owsd'
-	list write 'juci-printer'
-	list write 'juci-realtime-graphs'
-	list write 'juci-samba'
-	list write 'juci-sfp'
-	list write 'juci-snmpd'
-	list write 'juci-sysupgrade'
-	list write 'juci-uhttpd'
-	list write 'juci-upnp'
-	list write 'juci-usb'
-	list write 'core'
-	list write 'unauthenticated'
-
-EOF
-}
-
-uci -q del_list dhcp.@domain[0].name="inteno.lan"
-uci -q add_list dhcp.@domain[0].name="inteno.lan"
-uci -q commit dhcp
-
-exit 0
-

icgroupd/Makefile

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2016 Inteno Broadband AB
+# Copyright (C) 2019 iopsys Software Solutions AB
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.

icwmp/Config_cwmp.in

@@ -19,17 +19,9 @@ config CWMP_DEBUG
 	bool "Compile with debug options"
 	default y
 
-config XMPP_ENABLE
-	bool "enable xmpp feature"
-	default n
-
 config CWMP_DEVEL_DEBUG
 	bool "Compile with development debug options"
 	default n
-
-config LIBDATAMODEL_VENDOR_PREFIX
-    string "Vendor Prefix"
-    default "X_IOPSYS_EU_"
     
 endif
 

icwmp/Config_datamodel.in

@@ -1,7 +0,0 @@
-if PACKAGE_libdatamodel
-
-config UPNP_TR064
-	bool "Compile with tr064 features"
-	default n
-
-endif

icwmp/Makefile

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2012 OpenWrt.org
+# Copyright (C) 2019 iopsys Software Solutions AB
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,15 +8,17 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=icwmp
-PKG_VERSION:=4.0-2019-07-03
+PKG_VERSION:=4.0-2019-10-17
 PKG_FIXUP:=autoreconf
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/icwmp.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=b0f29f5102d5ade78b586d190abb521fcc668b78
+PKG_SOURCE_VERSION:=9cfbfa9a381d372643fe18f8c258779bed3ee3bd
 PKG_RELEASE=$(PKG_SOURCE_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 
+PKG_LICENSE:=GPLv2
+PKG_LICENSE_FILES:=COPYING
 
 PKG_CONFIG_DEPENDS:= \
 	CONFIG_CWMP_ACS_MULTI \
@@ -30,13 +32,6 @@ CWMP_REVISION=$(shell svnversion ./src/ -n|cut -f2 -d:)
 
 include $(INCLUDE_DIR)/package.mk
 
-define Package/libdatamodel
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE:=Library for broadband-forum data model
-  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c
-endef
-
 define Package/icwmp_stun
 	SECTION:=utils
 	CATEGORY:=Utilities
@@ -65,11 +60,18 @@ define Package/icwmp_udpechoserver
 	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
+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 +libexpat +libstrophe +curl +libtrace +libdatamodel
+  DEPENDS:=+libuci +libmicroxml +libubox +jshn +libubus +libblobmsg-json +libpthread +ubusd +shflags +getopt +zlib +libjson-c +libopenssl +curl +libbbfdm +libtr098
 endef
 
 define Package/icwmp/description
@@ -94,10 +96,6 @@ define Package/icwmp-zstream/config
 	source "$(SOURCE)/Config_cwmp.in"
 endef
 
-define Package/libdatamodel/config
-	source "$(SOURCE)/Config_datamodel.in"
-endef
-
 USE_LOCAL=$(shell ls ./src/ 2>/dev/null >/dev/null && echo 1)
 ifneq ($(USE_LOCAL),)
 define Build/Prepare
@@ -109,8 +107,6 @@ ifeq ($(CONFIG_TARGET_iopsys_ramips),y)
 TARGET_CFLAGS += -DEX400
 endif
 
-TARGET_CFLAGS += -DCUSTOM_PREFIX=\\\"$(CONFIG_LIBDATAMODEL_VENDOR_PREFIX)\\\"
-
 TARGET_CFLAGS += \
 	-D_GNU_SOURCE -D_AADJ
 
@@ -131,16 +127,6 @@ CONFIGURE_ARGS += \
 	--with-libubox-include-path=$(STAGING_DIR)/usr/include \
 	--with-libubus-include-path=$(STAGING_DIR)/usr/include
 	
-ifeq ($(CONFIG_UPNP_TR064),y)
-CONFIGURE_ARGS += \
-	--enable-upnptr064
-endif
-	
-ifeq ($(CONFIG_XMPP_ENABLE),y)
-CONFIGURE_ARGS += \
-	--enable-xmpp
-endif
-	
 ifeq ($(BUILD_VARIANT),zstream)
 CONFIGURE_ARGS += \
 	--enable-http=zstream \
@@ -172,18 +158,23 @@ CONFIGURE_ARGS += \
 	--enable-devel
 endif
 
-define Package/libdatamodel/install
-	$(INSTALL_DIR) $(1)/lib
-	$(CP) $(PKG_BUILD_DIR)/bin/.libs/libdatamodel.so* $(1)/lib/
-endef
+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/.libs/icwmpd $(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/dmmap $(1)/etc/icwmpd
 	$(INSTALL_CONF) $(PKG_BUILD_DIR)/config/firewall.cwmp $(1)/etc/firewall.cwmp
 	$(INSTALL_DIR) $(1)/etc/init.d
 	$(INSTALL_DIR) $(1)/etc/uci-defaults
@@ -236,17 +227,15 @@ define Package/icwmp_twamp/install
 	$(INSTALL_CONF) $(PKG_BUILD_DIR)/config/cwmp_twamp $(1)/etc/config
 endef
 
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include
-	$(INSTALL_DIR) $(1)/usr/include/libdatamodel
-	$(CP) $(PKG_BUILD_DIR)/dm/*.h $(1)/usr/include/libdatamodel
-	$(CP) $(PKG_BUILD_DIR)/dm/dmtree/common/root.h $(1)/usr/include/libdatamodel
-	$(INSTALL_DIR) $(1)/lib
-	$(CP) $(PKG_BUILD_DIR)/bin/.libs/libdatamodel.so* $(1)/lib
-	$(CP) $(PKG_BUILD_DIR)/bin/.libs/libdatamodel.a $(1)/lib
+define Package/icwmp_bulkdata/install
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bin/icwmp_bulkdatad $(1)/usr/sbin/icwmp_bulkdatad
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/init/icwmp_bulkdatad $(1)/etc/init.d/icwmp_bulkdatad
+	$(INSTALL_DIR) $(1)/etc/config
+	$(INSTALL_CONF) $(PKG_BUILD_DIR)/config/cwmp_bulkdata $(1)/etc/config
 endef
 
-
 define Package/icwmp-$(BUILD_VARIANT)/postinst
 	#!/bin/sh
 	echo "$(CWMP_BKP_FILE)" >> $${IPKG_INSTROOT}/etc/sysupgrade.conf
@@ -266,11 +255,9 @@ define Package/icwmp-$(BUILD_VARIANT)/prerm
 	exit 0
 endef
 
-
 $(eval $(call BuildPackage,icwmp-curl))
-$(eval $(call BuildPackage,libdatamodel))
 $(eval $(call BuildPackage,icwmp_stun))
 $(eval $(call BuildPackage,icwmp_xmpp))
 $(eval $(call BuildPackage,icwmp_udpechoserver))
 $(eval $(call BuildPackage,icwmp_twamp))
-$(eval $(call BuildPackage,icwmp-zstream))
+$(eval $(call BuildPackage,icwmp_bulkdata))

icwmp/files/etc/uci-defaults/90-icwmp-set-dhcp-reqopts

@@ -41,4 +41,14 @@ set_cwmp_reqopts() {
 	fi
 }
 
+regenerate_ssl_link(){
+	local cert_dir="/etc/ssl/certs"
+	local all_file=$(ls $cert_dir/*.pem)
+	for cfile in $all_file
+	do
+		ln -s $cfile $cert_dir/$(openssl x509 -hash -noout -in $cfile).0
+	done
+}
+
 set_cwmp_reqopts
+regenerate_ssl_link

ieee1905/Makefile

@@ -0,0 +1,45 @@
+#
+# Copyright (C) 2019 Iopsys
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=ieee1905
+PKG_VERSION:=1.0.0
+
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_VERSION:=a6a39128b1fe5132e51de4f580bf66f373515dcd
+PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/ieee1905.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/ieee1905
+  SECTION:=utils
+  CATEGORY:=Utilities
+  TITLE:=IEEE1905 handler
+  DEPENDS:=+meshcomms +libubox +libubus +libblobmsg-json
+endef
+
+define Package/ieee1905/description
+ Listens to ieee1905 messages, parse and expose them over ubus.
+endef
+
+TARGET_CFLAGS += \
+	-I$(STAGING_DIR)/usr/include \
+	-D_GNU_SOURCE
+
+#define Build/Prepare
+#        $(CP) -rf ./ieee1905/* $(PKG_BUILD_DIR)/
+#endef
+
+define Package/ieee1905/install
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_BIN) ./files/etc/init.d/ieee1905 $(1)/etc/init.d/ieee1905
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/ieee1905 $(1)/usr/sbin/
+endef
+
+$(eval $(call BuildPackage,ieee1905))

ieee1905/files/etc/init.d/ieee1905

@@ -0,0 +1,24 @@
+#!/bin/sh /etc/rc.common
+
+START=99
+STOP=10
+
+USE_PROCD=1
+PROG=/usr/sbin/ieee1905
+
+start_service() {
+	procd_open_instance
+	procd_set_param command ${PROG}
+	procd_set_param respawn
+	procd_close_instance
+}
+
+reload_service() {
+	stop
+	start
+}
+
+service_triggers()
+{
+	procd_add_config_trigger "config.change" "ieee1905" /etc/init.d/ieee1905 restart
+}

ifbt/Makefile

@@ -6,9 +6,9 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=ifbt
-PKG_VERSION:=0.1
+PKG_VERSION:=0.2
 
-PKG_SOURCE_VERSION:=0286812ed8036dea758f904694dc416481fba64d
+PKG_SOURCE_VERSION:=6a279efa5046ace0681a1d0e79592a120f80e171
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/ifbt.git
 
@@ -16,6 +16,9 @@ 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:=BSD-3-Clause
+PKG_LICENSE_FILES:=README
+
 include $(INCLUDE_DIR)/package.mk
 
 ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_mips),y)

ifsi/Makefile

@@ -1,39 +0,0 @@
-#
-# Copyright (C) 2015 Inteno
-#
-
-include $(TOPDIR)/rules.mk
-include $(INCLUDE_DIR)/kernel.mk
-
-PKG_NAME:=ifsi
-PKG_VERSION:=1.0.0
-PKG_RELEASE:=1
-PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-
-include $(INCLUDE_DIR)/package.mk
-
-LDFLAGS+= \
-        -Wl,-rpath-link=$(STAGING_DIR)/usr/lib \
-		-Wl,-rpath-link=$(STAGING_DIR)/lib
-
-define Package/ifsi
-  CATEGORY:=Utilities
-  DEPENDS:=+ubus +libubox
-  TITLE:=Inteno Functional Script Interface
-endef
-
-define Package/ifsi/description
-	Inteno Functional Script Interface
-endef
-
-define Build/Prepare
-	mkdir -p $(PKG_BUILD_DIR)
-	$(CP) ./src/* $(PKG_BUILD_DIR)/
-endef
-
-define Package/ifsi/install
-	$(INSTALL_DIR) $(1)/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/ifsi $(1)/sbin/
-endef
-
-$(eval $(call BuildPackage,ifsi))

ifsi/src/Makefile

@@ -1,17 +0,0 @@
-CC		= gcc
-CFLAGS		= -g -Wall
-LOCLIBS		= 
-LIBS		= -lubus -lubox -lblobmsg_json
-OBJS		= ifsi.o
-SRCS		= ifsi.c
-LIBSRCS		= 
-ISRCS		= 
-
-all: ifsi
-
-ifsi: ${OBJS}
-	${CC} ${LDFLAGS} ${LIBSRCS} -o ifsi ${OBJS} ${LIBS}
-
-clean:
-	rm -f ifsi *.o
-

ifsi/src/ifsi.c

@@ -1,74 +0,0 @@
-/*
- * ifsi -- Inteno functional script interface
- *
- * Copyright (C) 2012-2013 Inteno Broadband Technology AB. All rights reserved.
- *
- * Author: dev@inteno.se
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * version 2 as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
-#include <unistd.h>
-
-#include <libubox/blobmsg.h>
-#include <libubox/blobmsg_json.h>
-#include <libubox/uloop.h>
-
-#include <libubus.h>
-
-static struct ubus_context *ctx;
-static struct ubus_event_handler event_listener;
-static struct blob_buf b;
-
-
-static void receive_event(struct ubus_context *ctx, struct ubus_event_handler *ev,
-			  const char *type, struct blob_attr *msg)
-{
-	char *str;
-	uint32_t id;
-
-	str = blobmsg_format_json(msg, true);
-	fprintf(stdout, "I got %s event %s\n", type, str);
-	free(str);
-}
-
-int main(int argc, char **argv)
-{
-	const char *ubus_socket = NULL;
-	int ret;
-
-	uloop_init();
-
-	ctx = ubus_connect(ubus_socket);
-	if (!ctx) {
-		fprintf(stderr, "Failed to connect to ubus\n");
-		return 1;
-	}
-
-	ubus_add_uloop(ctx);
-
-	event_listener.cb = receive_event;
-	ret = ubus_register_event_handler(ctx, &event_listener, "*");
-	if (ret)
-		fprintf(stderr, "Couldn't register to router events\n");
-
-	uloop_run();
-
-	ubus_free(ctx);
-	uloop_done();
-
-	return 0;
-}
-

imonitor/Makefile

@@ -18,6 +18,9 @@ PKG_SOURCE_SUBDIR:=${PKG_NAME}-${PKG_VERSION}
 PKG_INSTALL:=1
 PKG_BUILD_PARALLEL:=1
 
+PKG_LICENSE:=GPLv2
+PKG_LICENSE_FILES:=LICENSE
+
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/cmake.mk
 

inbd/Makefile

@@ -12,7 +12,7 @@ PKG_NAME:=inbd
 PKG_VERSION:=1.0.0
 PKG_RELEASE:=1
 
-PKG_SOURCE_VERSION:=665a72a6bb2b5ea5a17ad6248957fe35525b3782
+PKG_SOURCE_VERSION:=53ca7f58edb87976b5897ccaf487bb0cbbf39d07
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/inbd
 
@@ -20,6 +20,9 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)-$(PKG_SOURCE_VERSION).tar.
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 
+PKG_LICENSE:=GPLv2
+PKG_LICENSE_FILES:=LICENSE
+
 # support parallel build
 PKG_BUILD_PARALLEL:=1
 

inotify-tools/Makefile

@@ -1,57 +0,0 @@
-#
-# 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)
-
-# 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

@@ -1,13 +0,0 @@
-#! /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/Makefile

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006-2011 OpenWrt.org
+# Copyright (C) 2019 iopsys
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -10,6 +10,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=iop
 PKG_VERSION:=1.0
 PKG_RELEASE:=0
+PKG_LICENSE:=GPLv2
 
 include $(INCLUDE_DIR)/package.mk
 

iop/config

@@ -14,6 +14,7 @@ CONFIG_PACKAGE_comgt-ncm=y
 CONFIG_PACKAGE_crashlog=y
 CONFIG_PACKAGE_ddns-scripts=y
 CONFIG_PACKAGE_ds-lite=y
+CONFIG_PACKAGE_easy-qos=y
 CONFIG_PACKAGE_gdb=m
 CONFIG_PACKAGE_getopt=y
 CONFIG_PACKAGE_glib2=y
@@ -36,6 +37,7 @@ CONFIG_PACKAGE_juci-ddns=y
 CONFIG_PACKAGE_juci-diagnostics=y
 CONFIG_PACKAGE_juci-dnsmasq-dhcp=y
 CONFIG_PACKAGE_juci-dropbear=y
+CONFIG_PACKAGE_juci-easyqos=y
 CONFIG_PACKAGE_juci-event=y
 CONFIG_PACKAGE_juci-firewall-fw3=y
 CONFIG_PACKAGE_juci-icwmp=y
@@ -78,6 +80,7 @@ CONFIG_PACKAGE_ndisc6=y
 CONFIG_PACKAGE_netmode=y
 CONFIG_PACKAGE_ntfs-3g=y
 CONFIG_PACKAGE_ntpd=y
+CONFIG_PACKAGE_obuspa=y
 CONFIG_PACKAGE_odhcp6c=y
 CONFIG_PACKAGE_odhcpd=y
 CONFIG_PACKAGE_openssl-util=y
@@ -114,6 +117,7 @@ CONFIG_PACKAGE_umbim=y
 CONFIG_PACKAGE_uqmi=y
 CONFIG_PACKAGE_usb-modeswitch=y
 CONFIG_PACKAGE_usbreset=y
+CONFIG_PACKAGE_uspd=y
 CONFIG_PACKAGE_wget=y
 CONFIG_PACKAGE_wwan=y
 CONFIG_PACKAGE_libwifi=y
@@ -179,6 +183,10 @@ 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

iop/scripts/cve-check.sh

@@ -0,0 +1,36 @@
+#!/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,13 +6,9 @@ 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 '
 
@@ -24,7 +20,13 @@ function extract_core {
 		echo ""
 		echo "Example: $0 extract_core"
 		echo "  -p package/utils/busybox"
-		echo "  -r feeds/lede_core"
+		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 "  -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 lede_core -a
+		./scripts/feeds install -f -p openwrt_core -a
     fi
 
     # targets need to be installed explicitly

iop/scripts/genconfig.sh

@@ -139,7 +139,6 @@ function genconfig {
 		DEVELOPER=1
 
 		bcmAllowed=0
-		iceAllowed=0
 		endptAllowed=0
 		natalieAllowed=0
 		mediatekAllowed=0
@@ -150,7 +149,6 @@ function genconfig {
 		git ls-remote git@dev.iopsys.eu:dialog/natalie-dect-12.26.git -q 2>/dev/null && natalieAllowed=1
 		git ls-remote git@dev.iopsys.eu:iopsys/endptmngr.git -q 2>/dev/null && endptAllowed=1
 		git ls-remote git@dev.iopsys.eu:iopsys/wifilife.git -q 2>/dev/null && wifilifeAllowed=1
-		git ls-remote git@private.inteno.se:ice-client.git -q -q 2>/dev/null && iceAllowed=1
 	}
 
 	v() {
@@ -356,7 +354,6 @@ function genconfig {
 			# rewrite url to clone with ssh instead of http
 			echo "CONFIG_GITMIRROR_REWRITE=y" >>.config
 			[ $bcmAllowed -eq 0 ] && echo "CONFIG_BCM_OPEN=y" >> .config
-			[ $iceAllowed -eq 0 ] && echo "CONFIG_ICE_OPEN=y" >> .config
 			[ $endptAllowed -eq 0 ] && echo "CONFIG_ENDPT_OPEN=y" >> .config
 			[ $natalieAllowed -eq 0 ] && echo "CONFIG_NATALIE_OPEN=y" >> .config
 			[ $mediatekAllowed -eq 0 ] && echo "CONFIG_MEDIATEK_OPEN=y" >> .config
@@ -364,7 +361,6 @@ function genconfig {
 		else
 			echo "# CONFIG_GITMIRROR_REWRITE is not set" >>.config
 			echo "CONFIG_BCM_OPEN=y" >> .config
-			echo "CONFIG_ICE_OPEN=y" >> .config
 			echo "CONFIG_ENDPT_OPEN=y" >> .config
 			echo "CONFIG_NATALIE_OPEN=y" >> .config
 			echo "CONFIG_MEDIATEK_OPEN=y" >> .config

iop/scripts/generate_tarballs.sh

@@ -59,23 +59,6 @@ build_endptmngr_consumer() {
 	cd "$curdir"
 }
 
-build_ice_consumer() {
-	# create ice-client open version tar file
-	local iceversion icebasever icerelease icecommith
-	icecommith=$(grep -w "PKG_SOURCE_VERSION:" ./feeds/iopsys/ice-client/Makefile | head -1 | cut -d'=' -f2)
-	icebasever=$(grep -w "BASE_PKG_VERSION:" ./feeds/iopsys/ice-client/Makefile | cut -d'=' -f2)
-	icerelease=$(grep -w "PKG_RELEASE:" ./feeds/iopsys/ice-client/Makefile | cut -d'=' -f2)
-	iceversion=$icebasever$icerelease
-	[ -n "$target" -a -n "$iceversion" -a -n "$icecommith" ] || return
-	ssh $SERVER "test -f $FPATH/ice-client-$target-$iceversion-$icecommith.tar.gz" && return
-	cd ./build_dir/target-*/ice-client-$icebasever/ipkg-* || cd ./build_dir/target-mips*musl-*/ice-client-$icebasever/ipkg-*
-	tar -czv  ice-client -f ice-client-$target-$iceversion-$icecommith.tar.gz
-	scp -pv ice-client-$target-$iceversion-$icecommith.tar.gz $SERVER:$FPATH/
-	cp ice-client-$target-$iceversion-$icecommith.tar.gz $curdir/
-	rm -f ice-client-$target-$iceversion-$icecommith.tar.gz
-	cd "$curdir"
-}
-
 build_wifilife_consumer() {
 	local ver commit
 	ver=$(grep -w "PKG_VERSION:" ./feeds/iopsys/wifilife/Makefile | cut -d'=' -f2)
@@ -129,8 +112,8 @@ function print_usage {
 
 function generate_tarballs {
 
-    SERVER="god@software.inteno.se"
-    FPATH="/var/www/html/iopsys/consumer"
+    SERVER="god@download.iopsys.eu"
+    FPATH="/var/www/html/iopsys/opensdk"
 
     set -e
     git remote -v | grep -q http && return # do not continue if this is an open SDK environment
@@ -169,11 +152,9 @@ function generate_tarballs {
 		build_bcmkernel_consumer
 		build_natalie_consumer
 		build_endptmngr_consumer
-		build_ice_consumer
 		build_wifilife_consumer
 	elif [ "$stk_target" == "mediatek" ]; then
 		build_mediatek_kernel
-		build_ice_consumer		
 		build_wifilife_consumer
 	else
 		echo "Invalid target: $stk_target"

iop/scripts/licenses_gen.sh

@@ -0,0 +1,35 @@
+#!/bin/sh
+function license_report {
+    LICDIR="/tmp/licenses-generator/"
+    LICBIN="${LICDIR}/bin"
+
+
+    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 "$LICDIR" ]; then
+  ### Take action if $DIR exists ###
+  echo "Creating json licences file and html formated report"
+else
+  ###  Control will jump here if $DIR does NOT exists ###
+  echo "Error: licenses-generator not found. getting from iopsys repo"
+  git clone git@dev.iopsys.eu:iopsys/licenses-generator.git $LICDIR
+fi
+  LICGET=`${LICBIN}/licenses-generator  gen-License bin/`
+  echo $LICGET
+  ${LICBIN}/licenses-generator gen-licrprt $LICGET
+exit 0
+
+}
+
+
+register_command "license_report" "Generate a Licence report on latest build in json format and html under reports"

iopupgrade/Makefile

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006-2010 OpenWrt.org
+# Copyright (C) 2019 iopsys
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -20,6 +20,9 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)-$(PKG_SOURCE_VERSION).tar.
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 
+PKG_LICENSE:=GPLv2
+PKG_LICENSE_FILES:=LICENSE
+
 # support parallel build
 PKG_BUILD_PARALLEL:=1
 

iopupgrade/files/sbin/iopu

@@ -25,6 +25,7 @@ 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
@@ -51,25 +52,41 @@ function log {
 # anyhting it calls as stdout/stderr might no longer exist
 function finish {
 
-    if [ "$run_cleanup" == "1" ]
+    if [ $run_cleanup -eq 1 ]
     then
 
 	function_call upd_cleanup
+	run_cleanup=0
 	log ""
     fi
 
-    if [ "$run_mount_cleanup" == "1" ]
+    if [ $run_mount_cleanup -eq 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.
-    kill $TIMEOUT_PID 2>/dev/null
+    if [ -n "$TIMEOUT_PID" ]; then
+        kill $TIMEOUT_PID 2>/dev/null
+        TIMEOUT_PID=""
+    fi
 
     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"
@@ -77,7 +94,6 @@ function sig_pipe {
 
 # if a timout happens terminate
 function timeout {
-    finish
     exit 1
 }
 
@@ -133,6 +149,7 @@ 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
 }
 
@@ -141,11 +158,23 @@ 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 "	-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
+
 }
 
 ###############################################################################
@@ -161,10 +190,11 @@ then
 fi
 
 trap finish EXIT
+trap ctrl_c INT
 trap timeout SIGALRM
 trap sig_pipe SIGPIPE
 
-while getopts "nrxb" opt; do
+while getopts "nrxbhcC:" opt; do
     case $opt in
 	n)
 	    upd_noreboot=1
@@ -175,16 +205,19 @@ while getopts "nrxb" opt; do
 	b)
 	    upd_forceboot=1
 	    ;;
+	c)
+	    upd_keepconfig=1
+	    ;;
 	r)
-	    upd_vol=$(get_flashbank_next)
-	    mount_newroot
-	    (ENV=/sbin/iopu_chroot_env chroot /tmp/newroot_overlay /bin/sh)
-	    echo ""
-	    umount_newroot
-	    exit 0
+	    newroot_exec /bin/sh
+	    exit
+	    ;;
+	C)
+	    newroot_exec "${OPTARG}"
+	    exit
 	    ;;
 	h)
-	    upd_usage
+	    usage
 	    exit 1
 	    ;;
     esac
@@ -193,8 +226,7 @@ done
 # put a timeout on this if it takes longer than 120 seconds we should abort
 # and clean up
 (
-sleep 120	# if 2 minutes pass
-kill -ALRM $$	2>/dev/null # send it a SIGALRM signal
+	sleep 120 && kill -ALRM $$ 2>/dev/null		# send it a SIGALRM signal
 )&
 TIMEOUT_PID=$!
 
@@ -211,7 +243,7 @@ fi
 cur_vol=$(get_flashbank_current)
 upd_vol=$(get_flashbank_next)
 
-# convert volume name "rootfs_$upd_vol" into ubifs volume id
+# convert volume name "rootfs_$upd_vol" into ubi 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"
 
@@ -227,29 +259,32 @@ 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
-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
+if ! iopupgrade $cmdline -M "$cmdline_match" -u ubi0_$upd_ubi_id; 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
-chroot /tmp/newroot_overlay /sbin/iopu_chroot $chroot_cmdline
+if ! chroot /tmp/newroot_overlay /sbin/iopu_chroot $chroot_cmdline; then
+	log "Configuration migration failed!"
+	exit 1
+fi
 umount_newroot
 
-log "Update fully installed."
+log "New firmware fully installed."
 run_cleanup=0
 
+
 # Now make sure that we actually boot the new system on the next reboot
 upd_finnish
 
@@ -271,8 +306,3 @@ else
 fi
 
 
-
-
-
-
-

iopupgrade/files/sbin/iopu_chroot

@@ -14,6 +14,7 @@
 # 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
@@ -24,33 +25,36 @@ source /lib/upgrade/iopsys.sh
 
 # only call function if it exists
 function_call() {
-    if type "$1" 2>/dev/null >/dev/null
-    then
-	$1 $@
-    fi
+	if [ -n "$1" ] && type "$1" 2>/dev/null >/dev/null
+	then
+		$1 "$@" || exit
+	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 "hb" opt; do
-    case $opt in
-	h)
-	    upd_usage
-	    exit 1
-	    ;;
-	b)
-	    upd_forceboot=1
-	    ;;
-	\?)
-	    echo "Invalid option: -$OPTARG" >&2
-	    exit 1
-	    ;;
-    esac
+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
 done
 
 # copy old install log over
@@ -59,3 +63,9 @@ 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
+

iwatchdog/Makefile

@@ -1,6 +1,9 @@
+# Copyright (C) 2019 iopsys
 #
-# Copyright (C) 2013 Inteno
+# 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
 
@@ -8,6 +11,9 @@ PKG_NAME:=iwatchdog
 PKG_VERSION:=1.0.0
 PKG_RELEASE:=1
 
+PKG_LICENSE:=GPLv2
+PKG_LICENSE_FILES:=LICENSE
+
 # support parallel build
 PKG_BUILD_PARALLEL:=1
 
@@ -22,7 +28,7 @@ include $(INCLUDE_DIR)/package.mk
 
 define Package/iwatchdog
   CATEGORY:=Utilities
-  TITLE:=Inteno watchdog
+  TITLE:=IOPSYS watchdog
 endef
 
 define Package/iwatchdog/description

json-editor/Makefile

@@ -0,0 +1,32 @@
+#
+# Copyright (C) 2019 IOPSYS
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=json-editor
+PKG_RELEASE:=1.0.0
+
+PKG_SOURCE_VERSION:=44b32937a062ec4ffc9f7355841dc94ab6efa50f
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=git@dev.iopsys.eu:iopsys/json-editor.git
+
+include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/cmake.mk
+
+define Package/json-editor
+  SECTION:=base
+  CATEGORY:=Libraries
+  DEPENDS:=+libjson-c +libblobmsg-json
+  TITLE:=JSON-editor
+endef
+
+define Build/InstallDev
+	$(INSTALL_DIR) $(1)/usr/include
+	$(CP) $(PKG_BUILD_DIR)/src/json-editor.h $(1)/usr/include/
+
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_BUILD_DIR)/libjson-editor.so $(1)/usr/lib/
+endef
+
+$(eval $(call BuildPackage,json-editor))

libjwt/Makefile

@@ -17,6 +17,8 @@ PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 
 PKG_FIXUP:=autoreconf
 
+PKG_LICENSE:=LGPLv3
+PKG_LICENSE_FILES:=COPYING
 include $(INCLUDE_DIR)/package.mk
 
 define Package/libjwt

libmicroxml/Makefile

@@ -0,0 +1,56 @@
+#
+# 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

@@ -0,0 +1,130 @@
+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);

libpicoevent/Makefile

@@ -14,6 +14,8 @@ PKG_SOURCE_PROTO:=git
 PKG_SOURCE_VERSION:=7875222706cb6999af0361ef0aebdc85cd75c127
 PKG_NAME:=libpicoevent
 
+PKG_LICENSE:=GPL-2.0-only
+PKG_LICENSE_FILES:=LICENSE
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 

librpc/Makefile

@@ -0,0 +1,33 @@
+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))

libtrace/Makefile

@@ -12,6 +12,9 @@ PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 
+PKG_LICENSE:=GPLv2
+PKG_LICENSE_FILES:=COPYING
+
 PKG_INSTALL:=1
 PKG_FIXUP:=autoreconf
 

lmbench/Makefile

@@ -15,6 +15,9 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tgz
 PKG_SOURCE_URL:=@SF/lmbench/
 PKG_MD5SUM:=b3351a3294db66a72e2864a199d37cbf
 
+PKG_LICENSE:=GPLv2
+PKG_LICENSE_FILES:=COPYING
+
 PKG_BUILD_DEPENDS:=librpc
 
 include $(INCLUDE_DIR)/package.mk

logrotate/Makefile

@@ -19,6 +19,9 @@ PKG_CAT:=zcat
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 
+PKG_LICENSE:=GPLv2
+PKG_LICENSE_FILES:=COPYING
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/logrotate

loop-detector/Makefile

@@ -1,3 +1,9 @@
+# Copyright (C) 2019 iopsys
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=loop-detector
@@ -11,6 +17,9 @@ 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_FILES:=COPYING
+
 include $(INCLUDE_DIR)/package.mk
 
 

ltq-nand/Makefile

@@ -16,6 +16,9 @@ PKG_SOURCE_URL:=https://github.com/merbanan/ltq-nand/archive/
 #PKG_SOURCE_URL:=https://github.com/merbanan/ltq-nand.git
 #PKG_SOURCE_VERSION:=07b5b0331af6de4174dab2c02bf260ee9625452a
 
+PKG_LICENSE:=GPLv2
+PKG_LICENSE_FILES:=LICENSE
+
 include $(INCLUDE_DIR)/host-build.mk
 
 

meshcomms/Makefile

@@ -0,0 +1,64 @@
+#
+# Copyright (C) 2019 IOPSYS
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=meshcomms
+PKG_VERSION:=1.0.1
+
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_VERSION:=8d5808d81d1fc96e4ce4ee682847b4de15b46224
+PKG_SOURCE_URL:=https://dev.iopsys.eu/fork/meshcomms.git
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
+
+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
+  SECTION:=utils
+  CATEGORY:=Utilities
+  TITLE:=Mesh agent
+  DEPENDS:=+libpcap +libopenssl +libubox +libubus +libblobmsg-json
+endef
+
+define Package/meshcomms/description
+ meshComms is an open source implementation of IEEE 1905.1a that is an output
+ of the Broadband Forum Open Broadband - Multi Access Point (OB-MAP) project.
+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
+
+#define Build/Prepare
+#        $(CP) -rf ./meshcomms/* $(PKG_BUILD_DIR)/
+#endef
+
+define Package/meshcomms/install
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(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/
+endef
+
+$(eval $(call BuildPackage,meshcomms))

meshcomms/files/meshcomms.conf

@@ -0,0 +1,8 @@
+config meshcomms 'global'
+    option basemacint 'wan'
+    list interfaces 'lan'
+    list interfaces 'wan'
+    option mapall true
+    option debug  false
+    option port  8888
+

meshcomms/files/meshcomms.init

@@ -0,0 +1,105 @@
+#!/bin/sh /etc/rc.common
+
+START=99
+STOP=10
+
+USE_PROCD=1
+PROG=/usr/sbin/al_entity
+
+validate_global_section()
+{
+	uci_validate_section meshcomms meshcomms "${1}" \
+		'basemacint:string:wan' \
+		'interfaces:string:lan' \
+		'mapall:bool:true' \
+		'debug:bool:true' \
+		'port:port:8888'
+}
+
+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
+	echo ${basemac}
+}
+
+configure_meshcomms()
+{
+	local basemacint interfaces mapall debug port l3device basemac intf
+
+	validate_global_section global || {
+		echo "Validation of global section failed"
+		return 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
+	
+	basemac=$(get_interface_mac ${basemacint})
+
+
+	for f in ${interfaces}
+	do
+		local l3=$(get_device_name $f)
+		intf="${intf} ${l3}"
+	done
+	intf=$(echo $intf|sed 's/ /,/g')
+	[ -z "${intf}" ] && \
+		echo "interface list is empty/invalid">/dev/console \
+		return 1
+
+	procd_append_param command -m ${basemac} -i ${intf}
+
+	[ "${debug}" -eq 1 ] && \
+		procd_append_param command -vv
+
+	[ "${mapall}" -eq 1 ] && \
+		procd_append_param command -w
+
+	[ ${port} -ne 8888 ] && \
+		procd_append_param command -p ${port}
+}
+
+configure_network() {
+	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 meshcomms
+	config_foreach configure_meshcomms meshcomms
+}
+
+start_service() {
+	procd_open_instance meshcomms
+	procd_set_param command ${PROG}
+	configure_network
+	procd_set_param respawn
+	procd_close_instance
+}
+
+reload_service() {
+	stop
+	start
+}
+
+service_triggers() {
+	procd_add_reload_trigger "network"
+}

mqtt-ciotc/Makefile

@@ -16,6 +16,8 @@ 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:=Apache-2.0
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/mqtt-ciotc

mt7603/Makefile

@@ -0,0 +1,291 @@
+# 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

@@ -0,0 +1,317 @@
+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

@@ -0,0 +1,250 @@
+#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

@@ -0,0 +1,250 @@
+# 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

@@ -0,0 +1,250 @@
+# 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

@@ -0,0 +1,191 @@
+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

@@ -0,0 +1,256 @@
+# 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

@@ -0,0 +1,317 @@
+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

@@ -0,0 +1,250 @@
+#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

@@ -0,0 +1,250 @@
+# 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

@@ -0,0 +1,60 @@
+#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

@@ -0,0 +1,406 @@
+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

@@ -0,0 +1,27 @@
+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

@@ -0,0 +1,250 @@
+# 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#

multiwan/Makefile

@@ -11,6 +11,8 @@ PKG_NAME:=multiwan
 PKG_VERSION:=1.0.22
 PKG_RELEASE:=2
 
+PKG_LICENSE:=GPLv2
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/multiwan

natalie-dect-h/Makefile

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

natalie-dect/Makefile

@@ -1,8 +1,5 @@
 #
-# Copyright (C) 2006-2008 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
+# Copyright (C) 2019 IOPSYS Software Solutions AB
 #
 
 include $(TOPDIR)/rules.mk
@@ -14,7 +11,7 @@ PKG_SOURCE_VERSION:=378c404fba3efc8f1bcde54370a5370670fa1853
 ifeq ($(CONFIG_NATALIE_OPEN),y)
 BRCM_KERNEL_PROFILE=$(shell echo $(CONFIG_BCM_KERNEL_PROFILE) | sed s/\"//g)
 PKG_SOURCE:=$(PKG_NAME)-$(BRCM_KERNEL_PROFILE)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
-PKG_SOURCE_URL:=http://iopsys.inteno.se/iopsys/consumer/
+PKG_SOURCE_URL:=http://download.iopsys.eu/iopsys/opensdk/
 PKG_NAME:=natalie-dect-open
 else
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
@@ -25,6 +22,8 @@ endif
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 PKG_BUILD_PARALLEL:=1
 
+PKG_LICENSE:=PROPRIETARY
+
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/image.mk
 include $(INCLUDE_DIR)/kernel.mk

ndisc/Makefile

@@ -15,6 +15,9 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://www.remlab.net/files/ndisc6
 PKG_MD5SUM:=50cb4c19606cf6ff2b7388e71832f579
 
+PKG_LICENSE:=GPLv2
+PKG_LICENSE_FILES:=COPYING
+
 PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk

ndt/Makefile

@@ -12,6 +12,9 @@ PKG_BUILD_DIR:=${BUILD_DIR}/ndt-$(PKG_VERSION)
 PKG_SOURCE:=ndt-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://software.internet2.edu/sources/ndt
 
+PKG_LICENSE:=NONSTANDARD_PERMISSIV
+PKG_LICENSE_FILES:=COPYRIGHT
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/ndt

netmode/Makefile

@@ -1,3 +1,10 @@
+#
+# Copyright (C) 2019 iopsys
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=netmode
@@ -11,6 +18,9 @@ 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_FILES:=LICENSE
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/netmode

netmode/files/lib/functions/netmode.sh

@@ -121,6 +121,11 @@ run_netmode_scripts() {
 	local mode=$1
 	local when=$2
 	local script
+	local path
+
+	path=$(readlink -f /etc/netmodes/$mode/)
+	[ "${path:0:14}" == "/etc/netmodes/" ] || exit
+
 	if [ -d /etc/netmodes/$mode/scripts/$when ]; then
 		logger -s -p user.info -t "netmode" "Executing $when netmode scripts" >/dev/console
 		for script in $(ls /etc/netmodes/$mode/scripts/$when/); do

obuspa/Makefile

@@ -5,10 +5,10 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=obuspa
-PKG_VERSION:=1.0.0
+PKG_VERSION:=2.0.0
 
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=014d7ec63331b3b745e8af53a4be1b52693e2a6f
+PKG_SOURCE_VERSION:=9c7921c8e39acfc31f563bd08220faba1012a834
 PKG_SOURCE_URL:=https://dev.iopsys.eu/fork/obuspa.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
 
@@ -16,6 +16,10 @@ PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 
 PKG_FIXUP:=autoreconf
 
+PKG_LICENSE:=BSD-3-Clause
+PKG_LICENSE_FILES:=LICENSE
+
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/obuspa
@@ -45,8 +49,10 @@ define Package/obuspa/install
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_DIR) $(1)/etc/init.d
 	$(INSTALL_DIR) $(1)/etc/config
+	$(INSTALL_DIR) $(1)/etc/obuspa
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/obuspa $(1)/usr/sbin/
-	$(CP) ./files/* $(1)/
+	$(INSTALL_BIN) ./files/etc/init.d/obuspa $(1)/etc/init.d/
+	$(INSTALL_DATA) ./files/etc/config/obuspa $(1)/etc/config/
 endef
 
 $(eval $(call BuildPackage,obuspa))

obuspa/files/etc/config/obuspa

@@ -1,14 +1,41 @@
+# controller, mtp, connection makes a group and related to one another
+# ex: first controller will be mapped to first mtp and first connection
+# details, always defined in groups
+
+config obuspa
+	option cert '/etc/obuspa/rootCA.pem'
+	option interface 'wan'
+	option debug 'false'
+
 config controller
 	option endpointid 'self::usp-controller.com'
+	option enable 'true'
+	# Trust cerificate number
+	option AssignedRole 1
+	option PeriodicNotifInterval "86400"
+	option PeriodicNotifTime "0001-01-01T00:00:00Z"
+	option USPRetryMinimumWaitInterval "5"
+	option USPRetryIntervalMultiplier "2000"
+	option ControllerCode ""
+	option protocol 'STOMP'
 
 config mtp
 	option enable 'true'
 	option protocol 'STOMP'
-	option destination 'uspq'
+	option destination ''
 
 config connection
 	option host 'usp-controller.com'
 	option username 'username'
 	option password 'password'
-	option encryption 'false'
+	option encryption 'true'
+	option enable 'true'
+	option port 61613
+	option virtualhost '/'
+	option EnableHeartbeats "true"
+	option OutgoingHeartbeat "30000"
+	option IncomingHeartbeat "300000"
+	option ServerRetryInitialInterval "60"
+	option ServerRetryIntervalMultiplier "2000"
+	option ServerRetryMaxInterval "30720"
 

obuspa/files/etc/init.d/obuspa

@@ -4,92 +4,211 @@ START=99
 USE_PROCD=1
 
 PROG=/usr/sbin/obuspa
-
-CTRL_PATH="Device.LocalAgent.Controller.1."
-MTP_PATH="Device.LocalAgent.MTP.1."
-CONN_PATH="Device.STOMP.Connection.1."
+l3device=""
+certificate=""
+PARAM_FILE="/tmp/obuspa_param_reset.txt"
+conn_num=1
+mtp_num=1
+stomp_num=1
 
 log() {
 	echo "${@}"|logger -t obuspa -p debug
 }
 
 db_set() {
-	log "DBSET param|${1}| value|${2}|"
-	${PROG} -c dbset ${1} ${2}
+	if [ -n "${1}" ]; then
+		echo "${1} \"${2}\"">>${PARAM_FILE}
+	else
+		echo >>${PARAM_FILE}
+	fi
+}
+
+validate_obuspa_section()
+{
+	uci_validate_section obuspa obuspa "${1}" \
+		'cert:string:"/etc/obuspa/rootCA.pem"' \
+		'interface:string:wan' \
+		'debug:bool:false'
 }
 
 validate_controller_section()
 {
 	uci_validate_section obuspa controller "${1}" \
-		'endpointid:string:"self:usp-controller.com"'
+		'endpointid:string:"self:usp-controller.com"' \
+		'enable:bool:true' \
+		'AssignedRole:uinteger:1' \
+		'PeriodicNotifInterval:uinteger:86400' \
+		'PeriodicNotifTime:string:"0001-01-01T00:00:00Z"' \
+		'USPRetryMinimumWaitInterval:uinteger:5' \
+		'USPRetryIntervalMultiplier:uinteger:2000' \
+		'ControllerCode:string' \
+		'protocol:or("STOMP","CoAP")' \
+		'CoAPHost:string' \
+		'CoAPPath:string' \
+		'CoAPPort:uinteger'
 }
 
 validate_mtp_section()
 {
 	uci_validate_section obuspa mtp "${1}" \
 		'enable:bool:true' \
-		'protocol:string:"STOMP"' \
-		'destination:string:'
+		'protocol:or("STOMP","CoAP")' \
+		'destination:string' \
+		'CoAPPath:string' \
+		'CoAPPort:uinteger'
 }
 
 validate_connection_section()
 {
 	uci_validate_section obuspa connection "${1}" \
 		'host:string:"usp-controller.com"' \
-		'username:string:username' \
-		'password:string:password' \
-		'encryption:bool:true'
+		'username:string:""' \
+		'password:string:""' \
+		'encryption:bool:true' \
+		'enable:bool:true' \
+		'port:uinteger:61613' \
+		'virtualhost:string:"/"' \
+		'EnableHeartbeats:bool:true' \
+		'OutgoingHeartbeat:uinteger:30000' \
+		'IncomingHeartbeat:uinteger:300000' \
+		'ServerRetryInitialInterval:uinteger:60' \
+		'ServerRetryIntervalMultiplier:uinteger:2000' \
+		'ServerRetryMaxInterval:uinteger:30720'
 }
 
 configure_controller() {
-	local endpointid
+	local endpointid enable AssignedRole PeriodicNotifInterval PeriodicNotifTime USPRetryMinimumWaitInterval
+	local USPRetryIntervalMultiplier ControllerCode protocol CoAPHost CoAPPath CoAPPort
 
 	validate_controller_section "${1}" || {
 		log "Validation of section failed"
 		return 1;
 	}
-	db_set "${CTRL_PATH}EndpointID" ${endpointid}
+	db_set Device.LocalAgent.Controller.${conn_num}.EndpointID "${endpointid}"
+	db_set Device.LocalAgent.Controller.${conn_num}.Alias "cpe-${conn_num}"
+	db_set Device.LocalAgent.Controller.${conn_num}.Enable "true"
+	db_set Device.LocalAgent.Controller.${conn_num}.AssignedRole "Device.LocalAgent.ControllerTrust.Role.${AssignedRole}"
+	db_set Device.LocalAgent.Controller.${conn_num}.PeriodicNotifInterval "${PeriodicNotifInterval}"
+	db_set Device.LocalAgent.Controller.${conn_num}.PeriodicNotifTime "${PeriodicNotifTime}"
+	db_set Device.LocalAgent.Controller.${conn_num}.USPRetryMinimumWaitInterval "${USPRetryMinimumWaitInterval}"
+	db_set Device.LocalAgent.Controller.${conn_num}.USPRetryIntervalMultiplier "${USPRetryIntervalMultiplier}"
+	db_set Device.LocalAgent.Controller.${conn_num}.ControllerCode "${ControllerCode}"
+	db_set Device.LocalAgent.Controller.${conn_num}.MTP.${conn_num}.Alias "cpe-${conn_num}" 
+	db_set Device.LocalAgent.Controller.${conn_num}.MTP.${conn_num}.Enable "${enable}"
+	db_set Device.LocalAgent.Controller.${conn_num}.MTP.${conn_num}.Protocol "${protocol}"
+	if [ "${protocol}"=="STOMP" ]; then
+		db_set Device.LocalAgent.Controller.${conn_num}.MTP.${conn_num}.STOMP.Reference "Device.STOMP.Connection.${conn_num}"
+		db_set Device.LocalAgent.Controller.${conn_num}.MTP.${conn_num}.STOMP.Destination "controller-notify-dest"
+	elif [ "${protocol}"=="CoAP" ]; then
+		db_set Device.LocalAgent.Controller.${conn_num}.MTP.${conn_num}.CoAP.Host "${CoAPHost}"
+		db_set Device.LocalAgent.Controller.${conn_num}.MTP.${conn_num}.CoAP.Path "${CoAPPath}"
+		db_set Device.LocalAgent.Controller.${conn_num}.MTP.${conn_num}.CoAP.Port "${CoAPPort}"
+	else
+		log "Unsupported protocol ${protocol}"
+	fi
+	db_set
+	conn_num=$((conn_num+1))
 }
 
 configure_mtp() {
-	local protocol enable destination
+	local protocol enable destination CoAPPath CoAPPort
 
 	validate_mtp_section "${1}" || {
 		log "Validation of section failed"
 		return 1;
 	}
-	db_set "${MTP_PATH}Enable" ${enable}
-	db_set "${MTP_PATH}Protocol" ${protocol}
-	db_set "${MTP_PATH}STOMP.Destination" ${destination}
+	db_set Device.LocalAgent.MTP.${mtp_num}.Alias "cpe-${mtp_num}"
+	db_set Device.LocalAgent.MTP.${mtp_num}.Enable "${enable}"
+	db_set Device.LocalAgent.MTP.${mtp_num}.Protocol "${protocol}"
+	if [ "${protocol}"=="STOMP" ]; then
+		db_set Device.LocalAgent.MTP.${mtp_num}.STOMP.Reference "Device.STOMP.Connection.${mtp_num}"
+		db_set Device.LocalAgent.MTP.${mtp_num}.STOMP.Destination "${destination}"
+	elif [ "${protocol}"=="CoAP" ]; then
+		db_set Device.LocalAgent.MTP.${mtp_num}.CoAP.Path "${CoAPPath}"
+		db_set Device.LocalAgent.MTP.${mtp_num}.CoAP.Port "${CoAPPort}"
+	else
+		log "Unsupported protocol ${protocol}"
+	fi
+	db_set
+	mtp_num=$((mtp_num+1))
 }
 
 configure_connection() {
-	local host username password encryption
+	local host username password encryption enable port virtualhost EnableHeartbeats
+	local OutgoingHeartbeat IncomingHeartbeat ServerRetryInitialInterval
+	local ServerRetryIntervalMultiplier ServerRetryMaxInterval
 
 	validate_connection_section "${1}" || {
 		log "Validation of section failed"
 		return 1;
 	}
-	db_set "${CONN_PATH}Host" ${host}
-	db_set "${CONN_PATH}Username" ${username}
-	db_set "${CONN_PATH}Password" ${password}
-	db_set "${CONN_PATH}X_ARRIS-COM_EnableEncryption" ${encryption}
+
+	db_set Device.STOMP.Connection.${stomp_num}.Host "${host}"
+	db_set Device.STOMP.Connection.${stomp_num}.Username "${username}"
+	db_set Device.STOMP.Connection.${stomp_num}.Password "${password}"
+
+	db_set Device.STOMP.Connection.${stomp_num}.Alias "cpe-${stomp_num}"
+	db_set Device.STOMP.Connection.${stomp_num}.Enable "${enable}"
+	db_set Device.STOMP.Connection.${stomp_num}.Port "${port}"
+	db_set Device.STOMP.Connection.${stomp_num}.X_ARRIS-COM_EnableEncryption "${encryption}"
+	db_set Device.STOMP.Connection.${stomp_num}.VirtualHost "${virtualhost}"
+	db_set Device.STOMP.Connection.${stomp_num}.EnableHeartbeats "${EnableHeartbeats}"
+	db_set Device.STOMP.Connection.${stomp_num}.OutgoingHeartbeat "${OutgoingHeartbeat}"
+	db_set Device.STOMP.Connection.${stomp_num}.IncomingHeartbeat "${IncomingHeartbeat}"
+	db_set Device.STOMP.Connection.${stomp_num}.ServerRetryInitialInterval "${ServerRetryInitialInterval}"
+	db_set Device.STOMP.Connection.${stomp_num}.ServerRetryIntervalMultiplier "${ServerRetryIntervalMultiplier}"
+	db_set Device.STOMP.Connection.${stomp_num}.ServerRetryMaxInterval "${ServerRetryMaxInterval}"
+	db_set
+	stomp_num=$((stomp_num+1))
 }
 
+configure_obuspa() {
+	local cert interface debug
+
+	validate_obuspa_section "${1}" || {
+		log "Validation of section failed"
+		return 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
+
+	# Get wan L3 interface
+	json_load "$(ubus -t 2 call network.interface.${interface} status)"
+	json_get_var l3device l3_device
+	export USP_BOARD_IFNAME=${l3device}
+
+	# Set this variable for root user
+	echo "export USP_BOARD_IFNAME=${l3device}">/root/.profile
+
+	[ -f $cert ] && certificate=$cert
+
+}
 db_init() {
+	[ -f ${PARAM_FILE} ] && rm -f ${PARAM_FILE}
 	[ -f /tmp/usp.db ] && rm -f /tmp/usp.db
 
 	config_load obuspa
+	config_foreach configure_obuspa obuspa
 	config_foreach configure_controller controller
-	config_foreach configure_mtp mtp
 	config_foreach configure_connection connection
+	config_foreach configure_mtp mtp
+	db_set Internal.Reboot.Cause "LocalFactoryReset"
 }
-start_service() {
-	db_init
 
-	procd_open_instance
+start_service() {
+	procd_open_instance obuspa
+	db_init
+	procd_set_param env USP_BOARD_IFNAME=${l3device}
 	procd_set_param command ${PROG}
-	procd_append_param command -p -v 4
+	procd_append_param command -p -v 4 -r ${PARAM_FILE}
+	if [ -f "${certificate}" ]; then
+		procd_append_param command -t ${certificate}
+	fi
 	procd_set_param respawn
 	procd_close_instance
 }
@@ -102,4 +221,3 @@ reload_service() {
 service_triggers() {
 	procd_add_config_trigger "config.change" "obuspa"  /etc/init.d/obuspa restart
 }
-

owsd/Makefile

@@ -10,13 +10,16 @@ PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/owsd.git
-PKG_SOURCE_VERSION:=f1d6bff1971640006b3137b342fafa1c40cfb835
+PKG_SOURCE_VERSION:=a83448ed65e1c76411b9c6553d64b5d623b8bcd7
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_SOURCE_SUBDIR:=${PKG_NAME}-${PKG_VERSION}
 PKG_INSTALL:=1
 PKG_BUILD_PARALLEL:=1
 PKG_CONFIG_DEPENDS:=CONFIG_OWSD_USE_DBUS CONFIG_OWSD_USE_UBUS CONFIG_OWSD_USE_DBUS_UBUS CONFIG_OWSD_UPROXYD
 
+PKG_LICENSE:=GPLv2
+PKG_LICENSE_FILES:=LICENSE
+
 USE_UBUS-y:=-DWSD_HAVE_UBUS=ON
 USE_DBUS-y:=-DWSD_HAVE_DBUS=ON
 USE_BOTH-y:=${USE_UBUS-y} ${USE_DBUS-y}

owsd/files/owsd.init

@@ -66,6 +66,8 @@ rpcd_acl() {
 }
 
 handle_owsd_acl() {
+	[ -d /tmp/owsd ] || mkdir /tmp/owsd
+
 	config_load rpcd
 	config_foreach append_users "login"
 
@@ -77,9 +79,9 @@ handle_owsd_acl() {
 		config_foreach owsd_acl "owsd-listen" "$USR"
 		json_close_array
 	done
-	json_dump > /tmp/owsd_acl
+	json_dump > /tmp/owsd/owsd_acl
 
-	json_load "$(cat /tmp/owsd_acl)"
+	json_load "$(cat /tmp/owsd/owsd_acl)"
 	config_load rpcd
 	config_foreach rpcd_acl "login"
 	uci commit rpcd
@@ -126,8 +128,8 @@ validate_owsd_global() {
 
 }
 
-append_origin() {
-	procd_append_param command -o"$1"
+append_str() {
+	json_add_string "" "$1"
 }
 
 append_origin_parts() {
@@ -137,9 +139,9 @@ append_origin_parts() {
 	port="$3"
 
 	if [ "${proto}" = "https" -a "${port}" -eq 443 -o "${proto}" = "http" -a "${port}" -eq 80 ]; then
-		append_origin "${proto}://${host}"
+		append_str "${proto}://${host}"
 	else
-		append_origin "${proto}://${host}:${port}"
+		append_str "${proto}://${host}:${port}"
 	fi
 }
 
@@ -150,6 +152,7 @@ validate_owsd_iface() {
 		'origin:list(string)' \
 		'whitelist_interface_as_origin:bool:0' \
 		'whitelist_dhcp_domains:bool:0' \
+		'whitelist_all_origins:bool:0' \
 		'ipv6:bool:1' \
 		'ipv6only:bool:0' \
 		'linklocal:bool:0' \
@@ -163,7 +166,7 @@ validate_owsd_iface() {
 }
 
 parse_owsd_iface() {
-	local port interface whitelist_interface_as_origin whitelist_dhcp_domains ipv6 ipv6only linklocal
+	local port interface whitelist_interface_as_origin whitelist_dhcp_domains whitelist_all_origins ipv6 ipv6only linklocal
 	local cert key ca
 	local restrict_to_user
 	local ubusx_acl
@@ -175,24 +178,37 @@ parse_owsd_iface() {
 
 	# utility function
 	new_listen_socket() {
-		procd_append_param command -p "${port}"
+		json_add_int "port" ${port}
 
-		procd_append_param command -L"$1"
+		[ -n "${cert}"      ] && json_add_string "cert" "${cert}"
+		[ -n "${key}"       ] && json_add_string "key" "${key}"
+		[ -n "${ca}"        ] && json_add_string "ca" "${ca}"
 
-		[ -n "${cert}"      ] && procd_append_param command -c"${cert}"
-		[ -n "${key}"       ] && procd_append_param command -k"${key}"
-		[ -n "${ca}"        ] && procd_append_param command -a"${ca}"
+		[ -n "${restrict_to_user}" ] && {
+			json_add_array "restrict_to_user"
+			config_list_foreach "$1" "restrict_to_user" append_str
+			json_close_array
+		}
+		[ -n "$2" ] && json_add_string "interface" "$2"
 
-		[ -n "${restrict_to_user}" ] && procd_append_param command -u"${restrict_to_user}"
-
-		[ -n "$2" ] && procd_append_param command -i"$2"
-
-		[ -n "${ubusx_acl}" ] && procd_append_param command -X"${ubusx_acl}"
+		[ -n "${ubusx_acl}" ] && json_add_string "ubusx_acl" "$ubusx_acl"
 
 	}
 
-	append_whitelists () {
-		config_list_foreach "$1" "origin" append_origin
+	origin_whitelist_all() {
+		[ "$1" = "*" ] && echo "true"
+	}
+
+	append_whitelists() {
+		config_list_foreach "$1" "origin" append_str
+
+		# uncomment code below when implementing one vhost per origin fix
+		#[ -n "$2" ] && whitelist_all_origins=1
+
+		#if [ "$whitelist_all_origins" -eq 1 ]; then
+		#	whitelist_dhcp_domains=1
+		#	whitelist_interface_as_origin=1
+		#fi
 
 		if [ "$whitelist_dhcp_domains" -eq 1 ]; then
 			for domain in $DHCP_DOMAINS; do
@@ -212,13 +228,22 @@ parse_owsd_iface() {
 	if [ -n "${interface}" ]; then
 		# 1 listen-socket (vhost) for each IP address on that network's iface
 
+		whitelist=$(config_list_foreach "$1" "origin" origin_whitelist_all)
+
 		# ipv4 addresses
 		if [ "${ipv6only}" -eq 0 ]; then
 			network_get_ipaddrs ip4addrs "${interface}";
 		fi
+
+		json_add_array "$1"
 		for addr in ${ip4addrs}; do
+			json_add_object "${1}"
 			new_listen_socket "$1" "${addr}"
-			append_whitelists "$1"
+			[ -n "$whitelist" -o "$whitelist_all_origins" -eq 1 ] && json_add_boolean "origin_check" false
+			json_add_array "origin"
+			append_whitelists "$1" "$whitelist"
+			json_close_array
+			json_close_object
 		done
 
 		# ipv6 addresses
@@ -230,16 +255,24 @@ parse_owsd_iface() {
 				ip6addrs="${ip6addrs} ${linklocaladdrs}"
 			fi
 		fi
+
 		for addr in ${ip6addrs}; do
+			json_add_object "${1}6"
 			new_listen_socket "$1" "${addr}"
 			addr="\\[${addr}]"
-			append_whitelists "$1"
-			procd_append_param command -66
+			[ -n "$whitelist" ] && json_add_boolean "origin_check" false
+			json_add_array "origin"
+			append_whitelists "$1" "$whitelist"
+			json_close_array
+			json_add_boolean "ipv6" 1
+			json_close_object
 		done
+		json_close_array
+
 	else
 		new_listen_socket "$1"
-		if [ "${ipv6}" -eq 1 ]; then procd_append_param command -6; fi
-		if [ "${ipv6}" -eq 1 -a "${ipv6only}" -eq 1 ]; then procd_append_param command -6; fi
+		if [ "${ipv6}" -eq 1 ]; then json_add_boolean "ipv6only" 1; fi
+		if [ "${ipv6}" -eq 1 -a "${ipv6only}" -eq 1 ]; then json_add_boolean "ipv6only" 1; fi
 
 		append_whitelists "$1"
 	fi
@@ -263,41 +296,49 @@ start_service() {
 		echo "Global validation failed"
 		return 1
 	}
-
-	[ -n "${sock}"      ] && procd_append_param command -s"${sock}"
-	[ -n "${www}"       ] && procd_append_param command -w"${www}"
-	[ -n "${redirect}"  ] && procd_append_param command -r"${redirect}"
-	[ -n "${www_maxage}" ] && procd_append_param command -t"${www_maxage}"
-
-	#validate_owsd_ubusproxy || {
-	#	echo "Ubusproxy validation failed"
-	#	return 1
-	#}
+	json_init
+	json_add_object "global"
+	[ -n "${sock}"       ] && json_add_string "socket" "$sock"
+	[ -n "${www}"        ] && json_add_string "www" "$www"
+	[ -n "${redirect}"   ] && json_add_string "redirect" "$redirect"
+	[ -n "${www_maxage}" ] && json_add_int "www_maxage" "$www_maxage"
+	json_close_object
 
 	validate_owsd_ubusproxy && {
 		if [ "${enable}" -eq 1 ]; then
-			procd_append_param command -U
+			json_add_object "ubusproxy"
 
-			[ -n "${peer_cert}" ] && procd_append_param command -C"${peer_cert}"
-			[ -n "${peer_key}"  ] && procd_append_param command -K"${peer_key}"
-			[ -n "${peer_ca}"   ] && procd_append_param command -A"${peer_ca}"
+			[ -n "${peer_cert}" ] && json_add_string "peer_cert" "${peer_cert}"
+			[ -n "${peer_key}"  ] && json_add_string "peer_key" "${peer_key}"
+			[ -n "${peer_ca}"   ] && json_add_string "peer_ca" "${peer_ca}"
 
 			append_peer () {
-				[ -n "$1"   ] && procd_append_param command -P"$1"
+				[ -n "$1"   ] && json_add_string "peer" "$1"
 			}
 
 			append_object () {
-				[ -n "$1"   ] && procd_append_param command -U"$1"
+				[ -n "$1"   ] && json_add_string "object" "$1"
 			}
 
+			json_add_array "peer"
 			config_list_foreach "ubusproxy" "peer" append_peer
+			json_close_array
+			json_add_array "object"
 			config_list_foreach "ubusproxy" "object" append_object
+			json_close_array
 
-			[ "${prefix}" == "mac" ] && procd_append_param command -F"mac"
+			[ "${prefix}" == "mac" ] && json_add_string "prefix" "mac"
+			json_close_object
 		fi
 	}
 
+	json_add_object "owsd-listen"
 	config_foreach parse_owsd_iface "owsd-listen"
+	json_close_object
+
+	[ ! -d "/tmp/owsd" ] && mkdir /tmp/owsd
+	json_dump > /tmp/owsd/owsd_cfg.json
+	procd_append_param command -f "/tmp/owsd/owsd_cfg.json"
 
 #	procd_set_param stderr 1
 	procd_set_param respawn

paho-mqtt-c/Makefile

@@ -16,6 +16,10 @@ 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:=edl-v10
+PKG_LICENSE_FILES:=LICENSE
+
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/lib-paho-mqtt

peripheral_manager/Makefile

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006-2010 OpenWrt.org
+# Copyright (C) 2019 iopsys
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -12,7 +12,7 @@ PKG_NAME:=peripheral_manager
 PKG_VERSION:=1.0.0
 PKG_RELEASE:=1
 
-PKG_SOURCE_VERSION:=769430115b6dd984313574c3fa2a6d99c65cd223
+PKG_SOURCE_VERSION:=ba1026896e221cb60751fe2faab002d241f9db74
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/peripheral-manager
 
@@ -20,6 +20,9 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)-$(PKG_SOURCE_VERSION).tar.
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 
+PKG_LICENSE:=GPLv2
+PKG_LICENSE_FILES:=LICENSE
+
 # support parallel build
 PKG_BUILD_PARALLEL:=1
 
@@ -36,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

peripheral_manager/files/etc/init.d/peripheral_manager

@@ -1,6 +1,6 @@
 #!/bin/sh /etc/rc.common
 
-START=19
+START=12
 STOP=91
 
 USE_PROCD=1

picolisp/Makefile

@@ -1,83 +0,0 @@
-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
-
-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

@@ -1,43 +0,0 @@
-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

port-management/Makefile

@@ -4,7 +4,7 @@ PKG_NAME:=port-management
 PKG_VERSION:=1.0.0
 PKG_RELEASE:=1
 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
-
+PKG_LICENSE:=GPL-2.0-only
 include $(INCLUDE_DIR)/package.mk
 
 define Package/port-management

port-management/files/etc/init.d/port_management

@@ -56,7 +56,7 @@ configure_ethports(){
 	config_get speed $name speed
 	config_get ifname $name ifname
 	config_get pause $name pause
-	set_port_speed $ifname $speed
+	set_port_speed $ifname $speed $name
 	set_port_pause $ifname $pause
 }
 
@@ -73,3 +73,8 @@ service_triggers() {
 	procd_add_reload_trigger ports
 }
 
+boot() {
+	wan=$(db -q get hw.board.ethernetWanPort)
+	restart_port $wan
+	start
+}