easy-soc-lib: Fix Makefile to pass broadcom chip id properly

map-1905: Add validate function in plugin
uspd: Added ubus methods to list_inform and init_notify
2026-01-11 15:14:17 +08:00 · 2020-11-06 08:35:41 +01:00 · 2020-11-06 10:14:22 +05:30 · 2020-11-05 15:50:09 +05:30 · 2020-11-02 17:33:21 +01:00 · 2020-11-02 17:32:25 +01:00
41 changed files with 356 additions and 630 deletions
--- a/bbf/Makefile
+++ b/bbf/Makefile
@@ -5,11 +5,11 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=libbbfdm
-PKG_VERSION:=3.9-2021-02-26
+PKG_VERSION:=2.7-2020-10-23
 PKG_FIXUP:=autoreconf
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/bbf.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=0ddc89bda0a9ad254f6d41992cfb1b827e8c62c7
+PKG_SOURCE_VERSION:=143afb5f2baf5fddd17160b6cf77657b422d2d44
 PKG_RELEASE=$(PKG_SOURCE_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
@@ -102,14 +102,19 @@ endef
 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
+	$(INSTALL_DIR) $(1)/etc/bbfdm
+	$(INSTALL_DIR) $(1)/etc/bbfdm/json
 	$(INSTALL_DIR) $(1)/usr/lib/bbfdm
 endef

+define Package/libbbfdm/prerm
+	#!/bin/sh
+	rm -rf /etc/bbfdm/*
+	exit 0
+endef
+
 define Build/InstallDev
 	$(INSTALL_DIR) $(1)/usr/include/libbbfdm
 	$(INSTALL_DIR) $(1)/usr/include/libbbf_api
--- a/bulkdata/src/datamodel.c
+++ b/bulkdata/src/datamodel.c
@@ -118,7 +118,7 @@ static int addObjBulkDataProfile(char *refparam, struct dmctx *ctx, void *data,
 	last_inst = get_last_instance_bbfdm("dmmap_bulkdata", "profile", "profile_instance");
 	snprintf(prof_id, sizeof(prof_id), "%d", last_inst ? atoi(last_inst)+1 : 1);

-	dmuci_add_section_and_rename("bulkdata", "profile", &profile, &value);
+	dmuci_add_section("bulkdata", "profile", &profile, &value);
 	dmuci_set_value_by_section(profile, "profile_id", prof_id);
 	dmuci_set_value_by_section(profile, "enable", "0");
 	dmuci_set_value_by_section(profile, "nbre_of_retained_failed_reports", "0");
@@ -228,7 +228,7 @@ static int addObjBulkDataProfileParameter(char *refparam, struct dmctx *ctx, voi

 	last_inst = get_last_instance_lev2_bbfdm_dmmap_opt("dmmap_bulkdata", "profile_parameter", "parameter_instance", "profile_id", prev_profile_id);

-	dmuci_add_section_and_rename("bulkdata", "profile_parameter", &profile_parameter, &value);
+	dmuci_add_section("bulkdata", "profile_parameter", &profile_parameter, &value);
 	dmuci_set_value_by_section(profile_parameter, "profile_id", prev_profile_id);

 	browse_args.option = "profile_id";
@@ -282,7 +282,7 @@ static int addObjBulkDataProfileHTTPRequestURIParameter(char *refparam, struct d

 	last_inst = get_last_instance_lev2_bbfdm_dmmap_opt("dmmap_bulkdata", "profile_http_request_uri_parameter", "requesturiparameter_instance", "profile_id", prev_profile_id);

-	dmuci_add_section_and_rename("bulkdata", "profile_http_request_uri_parameter", &profile_http_request_uri_parameter, &value);
+	dmuci_add_section("bulkdata", "profile_http_request_uri_parameter", &profile_http_request_uri_parameter, &value);
 	dmuci_set_value_by_section(profile_http_request_uri_parameter, "profile_id", prev_profile_id);

 	browse_args.option = "profile_id";
@@ -332,7 +332,7 @@ static int delObjBulkDataProfileHTTPRequestURIParameter(char *refparam, struct d
 /*#Device.BulkData.Enable!UCI:bulkdata/bulkdata,bulkdata/enable*/
 static int get_BulkData_Enable(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value)
 {
-	dmuci_get_option_value_string("bulkdata", "bulkdata", "enable", value);
+	*value = dmuci_get_option_value_fallback_def("bulkdata", "bulkdata", "enable", "1");
 	return 0;
 }

@@ -416,7 +416,7 @@ static int get_BulkData_ProfileNumberOfEntries(char *refparam, struct dmctx *ctx
 /*#Device.BulkData.Profile.{i}.Enable!UCI:bulkdata/profile,@i-1/enable*/
 static int get_BulkDataProfile_Enable(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value)
 {
-	dmuci_get_value_by_section_string((struct uci_section *)data, "enable", value);
+	*value = dmuci_get_value_by_section_fallback_def((struct uci_section *)data, "enable", "1");
 	return 0;
 }

@@ -563,7 +563,7 @@ static int set_BulkDataProfile_EncodingType(char *refparam, struct dmctx *ctx, v
 /*#Device.BulkData.Profile.{i}.ReportingInterval!UCI:bulkdata/profile,@i-1/reporting_interval*/
 static int get_BulkDataProfile_ReportingInterval(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value)
 {
-	dmuci_get_value_by_section_string((struct uci_section *)data, "reporting_interval", value);
+	*value = dmuci_get_value_by_section_fallback_def((struct uci_section *)data, "reporting_interval", "86400");
 	return 0;
 }

@@ -1001,7 +1001,7 @@ static int set_BulkDataProfileHTTP_Method(char *refparam, struct dmctx *ctx, voi
 /*#Device.BulkData.Profile.{i}.HTTP.UseDateHeader!UCI:bulkdata/profile,@i-1/http_use_date_header*/
 static int get_BulkDataProfileHTTP_UseDateHeader(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value)
 {
-	dmuci_get_value_by_section_string((struct uci_section *)data, "http_use_date_header", value);
+	*value = dmuci_get_value_by_section_fallback_def((struct uci_section *)data, "http_use_date_header", "1");
 	return 0;
 }

@@ -1025,7 +1025,7 @@ static int set_BulkDataProfileHTTP_UseDateHeader(char *refparam, struct dmctx *c
 /*#Device.BulkData.Profile.{i}.HTTP.RetryEnable!UCI:bulkdata/profile,@i-1/http_retry_enable*/
 static int get_BulkDataProfileHTTP_RetryEnable(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value)
 {
-	dmuci_get_value_by_section_string((struct uci_section *)data, "http_retry_enable", value);
+	*value = dmuci_get_value_by_section_fallback_def((struct uci_section *)data, "http_retry_enable", "1");
 	return 0;
 }

@@ -1049,7 +1049,7 @@ static int set_BulkDataProfileHTTP_RetryEnable(char *refparam, struct dmctx *ctx
 /*#Device.BulkData.Profile.{i}.HTTP.RetryMinimumWaitInterval!UCI:bulkdata/profile,@i-1/http_retry_minimum_wait_interval*/
 static int get_BulkDataProfileHTTP_RetryMinimumWaitInterval(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value)
 {
-	dmuci_get_value_by_section_string((struct uci_section *)data, "http_retry_minimum_wait_interval", value);
+	*value = dmuci_get_value_by_section_fallback_def((struct uci_section *)data, "http_retry_minimum_wait_interval", "5");
 	return 0;
 }

@@ -1070,7 +1070,7 @@ static int set_BulkDataProfileHTTP_RetryMinimumWaitInterval(char *refparam, stru
 /*#Device.BulkData.Profile.{i}.HTTP.RetryIntervalMultiplier!UCI:bulkdata/profile,@i-1/http_retry_interval_multiplier*/
 static int get_BulkDataProfileHTTP_RetryIntervalMultiplier(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value)
 {
-	dmuci_get_value_by_section_string((struct uci_section *)data, "http_retry_interval_multiplier", value);
+	*value = dmuci_get_value_by_section_fallback_def((struct uci_section *)data, "http_retry_interval_multiplier", "2000");
 	return 0;
 }

@@ -1109,7 +1109,7 @@ static int get_BulkDataProfileHTTP_RequestURIParameterNumberOfEntries(char *refp
 /*#Device.BulkData.Profile.{i}.HTTP.PersistAcrossReboot!UCI:bulkdata/profile,@i-1/http_persist_across_reboot*/
 static int get_BulkDataProfileHTTP_PersistAcrossReboot(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value)
 {
-	dmuci_get_value_by_section_string((struct uci_section *)data, "http_persist_across_reboot", value);
+	*value = dmuci_get_value_by_section_fallback_def((struct uci_section *)data, "http_persist_across_reboot", "1");
 	return 0;
 }

@@ -1174,14 +1174,14 @@ static int set_BulkDataProfileHTTPRequestURIParameter_Reference(char *refparam,

 /* *** Device.BulkData. *** */
 DMOBJ tDeviceBulkDataObj[] = {
-/* OBJ, permission, addobj, delobj, checkdep, browseinstobj, forced_inform, notification, nextdynamicobj, nextobj, leaf, linker, bbfdm_type*/
+/* OBJ, permission, addobj, delobj, checkdep, browseinstobj, forced_inform, notification, nextdynamicobj, nextobj, leaf, linker, bbfdm_type, uniqueKeys*/
 {"BulkData", &DMREAD, NULL, NULL, NULL, NULL, NULL, NULL, NULL, tBulkDataObj, tBulkDataParams, NULL, BBFDM_BOTH},
 {0}
 };

 DMOBJ tBulkDataObj[] = {
-/* OBJ, permission, addobj, delobj, checkdep, browseinstobj, forced_inform, notification, nextdynamicobj, nextobj, leaf, linker, bbfdm_type*/
-{"Profile", &DMWRITE, addObjBulkDataProfile, delObjBulkDataProfile, NULL, browseBulkDataProfileInst, NULL, NULL, NULL, tBulkDataProfileObj, tBulkDataProfileParams, NULL, BBFDM_BOTH},
+/* OBJ, permission, addobj, delobj, checkdep, browseinstobj, forced_inform, notification, nextdynamicobj, nextobj, leaf, linker, bbfdm_type, uniqueKeys*/
+{"Profile", &DMWRITE, addObjBulkDataProfile, delObjBulkDataProfile, NULL, browseBulkDataProfileInst, NULL, NULL, NULL, tBulkDataProfileObj, tBulkDataProfileParams, NULL, BBFDM_BOTH, LIST_KEY{"Alias", NULL}},
 {0}
 };

@@ -1201,7 +1201,7 @@ DMLEAF tBulkDataParams[] = {

 /* *** Device.BulkData.Profile.{i}. *** */
 DMOBJ tBulkDataProfileObj[] = {
-/* OBJ, permission, addobj, delobj, checkdep, browseinstobj, forced_inform, notification, nextdynamicobj, nextobj, leaf, linker, bbfdm_type*/
+/* OBJ, permission, addobj, delobj, checkdep, browseinstobj, forced_inform, notification, nextdynamicobj, nextobj, leaf, linker, bbfdm_type, uniqueKeys*/
 {"Parameter", &DMWRITE, addObjBulkDataProfileParameter, delObjBulkDataProfileParameter, NULL, browseBulkDataProfileParameterInst, NULL, NULL, NULL, NULL, tBulkDataProfileParameterParams, NULL, BBFDM_BOTH},
 {"CSVEncoding", &DMREAD, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, tBulkDataProfileCSVEncodingParams, NULL, BBFDM_BOTH},
 {"JSONEncoding", &DMREAD, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, tBulkDataProfileJSONEncodingParams, NULL, BBFDM_BOTH},
@@ -1260,7 +1260,7 @@ DMLEAF tBulkDataProfileJSONEncodingParams[] = {

 /* *** Device.BulkData.Profile.{i}.HTTP. *** */
 DMOBJ tBulkDataProfileHTTPObj[] = {
-/* OBJ, permission, addobj, delobj, checkdep, browseinstobj, forced_inform, notification, nextdynamicobj, nextobj, leaf, linker, bbfdm_type*/
+/* OBJ, permission, addobj, delobj, checkdep, browseinstobj, forced_inform, notification, nextdynamicobj, nextobj, leaf, linker, bbfdm_type, uniqueKeys*/
 {"RequestURIParameter", &DMWRITE, addObjBulkDataProfileHTTPRequestURIParameter, delObjBulkDataProfileHTTPRequestURIParameter, NULL, browseBulkDataProfileHTTPRequestURIParameterInst, NULL, NULL, NULL, NULL, tBulkDataProfileHTTPRequestURIParameterParams, NULL, BBFDM_BOTH},
 {0}
 };
--- a/bulkdata/src/http.c
+++ b/bulkdata/src/http.c
@@ -48,7 +48,7 @@ static size_t http_get_response(void *buffer, size_t size, size_t rxed, char **m
 {
 	char *c;

-	if (asprintf(&c, "%s%.*s", *msg_in, size * rxed, (char *)buffer) == -1) {
+	if (asprintf(&c, "%s%.*s", *msg_in, (int) (size * rxed), (char *)buffer) == -1) {
 		FREE(*msg_in);
 		return -1;
 	}
--- a/dslmngr/Makefile
+++ b/dslmngr/Makefile
@@ -25,9 +25,7 @@ PKG_LICENSE_FILES:=LICENSE

 include $(INCLUDE_DIR)/package.mk

-ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_mips),y)
-  TARGET_PLATFORM=BROADCOM
-else ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_arm),y)
+ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_arm),y)
  TARGET_PLATFORM=BROADCOM
 else ifeq ($(CONFIG_TARGET_iopsys_ramips),y)
  TARGET_PLATFORM=MEDIATEK
--- a/easy-qos/Makefile
+++ b/easy-qos/Makefile
@@ -19,7 +19,7 @@ define Package/easy-qos
  SECTION:=net
  CATEGORY:=Network
  TITLE:=Easy QoS
-  DEPENDS:=@(TARGET_intel_mips||TARGET_iopsys_brcm63xx_arm||TARGET_iopsys_brcm63xx_mips)
+  DEPENDS:=@(TARGET_intel_mips||TARGET_iopsys_brcm63xx_arm)
 endef

 define Package/easy-qos/description
--- a/easy-soc-libs/Makefile
+++ b/easy-soc-libs/Makefile
@@ -7,13 +7,13 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=easy-soc-libs
-PKG_VERSION:=5.3.17
+PKG_VERSION:=5.3.14
 PKG_RELEASE:=1

 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=ecb53194e101cadecfc158eb459db4539dfecd7f
+PKG_SOURCE_VERSION:=33a3b440dd413dfa6febbc4d92d5a57cba9aee4d
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/easy-soc-libs.git
 PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@iopsys.eu>
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
@@ -57,24 +57,11 @@ define Package/libethernet
  DEPENDS+=+libnl +libnl-route +libeasy +TARGET_iopsys_ramips:swconfig
 endef

-ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_mips),y)
+ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_arm),y)
  TARGET_PLATFORM=BROADCOM
-  TARGET_CFLAGS +=-DIOPSYS_BROADCOM -DCONFIG_BCM963138 \
+  CHIP_ID=$(patsubst "%",%,$(CONFIG_BCM_CHIP_ID))
+  TARGET_CFLAGS +=-DIOPSYS_BROADCOM -DCHIP_$(CHIP_ID) -DCONFIG_BCM$(CHIP_ID) \
 	-I$(STAGING_DIR)/usr/include/bcm963xx/bcmdrivers/opensource/include/bcm963xx
-  KERNEL_DIR:=$(BUILD_DIR)/bcmkernel/bcm963xx
-else ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_arm),y)
-  TARGET_PLATFORM=BROADCOM
-  TARGET_CFLAGS +=-DIOPSYS_BROADCOM \
-	-I$(STAGING_DIR)/usr/include/bcm963xx/bcmdrivers/opensource/include/bcm963xx
-  ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_arm_panther),y)
-    TARGET_CFLAGS +=-DCONFIG_BCM96846
-  else ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_arm_tiger),y)
-    TARGET_CFLAGS +=-DCONFIG_BCM96858
-  else ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_arm_eagle),y)
-    TARGET_CFLAGS +=-DCONFIG_BCM963178
-  else
-    TARGET_CFLAGS +=-DCONFIG_BCM963138
-  endif
 else ifeq ($(CONFIG_TARGET_iopsys_ramips),y)
  TARGET_PLATFORM=MEDIATEK
  TARGET_CFLAGS +=-DIOPSYS_MEDIATEK
--- a/endptmngr/Makefile
+++ b/endptmngr/Makefile
@@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk

 PKG_RELEASE:=1
 PKG_VERSION:=0.3
-PKG_SOURCE_VERSION:=0a2b7dd6f58eb0dc5255fee4ee3d776524b64fe9
+PKG_SOURCE_VERSION:=34ae1996beda98691d779e49f231bd662fc87cda
 PKG_LICENSE:=MIT
 PKG_LICENSE_FILES:=LICENSE

--- a/icwmp/Makefile
+++ b/icwmp/Makefile
@@ -8,11 +8,11 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=icwmp
-PKG_VERSION:=5.0-2020-11-26
+PKG_VERSION:=5.2-2020-10-19
 PKG_FIXUP:=autoreconf
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/icwmp.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=772cafc55b332555ab1c73180ccd420054823df5
+PKG_SOURCE_VERSION:=47934d448f59cd8facec3bab0e2ed9e6f4e492db
 PKG_RELEASE=$(PKG_SOURCE_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
@@ -146,4 +146,4 @@ define Package/$(PKG_NAME)/prerm
 endef

 $(eval $(call BuildPackage,$(PKG_NAME)))
-$(eval $(call BuildPackage,icwmp-tr098))
+$(eval $(call BuildPackage,icwmp-tr098))
--- a/icwmp/files/etc/config/cwmp
+++ b/icwmp/files/etc/config/cwmp
@@ -38,8 +38,8 @@ config cpe 'cpe'
 	option notification '1'
 	option datamodel 'tr181'
 	option exec_download '0'
-	option periodic_notify_enable '1'
-	option periodic_notify_interval '10'
+	option notify_periodic_enable '1'
+	option notify_period '10'
 	
 config lwn 'lwn'
 	option enable '1'
--- a/icwmp/files/etc/init.d/icwmpd
+++ b/icwmp/files/etc/init.d/icwmpd
@@ -220,5 +220,10 @@ notify() {

 service_triggers() {
 	procd_add_config_trigger "config.change" "cwmp"  /etc/init.d/icwmpd reload
+        if [ "$(uci -q get cwmp.cpe.notification)" == "1" ]; then
+		for conf in $(ls /etc/config/); do
+			procd_add_config_trigger "config.change" "$conf" /etc/init.d/icwmpd notify
+		done
+	fi
 }

--- a/icwmp/files/etc/uci-defaults/85-cwmp-set-userid
+++ b/icwmp/files/etc/uci-defaults/85-cwmp-set-userid
@@ -1,3 +1,4 @@
+
 # Copy defaults by the factory to the cwmp UCI user section.


@@ -14,19 +15,10 @@ mac=$(printf "%12.12X" $((0x$baseMac)))
 # Get system serial number.
 serial=$(db -q get hw.board.serial_number)

-# Get userid values
-acs_userid=$(uci -q get cwmp.acs.userid)
-cpe_userid=$(uci -q get cwmp.cpe.userid)
+uci -q batch <<-EOF
+	set cwmp.acs.userid="${mac:0:6}-${serial}"
+	set cwmp.cpe.userid="${mac:0:6}-${serial}"
+EOF

-# Only set if they are empty
-if [ -z "$acs_userid" ]
-then
-    uci -q set cwmp.acs.userid="${mac:0:6}-${serial}"
-fi
-
-if [ -z "$cpe_userid" ]
-then
-    uci -q set cwmp.cpe.userid="${mac:0:6}-${serial}"
-fi

 # No need for commit here, it is done by uci_apply_defaults().
--- a/ieee1905/Makefile
+++ b/ieee1905/Makefile
@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=ieee1905
-PKG_VERSION:=2.1.1
+PKG_VERSION:=2.0.30

 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=a0bcdb6eb791f5bebff4dc9024b99f51d00ed53b
+PKG_SOURCE_VERSION:=1a842eea52becc9b5ecb26549e855671443ee626
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/ieee1905.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
 endif
--- a/iop/config
+++ b/iop/config
@@ -7,9 +7,6 @@ CONFIG_PACKAGE_6in4=y
 CONFIG_PACKAGE_6rd=y
 CONFIG_PACKAGE_6to4=y
 CONFIG_PACKAGE_alsa-lib=y
-CONFIG_PACKAGE_atftp=m
-CONFIG_PACKAGE_atftpd=m
-CONFIG_PACKAGE_bulkdata=y
 CONFIG_PACKAGE_chat=y
 CONFIG_PACKAGE_comgt=y
 CONFIG_PACKAGE_comgt-directip=y
@@ -17,6 +14,8 @@ CONFIG_PACKAGE_comgt-ncm=y
 CONFIG_PACKAGE_ddns-scripts=y
 CONFIG_PACKAGE_ds-lite=y
 CONFIG_PACKAGE_ethtool=y
+CONFIG_PACKAGE_fatrace=y
+CONFIG_PACKAGE_gdb=m
 CONFIG_PACKAGE_getopt=y
 CONFIG_PACKAGE_glib2=y
 CONFIG_PACKAGE_icwmp=y
@@ -26,7 +25,7 @@ CONFIG_PACKAGE_map-topology=y
 CONFIG_PACKAGE_wfadatad=y
 CONFIG_PACKAGE_imonitor=m
 CONFIG_PACKAGE_inbd=y
-CONFIG_PACKAGE_iopupgrade=m
+CONFIG_PACKAGE_iopupgrade=y
 CONFIG_PACKAGE_ip-full=y
 CONFIG_PACKAGE_iperf3=y
 CONFIG_PACKAGE_ipset=y
@@ -49,7 +48,6 @@ CONFIG_PACKAGE_juci-theme-iopsys=y
 CONFIG_PACKAGE_libdaemon=y
 CONFIG_PACKAGE_libgmp=y
 CONFIG_PACKAGE_libreadline=y
-CONFIG_PACKAGE_libreswan=m
 CONFIG_PACKAGE_libwifi=y
 CONFIG_PACKAGE_lscpu=y
 CONFIG_PACKAGE_map=y
@@ -84,8 +82,8 @@ CONFIG_PACKAGE_relayd=y
 CONFIG_PACKAGE_resolveip=y
 CONFIG_PACKAGE_rpcd=y
 CONFIG_PACKAGE_rpcd-mod-rpcsys=y
-CONFIG_PACKAGE_rulengd=y
 CONFIG_PACKAGE_rsync=y
+CONFIG_PACKAGE_rulengd=y
 CONFIG_PACKAGE_strace=y
 CONFIG_PACKAGE_swmodd=m
 CONFIG_PACKAGE_tc=y
@@ -97,7 +95,6 @@ CONFIG_PACKAGE_uqmi=y
 CONFIG_PACKAGE_usb-modeswitch=y
 CONFIG_PACKAGE_usbreset=y
 CONFIG_PACKAGE_uspd=y
-CONFIG_PACKAGE_vsftpd-tls=m
 CONFIG_PACKAGE_wget=y
 CONFIG_PACKAGE_wwan=y
 CONFIG_PACKAGE_wifimngr=y
--- a/iop/iop.completion
+++ b/iop/iop.completion
@@ -35,7 +35,7 @@ _iop()
    iopcmds="bootstrap cfe_upgrade cfe_upgrade_latest extract_core \
             feeds_update genconfig generate_tarballs install_key \
             scp_changes setup_host ssh_install_key status \
-             update_package update_feed_branches ssh_upgrade"
+             update_package update_feed_branches ssh_upgrade smoketest"

    if [ $COMP_CWORD -eq 1 ] ; then

--- a/iop/scripts/feeds_update.sh
+++ b/iop/scripts/feeds_update.sh
@@ -32,7 +32,7 @@ function feeds_update {
    fi

    # targets need to be installed explicitly
-    targets="iopsys-brcm63xx-mips iopsys-brcm63xx-arm iopsys-ramips intel_mips iopsys-x86 iopsys-armvirt"
+    targets="iopsys-brcm63xx-arm iopsys-ramips intel_mips iopsys-x86 iopsys-armvirt iopsys-bcm27xx"
    for target in $targets
    do
 	rm -f target/linux/$target
--- a/iop/scripts/genconfig.sh
+++ b/iop/scripts/genconfig.sh
@@ -5,7 +5,7 @@ function genconfig {
 	export IMPORT=1
 	export SRCTREEOVERR=0
 	export FILEDIR="files/"
-	export THEMEDIR="themes"
+	export THEMEDIR="tmp/juci-themes"
 	CURRENT_CONFIG_FILE=".current_config_file"
 	export CONFIGPATH="package/feeds/iopsys/iop"
 	CUSTPATH="customerconfigs"
@@ -13,8 +13,8 @@ function genconfig {
 	export VERBOSE=0
 	export DEVELOPER=0
 	target="bogus"
-	config_path=""
-	brcm63xx_mips="target/linux/iopsys-brcm63xx-mips"
+	target_config_path=""
+	bcm27xx="target/linux/iopsys-bcm27xx"
 	brcm63xx_arm="target/linux/iopsys-brcm63xx-arm"
 	ramips="target/linux/iopsys-ramips"
 	intel_mips="target/linux/intel_mips"
@@ -103,14 +103,12 @@ function genconfig {

 			if [ $pfound -eq 1 ]; then
 				target="$(echo $TARGET | tr '-' '_')"
-				config_path="$targetpath/config"
+				target_config_path="$targetpath/config"
 			fi

 			return
 		fi

-		[ -e $brcm63xx_mips/genconfig ] &&
-			iopsys_brcm63xx_mips=$(cd $brcm63xx_mips; ./genconfig)
 		[ -e $brcm63xx_arm/genconfig ] &&
 			iopsys_brcm63xx_arm=$(cd $brcm63xx_arm; ./genconfig)
 		[ -e $ramips/genconfig ] &&
@@ -121,9 +119,11 @@ function genconfig {
 			iopsys_x86=$(cd $x86; ./genconfig)
 		[ -e $armvirt/genconfig ] &&
 			iopsys_armvirt=$(cd $armvirt; ./genconfig)
+		[ -e $bcm27xx/genconfig ] &&
+			iopsys_bcm27xx=$(cd $bcm27xx; ./genconfig)

 	    if [ "$profile" == "LIST" ]; then
-			for list in iopsys_brcm63xx_mips iopsys_brcm63xx_arm iopsys_ramips iopsys_intel_mips iopsys_x86 iopsys_armvirt; do
+			for list in iopsys_brcm63xx_arm iopsys_ramips iopsys_intel_mips iopsys_x86 iopsys_armvirt iopsys_bcm27xx; do
 				echo "$list based boards:"
 				for b in ${!list}; do
 					echo -e "\t$b"
@@ -132,18 +132,10 @@ function genconfig {
 			return
 	    fi

-	    for p in $iopsys_brcm63xx_mips; do
-		if [ $p == $profile ]; then
-		    target="iopsys_brcm63xx_mips"
-			config_path="$brcm63xx_mips/config"
-		    return
-		fi
-	    done
-
 	    for p in $iopsys_brcm63xx_arm; do
 		if [ $p == $profile ]; then
 		    target="iopsys_brcm63xx_arm"
-			config_path="$brcm63xx_arm/config"
+			target_config_path="$brcm63xx_arm/config"
 		    return
 		fi
 	    done
@@ -151,7 +143,7 @@ function genconfig {
 	    for p in $iopsys_ramips; do
 		if [ $p == $profile ]; then
 		    target="iopsys_ramips"
-			config_path="$ramips/config"
+			target_config_path="$ramips/config"
 		    return
 		fi
 	    done
@@ -159,7 +151,7 @@ function genconfig {
 	    for p in $iopsys_intel_mips; do
 		if [ $p == $profile ]; then
 		    target="intel_mips"
-			config_path="$intel_mips/config"
+			target_config_path="$intel_mips/config"
 		    return
 		fi
 	    done
@@ -167,7 +159,7 @@ function genconfig {
 	    for p in $iopsys_x86; do
 		if [ $p == $profile ]; then
 		    target="iopsys_x86"
-			config_path="$x86/config"
+			target_config_path="$x86/config"
 		    return
 		fi
 	    done
@@ -175,7 +167,15 @@ function genconfig {
 	    for p in $iopsys_armvirt; do
 		if [ $p == $profile ]; then
 		    target="iopsys_armvirt"
-			config_path="$armvirt/config"
+			target_config_path="$armvirt/config"
+		    return
+		fi
+	    done
+
+	    for p in $iopsys_bcm27xx; do
+		if [ $p == $profile ]; then
+		    target="iopsys_bcm27xx"
+			target_config_path="$bcm27xx/config"
 		    return
 		fi
 	    done
@@ -339,11 +339,13 @@ function genconfig {
 		v "cp $CONFIGPATH/config .config"
 		cp $CONFIGPATH/config .config

-		if [ -f $config_path/config ]; then
-		    cat $config_path/config >> .config
+		if [ -f $target_config_path/config ]; then
+		    cat $target_config_path/config >> .config
+		    echo "" >> .config
 		fi
-		if [ -f $config_path/$BOARDTYPE/config ]; then
-		    cat $config_path/$BOARDTYPE/config >> .config
+		if [ -f $target_config_path/$BOARDTYPE/config ]; then
+		    cat $target_config_path/$BOARDTYPE/config >> .config
+		    echo "" >> .config
 		fi

 		#special handling for intel_mips/iopsys_ramips which use TARGET_DEVICES
@@ -360,6 +362,13 @@ function genconfig {
 			echo "CONFIG_TARGET_${target}=y" >> .config
 			echo "CONFIG_TARGET_${target}_${subtarget}=y" >> .config
 			echo "CONFIG_TARGET_${target}_${subtarget}_DEVICE_${BOARDTYPE}=y" >> .config
+		elif [ "$target" = "iopsys_bcm27xx" ]; then
+			subtarget="iopsys_bcm2711"
+			echo "CONFIG_TARGET_${target}=y" >> .config
+			echo "CONFIG_TARGET_${target}_${subtarget}=y" >> .config
+			echo "CONFIG_TARGET_MULTI_PROFILE=y" >> .config
+			echo "CONFIG_TARGET_PER_DEVICE_ROOTFS=y" >> .config
+			echo "CONFIG_TARGET_DEVICE_${target}_${subtarget}_DEVICE_${BOARDTYPE}=y" >> .config
 		else
 			echo "CONFIG_TARGET_${target}=y" >> .config
 			echo "CONFIG_TARGET_${target}_${BOARDTYPE}=y" >> .config
@@ -386,10 +395,12 @@ function genconfig {
 				if [ -e "$CUSTCONF/$CUSTOMER/common/common.diff" ]; then
 					v "Apply $CUSTCONF/$CUSTOMER/common/common.diff"
 					cat $CUSTCONF/$CUSTOMER/common/common.diff >> .config
+					echo "" >> .config
 				fi
 				if [ -e "$CUSTCONF/$CUSTOMER/$BOARDTYPE/$BOARDTYPE.diff" ]; then
 					v "Apply $CUSTCONF/$CUSTOMER/$BOARDTYPE/$BOARDTYPE.diff"
 					cat $CUSTCONF/$CUSTOMER/$BOARDTYPE/$BOARDTYPE.diff >> .config
+					echo "" >> .config
 				fi
 			done
 		fi
--- a/iop/scripts/genconfig_min.sh
+++ b/iop/scripts/genconfig_min.sh
@@ -13,7 +13,7 @@ function genconfig_min {
 	export DEVELOPER=0
 	target="bogus"
 	config_path=""
-	brcm63xx_mips="target/linux/iopsys-brcm63xx-mips"
+	bcm27xx="target/linux/iopsys-bcm27xx"
 	brcm63xx_arm="target/linux/iopsys-brcm63xx-arm"
 	ramips="target/linux/iopsys-ramips"
 	intel_mips="target/linux/intel_mips"
@@ -108,8 +108,6 @@ function genconfig_min {
 			return
 		fi

-		[ -e $brcm63xx_mips/genconfig ] &&
-			iopsys_brcm63xx_mips=$(cd $brcm63xx_mips; ./genconfig)
 		[ -e $brcm63xx_arm/genconfig ] &&
 			iopsys_brcm63xx_arm=$(cd $brcm63xx_arm; ./genconfig)
 		[ -e $ramips/genconfig ] &&
@@ -120,9 +118,11 @@ function genconfig_min {
 			iopsys_x86=$(cd $x86; ./genconfig)
 		[ -e $armvirt/genconfig ] &&
 			iopsys_armvirt=$(cd $armvirt; ./genconfig)
+		[ -e $bcm27xx/genconfig ] &&
+			iopsys_bcm27xx=$(cd $bcm27xx; ./genconfig)

 	    if [ "$profile" == "LIST" ]; then
-			for list in iopsys_brcm63xx_mips iopsys_brcm63xx_arm iopsys_ramips iopsys_intel_mips iopsys_x86 iopsys_armvirt; do
+			for list in iopsys_brcm63xx_arm iopsys_ramips iopsys_intel_mips iopsys_x86 iopsys_armvirt iopsys_bcm27xx; do
 				echo "$list based boards:"
 				for b in ${!list}; do
 					echo -e "\t$b"
@@ -131,14 +131,6 @@ function genconfig_min {
 			return
 	    fi

-	    for p in $iopsys_brcm63xx_mips; do
-		if [ $p == $profile ]; then
-		    target="iopsys_brcm63xx_mips"
-			config_path="$brcm63xx_mips/config"
-		    return
-		fi
-	    done
-
 	    for p in $iopsys_brcm63xx_arm; do
 		if [ $p == $profile ]; then
 		    target="iopsys_brcm63xx_arm"
@@ -179,6 +171,14 @@ function genconfig_min {
 		fi
 	    done

+	    for p in $iopsys_bcm27xx; do
+		if [ $p == $profile ]; then
+		    target="iopsys_bcm27xx"
+		        config_path="$bcm27xx/config"
+		    return
+		fi
+	    done
+
 	}

 	git remote -v | grep -q http || {
@@ -337,6 +337,14 @@ function genconfig_min {
 			echo "CONFIG_TARGET_${target}=y" >> .config
 			echo "CONFIG_TARGET_${target}_${subtarget}=y" >> .config
 			echo "CONFIG_TARGET_${target}_${subtarget}_DEVICE_${BOARDTYPE}=y" >> .config
+		elif [ "$target" = "iopsys_bcm27xx" ]; then
+			subtarget="iopsys_bcm2711"
+                        echo "CONFIG_TARGET_${target}=y" >> .config
+                        echo "CONFIG_TARGET_${target}_${subtarget}=y" >> .config
+                        echo "CONFIG_TARGET_MULTI_PROFILE=y" >> .config
+                        echo "CONFIG_TARGET_PER_DEVICE_ROOTFS=y" >> .config
+                        device=$(echo $BOARDTYPE | tr a-z A-Z)
+                        echo "CONFIG_TARGET_DEVICE_${target}_${subtarget}_DEVICE_${BOARDTYPE}=y" >> .config
 		else
 			echo "CONFIG_TARGET_${target}=y" >> .config
 			echo "CONFIG_TARGET_${target}_${BOARDTYPE}=y" >> .config
--- a/iop/scripts/iopupgrade.sh
+++ b/iop/scripts/iopupgrade.sh
@@ -230,7 +230,7 @@ function ssh_upgrade {
    upd_fw_base=""
    upd_fw=""
    upd_host="192.168.1.1"
-    upd_sysupgrade=0
+    upd_sysupgrade=1
    do_dialog=0

    while getopts "f:hnxt:iscb" opt; do
@@ -280,6 +280,14 @@ function ssh_upgrade {
 	set_config_string CONFIG_TARGET_BOARD
 	firmwares=$(cd bin/targets/$CONFIG_TARGET_BOARD/generic/; ls -t *[0-9].y[3])

+	# if target uses pkgtb
+	if [ -z "$firmwares"]
+	then
+	    # pkgtb files can not be streamed so copy over the file witch scp
+	    use_scp=1
+	    firmwares=$(cd bin/targets/$CONFIG_TARGET_BOARD/generic/; ls -t last.pkgtb)
+	fi
+
 	for upd_fw_base in $firmwares
 	do
 	    #echo "firmware $upd_fw"
@@ -313,10 +321,20 @@ function ssh_upgrade {
 	[ $upd_forceboot  -eq 1 ] && extra_args="$extra_args -b"

 	file_size_kb=`du -k "$upd_fw" | cut -f1`
-	cat $upd_fw | pv -s ${file_size_kb}k | ssh root@$upd_host "iopu $extra_args"
+	if [ "$use_scp" == "1" ]
+	then
+	    scp $upd_fw root@$upd_host:/tmp/ &&
+		ssh -o ConnectTimeout=60 root@$upd_host "iopu $extra_arg -f /tmp/$upd_fw_base"
+	else
+	    cat $upd_fw | pv -s ${file_size_kb}k | ssh root@$upd_host "iopu $extra_args"
+	fi
    else
+	extra_args=""
+	[ $upd_noreboot   -eq 1 ] && extra_args="$extra_args -d"
+	[ $upd_keepconf   -eq 0 ] && extra_args="$extra_args -n"
+
 	scp $upd_fw root@$upd_host:/tmp/ &&
-	    ssh -o ConnectTimeout=60 root@$upd_host "sysupgrade -v $3 /tmp/$upd_fw_base" &&
+	    ssh -o ConnectTimeout=60 root@$upd_host "sysupgrade -v $extra_args /tmp/$upd_fw_base" &&
 	    echo "sysupgrade done!"
    fi
 }
--- a/iop/scripts/scp_changes.sh
+++ b/iop/scripts/scp_changes.sh
@@ -1,70 +0,0 @@
-# this is a developer helper script to SCP changed files to remote host
-
-ROOT=build_dir/target-mips_uClibc-0.9.33.2/root-iopsys-brcm63xx-mips/
-ROOT_OLD=tmp/root_old/
-ROOT_TMP=tmp/root_tmp/
-
-function scp_changes_reset {
-	{ cd `dirname $0`
-		rm -rf "$ROOT_OLD"
-		mkdir -p "$ROOT_OLD"
-		cp -a "$ROOT"* "$ROOT_OLD"
-	}
-}
-
-function scp_changes {
-	if [ -z "$1" ] ; then
-		echo "usage: $0 scp_changes <host/-r(eset)/-p(retend)>"
-		echo "Error: host required"
-		exit 1
-	fi
-	{ cd `dirname $0`
-		if [ ! -d $ROOT ]; then
-			echo "$ROOT does not exist"
-			echo "please build the project first"
-			exit 1;
-		fi
-		if [ "$1" = "-r" ]; then
-			echo "reset changes"
-			scp_changes_reset
-			exit 0
-		fi
-		if [ ! -d $ROOT_OLD ]; then
-			echo "$ROOT_OLD does not exist"
-			echo "you didn't store state of previous buildroot"
-			#echo "please run ./scp_changes_reset.sh"
-			echo "doing it now"
-			scp_changes_reset
-			exit 1;
-		fi
-		FILES=`diff -rq "$ROOT" "$ROOT_OLD" 2>&1 | sed -ne "s?^Files .* and $ROOT_OLD\\(.*\\) differ?\\1?p" -ne "s?^Only in $ROOT\\(.*\\): \\(.*\\)?\\1/\\2?p"`
-		if [ "$1" = "-p" ]; then
-			echo "files that would be copied:"
-			echo $FILES
-			exit 0
-		fi
-		for f in $FILES
-		do
-			mkdir -p "$ROOT_TMP`dirname $f`"
-			cp -af "$ROOT$f" "$ROOT_TMP$f"
-		done
-		if [ -d "$ROOT_TMP" ]; then
-			echo "scp changed files to $1"
-			pushd "$ROOT_TMP" 2>&1 >/dev/null
-			scp -r * root@$1:/
-			RETVAL=$?
-			popd 2>&1 >/dev/null
-			rm -rf "$ROOT_TMP"
-			if [ "$RETVAL" -eq 0 ]; then
-				scp_changes_reset
-			else
-				echo "scp error"
-				exit $RETVAL
-			fi
-		else
-			echo "no change"
-		fi
-	}
-}
-
-register_command "scp_changes" "<host/-r(eset)/-p(retend)>  SCP only changed files to device"
--- a/iop/scripts/smoketest.sh
+++ b/iop/scripts/smoketest.sh
@@ -0,0 +1,73 @@
+
+# Shorthand command for doing a HIL runtime smoketest on the
+# latest built image. Does the image boot up correctly?
+# More info here:
+# https://dev.iopsys.eu/iopsys/iopsys-taas
+
+
+function smoketest {
+	local image app
+
+	# Path to TaaS binarys. Try some likely ones.
+	if ! which taas-smoketest >/dev/null; then
+		PATH="${PATH}:${PWD}/../iopsys-taas/bin"
+		PATH="${PATH}:${PWD}/../taas/bin"
+		PATH="${PATH}:${HOME}/iopsys-taas/bin"
+		PATH="${PATH}:${HOME}/taas/bin"
+		PATH="${PATH}:${HOME}/bin"
+		PATH="${PATH}:/opt/iopsys-taas/bin"
+		PATH="${PATH}:/opt/taas/bin"
+	fi
+
+	if ! which taas-smoketest >/dev/null; then
+		echo "Error; missing command \"taas-smoketest\". Install it with:"
+		echo "git clone git@dev.iopsys.eu:iopsys/iopsys-taas.git ../iopsys-taas"
+		exit 1
+	fi
+
+	# Prerequisites?
+	for app in expect socat timeout stdbuf bash env head strings \
+			tee cut tr grep curl ssh; do
+		if ! which $app >/dev/null; then
+			echo "Error; missing command \"$app\""
+			echo "Install it from your Linux distro!"
+			exit 1
+		fi
+	done
+
+	# Find the default latest image (.y3 or FIT).
+	for image in bin/targets/iopsys-*/generic/last.y3 \
+			bin/targets/iopsys-*/generic/last.pkgtb; do
+		[ -s "$image" ] || continue
+
+		# Convert Iopsys target name to the TaaS product name format.
+		product=$(grep CONFIG_TARGET_PROFILE .config | \
+			tr -s "=\"" " " | cut -d " " -f 2)
+		case "$product" in
+			smarthub3)
+				product="SmartHub3a"
+				;;
+			dg400prime|eg400)
+				product=$(echo -n "$product" | tr [[:lower:]] [[:upper:]])
+				;;
+			*)
+				product=""
+				;;
+		esac
+
+		if [ -n "$product" ]; then
+			taas-smoketest "$image" "$product" || exit
+			echo "Smoketest OK"
+		else
+			echo "Unsupported target; skipping smoketest."
+		fi
+
+		exit 0
+	done
+
+	echo "No image found"
+	exit 1
+}
+
+register_command "smoketest" "Write image to a device in the lab and check if it boots up."
+
--- a/iop/scripts/taas.sh
+++ b/iop/scripts/taas.sh
@@ -1,95 +0,0 @@
-
-# Shorthand command for doing a HIL runtime smoketest on the
-# latest built image. Does the image boot up correctly?
-# More info here:
-# https://dev.iopsys.eu/iopsys/iopsys-taas
-
-
-#--------------------------------------------------------------
-function taas-init() {
-	local f
-
-	# Path to TaaS binarys. Try some likely ones.
-	if ! which taas-smoketest >/dev/null; then
-		PATH="${PATH}:${PWD}/../iopsys-taas/bin"
-		PATH="${PATH}:${PWD}/../taas/bin"
-		PATH="${PATH}:${HOME}/iopsys-taas/bin"
-		PATH="${PATH}:${HOME}/taas/bin"
-		PATH="${PATH}:${HOME}/bin"
-		PATH="${PATH}:/opt/iopsys-taas/bin"
-		PATH="${PATH}:/opt/taas/bin"
-	fi
-
-	if ! which taas-smoketest >/dev/null; then
-		echo "Error; TaaS is missing! Install it with:"
-		echo "git clone git@dev.iopsys.eu:iopsys/iopsys-taas.git ../iopsys-taas"
-		exit 1
-	fi
-
-	# NAND erase block size.
-	nandBlkSz=$(grep CONFIG_TARGET_NAND_BLOCKSZ .config | \
-		tr -s "=\"" " " | cut -d " " -f 2)
-	nandBlkSz=$((nandBlkSz / 1024))
-
-	# Create a list of all images which might be of use.
-	for f in ${PWD}/bin/targets/iopsys-*/generic/last.* \
-			${PWD}/build_dir/target-arm*/bcmkernel/bcm963xx/targets/9*/bcm*_linux_raw_image_${nandBlkSz}.bin; do
-		[[ -s "$f" ]] && images+=("$f")
-	done
-
-	# Convert Iopsys target name to the TaaS product name format
-	# according to what is available in the remote lab for HIL.
-	# Also find a suitable image.
-	product=$(grep CONFIG_TARGET_PROFILE .config | \
-		tr -s "=\"" " " | cut -d " " -f 2) || exit
-	case "$product" in
-		smarthub3)
-			export product="SmartHub3a"
-			;;
-		dg400prime|eg400|ex600)
-			export product=$(echo -n "$product" | tr [[:lower:]] [[:upper:]])
-			;;
-		*)
-			echo "Unsupported target; skipping!"
-			exit 0
-			;;
-	esac
-
-	if [[ ${#images[@]} -eq 0 ]]; then
-		echo "No image found"
-		exit 1
-	fi
-}
-
-
-
-#--------------------------------------------------------------
-function taas-smoketest {
-	declare -a images
-
-	taas-init || return
-	echo "Testing a $product with ${images[@]}..."
-	command taas-smoketest "${images[@]}" "$product" "$@"
-}
-
-
-
-#--------------------------------------------------------------
-function taas-bootstrap {
-	declare -a images
-
-	if [[ -n "$1" ]]; then
-		taas-init || return
-		echo "Flashing $1..."
-		command taas-bootstrap "${images[@]}" "$@"
-	else
-		echo "Usage: ./iop taas-bootstrap dutX"
-		exit 1
-	fi
-}
-
-
-
-register_command "taas-bootstrap" "Write image to a remote lab device."
-register_command "taas-smoketest" "Write image to a remote lab device and test it."
-
--- a/iopupgrade/files/sbin/iopu
+++ b/iopupgrade/files/sbin/iopu
@@ -163,6 +163,7 @@ function usage {
    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 "	-f		Firmware file to use"
    echo "	-C \"command\"	Execute command in chroot env of other system"
 }

@@ -177,6 +178,64 @@ function newroot_exec {

 }

+function system_is_y_image {
+
+    # find out what rootfs volume is active.
+    cur_vol=$(get_flashbank_current)
+    upd_vol=$(get_flashbank_next)
+
+    # 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"
+
+    # prepare to match dsl.
+    function_call upd_conf_dsl
+
+    log "now starting writing data to flash with [ iopupgrade $cmdline -M "$cmdline_match" -u ubi0_$upd_ubi_id ]"
+    run_cleanup=1	# When we start to actually write data there might be some
+                        # things that need cleanup if we get an error/crash
+    if ! iopupgrade $cmdline -M "$cmdline_match" -u ubi0_$upd_ubi_id; then
+	log "iopupgrade program Failed"
+	exit 1
+    fi
+
+    log "Firmware programmed to flash."
+
+    # Force upgrade of boot loader
+    [ $upd_forceboot -eq 1 ] && chroot_cmdline="$chroot_cmdline -b"
+
+    if [ $upd_keepconfig -eq 1 ]; then
+	log "Transfering configuration to new system."
+	chroot_cmdline="$chroot_cmdline -c"
+    fi
+
+    mount_newroot
+    if ! chroot /tmp/newroot_overlay /sbin/iopu_chroot $chroot_cmdline; then
+	log "Configuration migration failed!"
+	exit 1
+    fi
+    umount_newroot
+
+    log "New firmware fully installed."
+    run_cleanup=0
+
+
+    # Now make sure that we actually boot the new system on the next reboot
+    upd_finnish
+
+}
+
+function system_is_FIT_image {
+
+    # prepare to match dsl.
+    #function_call upd_conf_dsl
+
+    #here we write data 
+    bcm_flasher $firmware_file
+    bcm_bootstate 1
+    log "Firmware programmed to flash."
+}
+
 ###############################################################################

 # just one instance
@@ -194,7 +253,7 @@ trap ctrl_c INT
 trap timeout SIGALRM
 trap sig_pipe SIGPIPE

-while getopts "nrxbhcC:" opt; do
+while getopts "nrxbhcC:f:" opt; do
    case $opt in
 	n)
 	    upd_noreboot=1
@@ -216,6 +275,9 @@ while getopts "nrxbhcC:" opt; do
 	    newroot_exec "${OPTARG}"
 	    exit
 	    ;;
+	f)
+	    firmware_file="${OPTARG}"
+	    ;;
 	h)
 	    usage
 	    exit 1
@@ -235,59 +297,18 @@ log "Firmware upgrade started"
 # Should board name be checked
 if [ $upd_forceimage -eq 0 ]
 then
-   board=$(db get hw.board.iopVerBoard)
+   board=$(db get hw.board.model_name)
   cmdline_match="board=$board"
 fi

-# find out what rootfs volume is active. 
-cur_vol=$(get_flashbank_current)
-upd_vol=$(get_flashbank_next)
-
-# 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"
-
-# prepare to match dsl.
-function_call upd_conf_dsl
-
-# prepare to update CFE if it exists
-function_call upd_conf_cfe
-
-# prepare to update kernel if it is stored in MTD/JFFS2 
-function_call upd_conf_kernel
-
-log "now starting writing data to flash with [ iopupgrade $cmdline -M "$cmdline_match" -u ubi0_$upd_ubi_id ]"
-run_cleanup=1	# When we start to actually write data there might be some
-		# things that need cleanup if we get an error/crash
-if ! iopupgrade $cmdline -M "$cmdline_match" -u ubi0_$upd_ubi_id; then
-	log "iopupgrade program Failed"
-	exit 1
+# BUG: should probably read a config file.
+if [ -f /proc/nvram/boardid ]
+then
+    system_is_FIT_image
+else
+    system_is_y_image
 fi

-log "Firmware programmed to flash."
-
-# Force upgrade of boot loader
-[ $upd_forceboot -eq 1 ] && chroot_cmdline="$chroot_cmdline -b"
-
-if [ $upd_keepconfig -eq 1 ]; then
-	log "Transfering configuration to new system."
-	chroot_cmdline="$chroot_cmdline -c"
-fi
-
-mount_newroot
-if ! chroot /tmp/newroot_overlay /sbin/iopu_chroot $chroot_cmdline; then
-	log "Configuration migration failed!"
-	exit 1
-fi
-umount_newroot
-
-log "New firmware fully installed."
-run_cleanup=0
-
-
-# Now make sure that we actually boot the new system on the next reboot
-upd_finnish
-
 # spawn the reboot to a subshell to allow the main program to quit before reset
 # to avoid any hanged network connection like ssh
 if [ $upd_noreboot -eq 0 ]
--- a/map-1905/Makefile
+++ b/map-1905/Makefile
@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=map-1905
-PKG_VERSION:=0.0.13
+PKG_VERSION:=0.0.14

 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=31e30c589cb2a522fb66261640ff1a5f8ff58ac4
+PKG_SOURCE_VERSION:=745a773b15f35275df63a20e1be342d24b7e7534
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/map-1905.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
 endif
--- a/map-agent/Makefile
+++ b/map-agent/Makefile
@@ -5,9 +5,9 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=map-agent
-PKG_VERSION:=2.0.1
+PKG_VERSION:=2.0.3
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=362ddbaf2b9a5510c89b740fcc23d8425770da3d
+PKG_SOURCE_VERSION:=6bb0bba83e4c5189c93ed339ed061b86d7766f4d
 PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@iopsys.eu>

 PKG_LICENSE:=PROPRIETARY IOPSYS
@@ -23,7 +23,7 @@ define Package/map-agent
  SECTION:=utils
  CATEGORY:=Utilities
  TITLE:=WiFi multi-AP Agent (EasyMesh R2)
-  DEPENDS:=+libwifi +libuci +libubox +ubus
+  DEPENDS:=+libwifi +libuci +libubox +ubus +libmaputils
 endef

 define Package/map-agent/description
--- a/map-controller/Makefile
+++ b/map-controller/Makefile
@@ -5,9 +5,9 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=map-controller
-PKG_VERSION:=1.0.1
+PKG_VERSION:=1.0.3
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=3a55c1f41f0e2c233c28834dea0e881cd2cd0c22
+PKG_SOURCE_VERSION:=f1b50ed876f14347480e9e131ac6de76922e131a

 PKG_LICENSE:=PROPRIETARY IOPSYS
 PKG_LICENSE_FILES:=LICENSE
@@ -22,7 +22,7 @@ define Package/map-controller
  SECTION:=utils
  CATEGORY:=Utilities
  TITLE:=WiFi Multi-AP Controller (EasyMesh R2)
-  DEPENDS:=+libuci +libubox +ubus
+  DEPENDS:=+libuci +libubox +ubus +libmaputils
 endef

 define Package/map-controller/description
--- a/mcastmngr/files/lib/mcast/broadcom.sh
+++ b/mcastmngr/files/lib/mcast/broadcom.sh
@@ -253,11 +253,7 @@ config_mcast_proxy_interface() {
 		echo "${p1}-proxy-interfaces $proxdevs" >> $CONFFILE
 	fi

-	if [ -n "$proxdevs" ]; then
-		echo "${p1}-mcast-interfaces $proxdevs" >> $CONFFILE
-	else
-		echo "${p1}-mcast-interfaces $ethwan" >> $CONFFILE
-	fi
+	[ -n "$proxdevs" ] && echo "${p1}-mcast-interfaces $proxdevs" >> $CONFFILE
 }

 configure_mcpd_snooping() {
@@ -265,7 +261,7 @@ configure_mcpd_snooping() {
 	local exceptions
 	local filter_ip=""
 	local fast_leave=0
-
+	
 	# Configure snooping related params
 	if [ "$protocol" == "igmp" ]; then
 		config_snooping_common_params $protocol $igmp_s_version $igmp_s_robustness $igmp_s_mode
@@ -419,23 +415,6 @@ config_global_params() {
 setup_mcast_mode() {
 	# set the mode at chip to allow both tagged and untagged multicast forwarding
 	bs /b/c iptv lookup_method=group_ip_src_ip
-	bs b/c iptv lookup_miss_action=host
-
-	# redirect igmp and mld traffic to host so that mcpd is the only actor on it,
-	# linux snooping does not participate
-	local portorder="$(db -q get hw.board.ethernetPortOrder)"
-	local wanport="$(db -q get hw.board.ethernetWanPort)"
-	local i=0
-	for port in $portorder; do
-		if [ "$wanport" == "$port" ]; then
-			bdmf_shell -c `cat /var/bdmf_sh_id` -cmd /b/configure port/index=wan0 ingress_filter[igmp]={enabled=yes,action=host}
-			bdmf_shell -c `cat /var/bdmf_sh_id` -cmd /b/configure port/index=wan0 ingress_filter[mld]={enabled=yes,action=host}
-		else
-			bdmf_shell -c `cat /var/bdmf_sh_id` -cmd /b/configure port/index=lan$i ingress_filter[igmp]={enabled=yes,action=host}
-			bdmf_shell -c `cat /var/bdmf_sh_id` -cmd /b/configure port/index=lan$i ingress_filter[mld]={enabled=yes,action=host}
-			i=$(($i + 1))
-		fi
-	done
 }

 configure_mcast() {
--- a/obuspa/Makefile
+++ b/obuspa/Makefile
@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=obuspa
-PKG_VERSION:=2.0.22
+PKG_VERSION:=2.0.21

 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=06270b7a45b77d6d883eb244e6d854efce10f17f
+PKG_SOURCE_VERSION:=25b920c13160360de16300a8d04a068feb197c50
 PKG_SOURCE_URL:=https://dev.iopsys.eu/fork/obuspa.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
 endif
--- a/peripheral_manager/Makefile
+++ b/peripheral_manager/Makefile
@@ -51,7 +51,7 @@ TARGET_CFLAGS := \

 PERIPHERAL_OPTONS:=-DSELECT_BRCM_BOARD=0

-ifneq ($(CONFIG_TARGET_iopsys_brcm63xx_arm)$(CONFIG_TARGET_iopsys_brcm63xx_mips),)
+ifneq ($(CONFIG_TARGET_iopsys_brcm63xx_arm),)
 	PERIPHERAL_OPTONS:= -DSELECT_BRCM_BOARD=1
 endif

--- a/port-management/files/etc/uci-defaults/15-ports-config-generate
+++ b/port-management/files/etc/uci-defaults/15-ports-config-generate
@@ -37,4 +37,4 @@ populate_config(){
 	[ $DEBUG ] && cat /etc/config/ports
 }

-[ -f /sbin/db -a -f /lib/db/config/hw ] && populate_config
+[ -f /sbin/db -a -f /etc/board-db/config/hw ] && populate_config
--- a/qosmngr/files/etc/init.d/qos
+++ b/qosmngr/files/etc/init.d/qos
@@ -13,7 +13,7 @@ include /lib/qos

 start_service() {
 	if [ -f "/etc/config/qos" ]; then
-		reload_qos
+		ubus -S call qos reload
 	fi

 }
--- a/qosmngr/files/etc/uci-defaults/60-qos_queue_generate
+++ b/qosmngr/files/etc/uci-defaults/60-qos_queue_generate
@@ -24,17 +24,15 @@ generate_queue(){
 	fi

 	i=0
-	local total_q=$((${no_of_q##* } + 1))
        for i in $no_of_q; do
-		order=$((total_q - i))
 		uci add qos queue
 		uci rename qos.@queue[-1]="q_${i}_${ifname}"
 		uci set qos.@queue[-1].enable="1"
 		uci set qos.@queue[-1].ifname="$ifname"
-		uci set qos.@queue[-1].precedence="$order"
+		uci set qos.@queue[-1].precedence="$i"
 		uci set qos.@queue[-1].scheduling="SP"
 		uci set qos.@queue[-1].rate="0"
-		uci set qos.@queue[-1].burst_size="0"
+		uci set qos.@queue[-1].burst_size="-1"
 		uci set qos.@queue[-1].weight="1"
 	done

--- a/qosmngr/files/lib/qos/broadcom.sh
+++ b/qosmngr/files/lib/qos/broadcom.sh
@@ -6,141 +6,27 @@ BR_RULE=""
 is_bcm968=0

 POLICER_COUNT=0
-INTF_NAME=""
-Q_COUNT=0
-ITER=0
-PREV_ORDER=""
-CURR_ORDER=""
-MAX_ORDER=""

-# Function to handle a queue order and
-# update total number of queues
-handle_q_order() {
-	qid="$1" #queue section ID
-
-	config_get is_enable "$qid" "enable"
-
-	# No need to configure disabled queues
-	if [ $is_enable == '0' ]; then
-		return
-	fi
-
-	config_get ifname "$qid" "ifname"
-	# If ifname is empty that is good enough to break
-	if [ -z "$ifname" ];then
-		return
-	fi
-
-	# Create precedence file containing queue order per
-	# interface.
-	local precedence_file="/tmp/qos/$ifname/q_order"
-	local q_no=$(cat /tmp/qos/queue_stats/$ifname/q_idx)
-
-	config_get precedence "$qid" "precedence"
-	value=${precedence}_q${q_no}
-	echo $value >> $precedence_file
-
-	# Update the number of queues per interface.
-	q_no=$((q_no + 1))
-	echo $q_no > /tmp/qos/queue_stats/$ifname/q_idx
-}
-
-# Function to check if values are greater than (total number
-# of queue -1) and map them to corresponding value.
-configure_precedence_to_file() {
-	order="$1"
-	line="$2"
-	order_file="$3"
-
-	if [ $order == $PREV_ORDER ]; then
-		queue_id=${line#*_}
-		val=${CURR_ORDER}_${queue_id}
-		echo $val >> $order_file
-	else
-		PREV_ORDER=$order
-		queue_id=${line#*_}
-		val=${MAX_ORDER}_${queue_id}
-		echo $val >> $order_file
-		CURR_ORDER=$MAX_ORDER
-		MAX_ORDER=$((MAX_ORDER - 1))
-	fi
-}
-
-# Fucntion to map queue precedence per interface
-# ranging from 1-X to 0-(no of queues -1)
-map_queue_precedence() {
-	ifname="$1"
-	total_q=$(cat /tmp/qos/queue_stats/$ifname/q_idx)
-	q_no=`expr $total_q - 1`
-
-	MAX_ORDER=$q_no
-
-	local precedence_file="/tmp/qos/$ifname/q_precedence"
-	local order_file="/tmp/qos/$ifname/q_order"
-
-	sort -n -r -k1 $order_file >> $precedence_file
-	rm $order_file
-
-	while read line
-	do
-		order=${line%_*}
-		if [ $order  -gt $q_no ]; then
-			ITER=$((ITER + 1))
-			configure_precedence_to_file $order $line $order_file
-		else
-			if [ $ITER == '0' ]; then
-				echo $line >> $order_file
-			else
-				configure_precedence_to_file $order $line $order_file
-			fi
-		fi
-
-	done < $precedence_file
-}
-
-map_precedence() {
-	for interf in $(db -q get hw.board.ethernetPortOrder); do
-		map_queue_precedence $interf
-	done
-}
-
-# function to handle a queue section
+#function to handle a queue section
 handle_queue() {
 	qid="$1" #queue section ID

 	config_get is_enable "$qid" "enable"

-	# no need to configure disabled queues
+	#no need to configure disabled queues
 	if [ $is_enable == '0' ]; then
 		return
 	fi

 	config_get ifname "$qid" "ifname"
-	# if ifname is empty that is good enough to break
+	#if ifname is empty that is good enough to break
 	if [ -z "$ifname" ];then
 		return
 	fi

-	# This is to get the qid per interface.
-	if [ $INTF_NAME == $ifname ]; then
-		Q_COUNT=$((Q_COUNT + 1))
-	else
-		Q_COUNT='0'
-	fi
-
-	INTF_NAME=$ifname
-
-	local total_q=$(cat /tmp/qos/queue_stats/$ifname/q_idx)
-	q_no=`expr $total_q - 1` local
-	precedence_file="/tmp/qos/$ifname/q_order"
-
-	# TR181 suggests lower the precedence value higher the priority
-	# but in the chip its the opposite ie lower the value, lower
-	# the priority of queue on this chip. So we need to reverse the
-	# precedence value.
-	precedence="$(grep -i q${Q_COUNT} $precedence_file)"
-	precedence=${precedence%_*}
-	order=`expr $q_no - $precedence`
+	local q_no=$(cat /tmp/qos/queue_stats/$ifname/q_idx)
+	#lower the value, lower the priority of queue on this chip
+	config_get order "$qid" "precedence"

 	config_get sc_alg "$qid" "scheduling"
 	config_get wgt "$qid" "weight"
@@ -161,17 +47,12 @@ handle_queue() {
 		;;
 	esac

-	# ignore precedence value in case of WRR
-	if [ $salg -eq 2 ]; then
-	       order=0
-	fi
-
 	# Call tmctl which is a broadcomm command to configure queues on a port.
-	tmctl setqcfg --devtype 0 --if $ifname --qid $Q_COUNT --priority $order --qsize $qsize --weight $wgt --schedmode $salg --shapingrate $rate --burstsize $bs
+	tmctl setqcfg --devtype 0 --if $ifname --qid $q_no --priority $order --qsize $qsize --weight $wgt --schedmode $salg --shapingrate $rate --burstsize $bs

 	# In BCM968 chips, the counters for queues are read, on other model, its read and reset. So, to maintain counter
 	# value and uniform behaviour, we are storing counter value for each queue in files
-	local d_name="/tmp/qos/queue_stats/${ifname}/q_${Q_COUNT}"
+	local d_name="/tmp/qos/queue_stats/${ifname}/q_${q_no}"
 	mkdir $d_name
 	local f_name="$d_name/txPackets"
 	touch $f_name
@@ -186,6 +67,8 @@ handle_queue() {
 	touch $f_name
 	echo 0 > $f_name

+	q_no=$((q_no + 1))
+	echo $q_no > /tmp/qos/queue_stats/$ifname/q_idx
 }

 #function to handle a policer section
@@ -318,14 +201,6 @@ broute_append_rule() {
 	echo "ebtables -t broute -A qos $BR_RULE" >> /tmp/qos/classify.ebtables
 }

-broute_rule_enable_qosmap() {
-	if [ -n "$1" ]; then
-		BR_RULE="$BR_RULE -i $1 -j QOSMAP --dscp2q 1"
-	else
-		BR_RULE="$BR_RULE -j QOSMAP --dscp2q 1"
-	fi
-}
-
 handle_ebtables_rules() {
 	sid=$1
 	local is_l2_rule=0
@@ -337,7 +212,6 @@ handle_ebtables_rules() {
 	config_get src_if "$sid" "ifname"
 	config_get src_mac "$sid" "src_mac"
 	config_get dst_mac "$sid" "dst_mac"
-	config_get dscp_filter "$sid" "dscp_filter"
 	config_get pcp_check "$sid" "pcp_check"
 	config_get eth_type "$sid" "ethertype"
 	config_get vid "$sid" "vid_check"
@@ -376,10 +250,6 @@ handle_ebtables_rules() {
 		is_l2_rule=1
 	fi

-	if [ -n "$sdcp_filter" ]; then
-		is_l2_rule=1
-	fi
-
 	if [ -n "$eth_type" ]; then
 		broute_filter_on_ether_type $eth_type
 		is_l2_rule=1
@@ -454,59 +324,10 @@ handle_ebtables_rules() {
 		fi
 	fi

-	if [ -n "$dscp_filter" -a -n "$traffic_class" ]; then
-		# The parameter is called pbit but broadcom internally seems to
-		# treat this as traffic class, so not to be cofused with pbit in
-		# vlan header here, that is tackled by the dscp2pbit vlanctl
-		# which is part of the network config
-		tmctl setdscptopbit --dscp "$dscp_filter" --pbit "$traffic_class"
-
-		# If the target in the ebtables is mark, then, then mark value
-		# is the traffic class and there seems to be 1-o-1 mapping between
-		# traffic class and qid, for example, if packet is marked 3, then
-		# it is mapped to qid 3, following the same scheme here.
-		tmctl setpbittoq --pbit "$traffic_class" --qid "$traffic_class"
-		local wanport="$(db -q get hw.board.ethernetWanPort)"
-		local portorder="$(db -q get hw.board.ethernetPortOrder)"
-
-		if [ -n "$src_if" ]; then
-			# enable dscp2q mapping only for specified interfaces
-			if [ "$wanport+" == "$src_if" ]; then
-				# handling dowstream traffic scenario, src_if is
-				# always source interface in case of qos
-				for intf in $portorder; do
-					if [ "$wanport" == "$intf" ]; then
-						continue
-					fi
-
-					tmctl setpbittoq --devtype 0 --if "$intf"
-				done
-			else
-				# upstream traffic scenario
-				tmctl setpbittoq --devtype 0 --if "$wanport"
-			fi
-		else
-			# enable dscp to q mapping for all ports
-			for intf in $portorder; do
-				tmctl setpbittoq --devtype 0 --if "$intf"
-			done
-		fi
-
-		init_broute_rule
-		broute_rule_enable_qosmap $src_if
-		broute_append_rule
-		# dscp to traffic class mapping rule should not be used in tandem
-		# with other classification criteria, seprate rules should be added
-		# for each classification rule, hence we return from here in case
-		# the rules is a dscp to traffic class mapping rule
-		return
-	fi
-
 	if [ $is_l2_rule -eq 0 ]; then
 		return
 	fi

-	# Check and configure dscp to queue mapping
 	[ -n "$traffic_class" ] && broute_rule_set_traffic_class $traffic_class

 	[ -n "$BR_RULE" ] && broute_append_rule
@@ -708,16 +529,17 @@ assign_policer_to_port() {
 	local portorder="$(db -q get hw.board.ethernetPortOrder)"
 	local wanport="$(db -q get hw.board.ethernetWanPort)"

+	local i=0
 	for port in $portorder; do
 		if [ "$ifname" == "$port" ]; then
 			if [ "$wanport" == "$port" ]; then
-				bdmf_shell -c `cat /var/bdmf_sh_id` -cmd /b/configure port/index=wan0 ingress_rate_limit={traffic_types=8,policer={policer/dir=us,index=$pindex}}
+				bs /b/configure port/index=wan0 ingress_rate_limit={traffic_types=8,policer={policer/dir=us,index=$pindex}}
 			else
-				local i="${port: -1}"
-				bdmf_shell -c `cat /var/bdmf_sh_id` -cmd /b/configure port/index=lan$i ingress_rate_limit={traffic_types=8,policer={policer/dir=us,index=$pindex}}
+				bs /b/configure port/index=lan$i ingress_rate_limit={traffic_types=8,policer={policer/dir=us,index=$pindex}}
 			fi
 			break
 		fi
+		i=$((i + 1))
 	done
 }

@@ -828,28 +650,6 @@ configure_shaper() {
 	config_foreach handle_shaper shaper
 }

-deconfig_dscp_to_q_mapping() {
-	# reset dscp to pbit (read traffic class) map
-	i=0
-	while :
-	do
-		if [ $i -eq 64 ]; then
-			break
-		fi
-		# by default all are mapped to pbit (read traffic class) are mapped
-		# to 0
-		tmctl setdscptopbit --dscp "$i" --pbit 0
-		i=$((i + 1))
-	done
-
-	# reset pbittoq map
-	for i in 0 1 2 3 4 5 6 7; do
-		# by default all are mapped to q 0
-		tmctl setpbittoq --pbit "$i" --qid 0
-	done
-
-}
-
 configure_classify() {
 	#processing classify section
 	# First remove old files
@@ -866,8 +666,6 @@ configure_classify() {
 	#add flush chain rules
 	flush_chains

-	deconfig_dscp_to_q_mapping
-
 	# Load UCI file
 	config_load qos
 	config_foreach handle_classify classify
@@ -887,8 +685,6 @@ configure_queue() {
 	rm -rf /tmp/qos/queue_stats

 	for intf in $(db get hw.board.ethernetPortOrder); do
-		rm -rf /tmp/qos/$intf
-
 		mkdir -p /tmp/qos/queue_stats/$intf
 		touch /tmp/qos/queue_stats/$intf/q_idx
 		echo 0 > /tmp/qos/queue_stats/$intf/q_idx
@@ -896,16 +692,10 @@ configure_queue() {
 		for i in 0 1 2 3 4 5 6 7; do
 			tmctl delqcfg --devtype 0 --if $intf --qid $i &>/dev/null
 		done
-
-		mkdir -p /tmp/qos/$intf
-		touch /tmp/qos/$intf/q_order
-		touch /tmp/qos/$intf/q_precedence
 	done

 	# Load UCI file
 	config_load qos
-	config_foreach handle_q_order queue
-	map_precedence
 	config_foreach handle_queue queue
 }

--- a/questd/Makefile
+++ b/questd/Makefile
@@ -6,9 +6,9 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk

 PKG_NAME:=questd
-PKG_VERSION:=5.1.12
+PKG_VERSION:=5.2.1

-PKG_SOURCE_VERSION:=5de841c629d13bd8a5b90081343aaf5b75afc7c2
+PKG_SOURCE_VERSION:=d4ac29b535bf1ec0f58c4c9eea08ec7db08775d1
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/questd

--- a/rulengd/Makefile
+++ b/rulengd/Makefile
@@ -12,7 +12,7 @@ PKG_INSTALL:=1

 PKG_SOURCE_PROTO=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/rulengd.git
-PKG_SOURCE_VERSION:=d7a4d24e653ea0dc02679e24f8ec3c817aafdb37
+PKG_SOURCE_VERSION:=ad94ccdd82b22527ab32937ca1a2682030319ed3
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_SOURCE_SUBDIR:=${PKG_NAME}-${PKG_VERSION}
 PKG_INSTALL:=1
--- a/twamp/src/datamodel.c
+++ b/twamp/src/datamodel.c
@@ -103,7 +103,7 @@ static int delObjIPInterfaceTWAMPReflector(char *refparam, struct dmctx *ctx, vo

 static int get_IPInterfaceTWAMPReflector_Enable(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value)
 {
-	dmuci_get_value_by_section_string((struct uci_section *)data, "enable", value);
+	*value = dmuci_get_value_by_section_fallback_def((struct uci_section *)data, "enable", "1");
 	return 0;
 }

@@ -194,7 +194,7 @@ static int set_IPInterfaceTWAMPReflector_Alias(char *refparam, struct dmctx *ctx

 static int get_IPInterfaceTWAMPReflector_Port(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value)
 {
-	dmuci_get_value_by_section_string((struct uci_section *)data, "port", value);
+	*value = dmuci_get_value_by_section_fallback_def((struct uci_section *)data, "port", "862");
 	return 0;
 }

@@ -214,7 +214,7 @@ static int set_IPInterfaceTWAMPReflector_Port(char *refparam, struct dmctx *ctx,

 static int get_IPInterfaceTWAMPReflector_MaximumTTL(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value)
 {
-	dmuci_get_value_by_section_string((struct uci_section *)data, "max_ttl", value);
+	*value = dmuci_get_value_by_section_fallback_def((struct uci_section *)data, "max_ttl", "1");
 	return 0;
 }

@@ -290,8 +290,8 @@ static int browseIPInterfaceTWAMPReflectorInst(struct dmctx *dmctx, DMNODE *pare

 /* *** Device.IP.Interface. *** */
 DMOBJ tDeviceTWAMPReflectorObj[] = {
-/* OBJ, permission, addobj, delobj, checkdep, browseinstobj, forced_inform, notification, nextdynamicobj, nextobj, leaf, linker, bbfdm_type*/
-{"TWAMPReflector", &DMWRITE, addObjIPInterfaceTWAMPReflector, delObjIPInterfaceTWAMPReflector, NULL, browseIPInterfaceTWAMPReflectorInst, NULL, NULL, NULL, NULL, tIPInterfaceTWAMPReflectorParams, NULL, BBFDM_BOTH},
+/* OBJ, permission, addobj, delobj, checkdep, browseinstobj, forced_inform, notification, nextdynamicobj, nextobj, leaf, linker, bbfdm_type, uniqueKeys*/
+{"TWAMPReflector", &DMWRITE, addObjIPInterfaceTWAMPReflector, delObjIPInterfaceTWAMPReflector, NULL, browseIPInterfaceTWAMPReflectorInst, NULL, NULL, NULL, NULL, tIPInterfaceTWAMPReflectorParams, NULL, BBFDM_BOTH, LIST_KEY{"Alias", "Port", NULL}},
 {0}
 };

@@ -306,4 +306,4 @@ DMLEAF tIPInterfaceTWAMPReflectorParams[] = {
 {"IPAllowedList", &DMWRITE, DMT_STRING, get_IPInterfaceTWAMPReflector_IPAllowedList, set_IPInterfaceTWAMPReflector_IPAllowedList, NULL, NULL, BBFDM_BOTH},
 {"PortAllowedList", &DMWRITE, DMT_STRING, get_IPInterfaceTWAMPReflector_PortAllowedList, set_IPInterfaceTWAMPReflector_PortAllowedList, NULL, NULL, BBFDM_BOTH},
 {0}
-};
+};
--- a/udpechoserver/src/datamodel.c
+++ b/udpechoserver/src/datamodel.c
@@ -25,7 +25,7 @@ LIB_MAP_OBJ tRootDynamicObj[] = {

 static int get_IPDiagnosticsUDPEchoConfig_Enable(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value)
 {
-	dmuci_get_option_value_string("udpechoserver", "udpechoserver", "enable", value);
+	*value = dmuci_get_option_value_fallback_def("udpechoserver", "udpechoserver", "enable", "1");
 	return 0;
 }

@@ -94,7 +94,7 @@ static int set_IPDiagnosticsUDPEchoConfig_SourceIPAddress(char *refparam, struct

 static int get_IPDiagnosticsUDPEchoConfig_UDPPort(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value)
 {
-	dmuci_get_option_value_string("udpechoserver", "udpechoserver", "server_port", value);
+	*value = dmuci_get_option_value_fallback_def("udpechoserver", "udpechoserver", "server_port", "0");
 	return 0;
 }

@@ -114,7 +114,7 @@ static int set_IPDiagnosticsUDPEchoConfig_UDPPort(char *refparam, struct dmctx *

 static int get_IPDiagnosticsUDPEchoConfig_EchoPlusEnabled(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value)
 {
-	dmuci_get_option_value_string("udpechoserver", "udpechoserver", "plus", value);
+	*value = dmuci_get_option_value_fallback_def("udpechoserver", "udpechoserver", "plus", "1");
 	return 0;
 }

@@ -144,7 +144,7 @@ static int get_IPDiagnosticsUDPEchoConfig_EchoPlusSupported(char *refparam, stru
 static inline char *udpechoconfig_get(char *option, char *def)
 {
 	char *tmp;
-	dmuci_get_varstate_string("udpechoserver", "udpechoserver", option, &tmp);
+	varstate_get_value_string("udpechoserver", "udpechoserver", option, &tmp);
 	if(tmp && tmp[0] == '\0')
 		return dmstrdup(def);
 	else
@@ -177,19 +177,19 @@ static int get_IPDiagnosticsUDPEchoConfig_BytesResponded(char *refparam, struct

 static int get_IPDiagnosticsUDPEchoConfig_TimeFirstPacketReceived(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value)
 {
-	*value = udpechoconfig_get("TimeFirstPacketReceived", "0");
+	*value = udpechoconfig_get("TimeFirstPacketReceived", "0001-01-01T00:00:00.000000Z");
 	return 0;
 }

 static int get_IPDiagnosticsUDPEchoConfig_TimeLastPacketReceived(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value)
 {
-	*value = udpechoconfig_get("TimeLastPacketReceived", "0");
+	*value = udpechoconfig_get("TimeLastPacketReceived", "0001-01-01T00:00:00.000000Z");
 	return 0;
 }

 /* *** Device.IP.Diagnostics. *** */
 DMOBJ tDeviceUDPEchoConfigObj[] = {
-/* OBJ, permission, addobj, delobj, checkdep, browseinstobj, forced_inform, notification, nextdynamicobj, nextobj, leaf, linker, bbfdm_type*/
+/* OBJ, permission, addobj, delobj, checkdep, browseinstobj, forced_inform, notification, nextdynamicobj, nextobj, leaf, linker, bbfdm_type, uniqueKeys*/
 {"UDPEchoConfig", &DMREAD, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, tIPDiagnosticsUDPEchoConfigParams, NULL, BBFDM_BOTH},
 {0}
 };
@@ -210,4 +210,4 @@ DMLEAF tIPDiagnosticsUDPEchoConfigParams[] = {
 {"TimeFirstPacketReceived", &DMREAD, DMT_TIME, get_IPDiagnosticsUDPEchoConfig_TimeFirstPacketReceived, NULL, NULL, NULL, BBFDM_BOTH},
 {"TimeLastPacketReceived", &DMREAD, DMT_TIME, get_IPDiagnosticsUDPEchoConfig_TimeLastPacketReceived, NULL, NULL, NULL, BBFDM_BOTH},
 {0}
-};
+};
--- a/uspd/Makefile
+++ b/uspd/Makefile
@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=uspd
-PKG_VERSION:=2.0.6
+PKG_VERSION:=2.0.8

 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=f4cb4407c275befee87cf761a51687d3b9869e99
+PKG_SOURCE_VERSION:=4f42f08b9c4c410ca5170c77472ec6dbbecc85f2
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/uspd.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
 endif
--- a/wfadatad/Makefile
+++ b/wfadatad/Makefile
@@ -5,10 +5,10 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=wfadatad
-PKG_VERSION:=2.3.1
+PKG_VERSION:=2.3.0

 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=bdcf390f970facc20d7ac51fbb59ac4912b7fbfc
+PKG_SOURCE_VERSION:=26701fdc83440a748aeff183bad2f67287764fb4
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/wfadatad.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz

--- a/wifimngr/Makefile
+++ b/wifimngr/Makefile
@@ -7,12 +7,15 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=wifimngr
 PKG_VERSION:=8.2.9

+LOCAL_DEV=0
+ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_VERSION:=ff879d814caba6807f64288de22db6f78c03438c
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/wifimngr.git
 PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@iopsys.eu>
-
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
+endif
+
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_LICENSE:=GPL-2.0-only
 PKG_LICENSE_FILES:=LICENSE
@@ -38,6 +41,12 @@ TARGET_CFLAGS += \
 	-I$(STAGING_DIR)/usr/include/libnl3 \
 	-D_GNU_SOURCE

+ifeq ($(LOCAL_DEV),1)
+define Build/Prepare
+  rsync -r --exclude=.* ~/git/wifimngr/ $(PKG_BUILD_DIR)/
+endef
+endif
+
 define Package/wifimngr/install
 	$(INSTALL_DIR) $(1)/etc/init.d
 	$(INSTALL_BIN) ./files/wifimngr.init $(1)/etc/init.d/wifimngr
--- a/wifimngr/files/wifimngr.init
+++ b/wifimngr/files/wifimngr.init
@@ -9,7 +9,7 @@ PROG=/usr/sbin/wifimngr
 start_service() {
 	procd_open_instance
 	procd_set_param command ${PROG}
-#	procd_set_param env IOP_LLA_LIBS_DEBUG=3    #for debugging only
+	procd_set_param env LIBWIFI_DEBUG_LEVEL=3    #for debugging only
 #	procd_set_param stderr 1                    #for debugging only
 	procd_set_param respawn
 	procd_close_instance
--- a/xmpp/src/datamodel.c
+++ b/xmpp/src/datamodel.c
@@ -32,14 +32,14 @@ static int add_xmpp_connection(char *refparam, struct dmctx *ctx, void *data, ch
 	last_inst = get_last_instance_bbfdm("dmmap_xmpp", "connection", "con_inst");
 	dmasprintf(&id, "%d", (last_inst) ? atoi(last_inst) + 1 : 1);

-	dmuci_add_section_and_rename("xmpp", "connection", &xmpp_con, &con_name);
+	dmuci_add_section("xmpp", "connection", &xmpp_con, &con_name);
 	dmuci_set_value_by_section(xmpp_con, "xmpp_id", id);
 	dmuci_set_value_by_section(xmpp_con, "enable", "0");
 	dmuci_set_value_by_section(xmpp_con, "interval", "30");
 	dmuci_set_value_by_section(xmpp_con, "attempt", "16");
 	dmuci_set_value_by_section(xmpp_con, "serveralgorithm", "DNS-SRV");

-	dmuci_add_section_and_rename("xmpp", "connection_server", &xmpp_con_srv, &con_srv_name);
+	dmuci_add_section("xmpp", "connection_server", &xmpp_con_srv, &con_srv_name);
 	dmuci_set_value_by_section(xmpp_con_srv, "con_id", id);
 	dmuci_set_value_by_section(xmpp_con_srv, "enable", "0");
 	dmuci_set_value_by_section(xmpp_con_srv, "port", "5222");
@@ -133,7 +133,7 @@ static int get_xmpp_connection_supported_server_connect_algorithms(char *refpara
 /*#Device.XMPP.Connection.{i}.Enable!UCI:xmpp/xmpp_connection,@i-1/enable*/
 static int get_connection_enable(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value)
 {
-	dmuci_get_value_by_section_string((struct uci_section *)data, "enable", value);
+	*value = dmuci_get_value_by_section_fallback_def((struct uci_section *)data, "enable", "1");
 	return 0;
 }

@@ -291,7 +291,7 @@ static int set_xmpp_connection_server_connect_algorithm(char *refparam, struct d
 /*#Device.XMPP.Connection.{i}.KeepAliveInterval!UCI:xmpp/xmpp_connection,@i-1/interval*/
 static int get_xmpp_connection_keepalive_interval(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value)
 {
-	dmuci_get_value_by_section_string((struct uci_section *)data, "interval", value);
+	*value = dmuci_get_value_by_section_fallback_def((struct uci_section *)data, "interval", "-1");
 	return 0;
 }

@@ -312,7 +312,7 @@ static int set_xmpp_connection_keepalive_interval(char *refparam, struct dmctx *
 /*#Device.XMPP.Connection.{i}.ServerConnectAttempts!UCI:xmpp/xmpp_connection,@i-1/attempt*/
 static int get_xmpp_connection_server_attempts(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value)
 {
-	dmuci_get_value_by_section_string((struct uci_section *)data, "attempt", value);
+	*value = dmuci_get_value_by_section_fallback_def((struct uci_section *)data, "attempt", "16");
 	return 0;
 }

@@ -333,7 +333,7 @@ static int set_xmpp_connection_server_attempts(char *refparam, struct dmctx *ctx
 /*#Device.XMPP.Connection.{i}.ServerRetryInitialInterval!UCI:xmpp/xmpp_connection,@i-1/initial_retry_interval*/
 static int get_xmpp_connection_retry_initial_interval(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value)
 {
-	dmuci_get_value_by_section_string((struct uci_section *)data, "initial_retry_interval", value);
+	*value = dmuci_get_value_by_section_fallback_def((struct uci_section *)data, "initial_retry_interval", "60");
 	return 0;
 }

@@ -354,7 +354,7 @@ static int set_xmpp_connection_retry_initial_interval(char *refparam, struct dmc
 /*#Device.XMPP.Connection.{i}.ServerRetryIntervalMultiplier!UCI:xmpp/xmpp_connection,@i-1/retry_interval_multiplier*/
 static int get_xmpp_connection_retry_interval_multiplier(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value)
 {
-	dmuci_get_value_by_section_string((struct uci_section *)data, "retry_interval_multiplier", value);
+	*value = dmuci_get_value_by_section_fallback_def((struct uci_section *)data, "retry_interval_multiplier", "2000");
 	return 0;
 }

@@ -375,7 +375,7 @@ static int set_xmpp_connection_retry_interval_multiplier(char *refparam, struct
 /*#Device.XMPP.Connection.{i}.ServerRetryMaxInterval!UCI:xmpp/xmpp_connection,@i-1/retry_max_interval*/
 static int get_xmpp_connection_retry_max_interval(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value)
 {
-	dmuci_get_value_by_section_string((struct uci_section *)data, "retry_max_interval", value);
+	*value = dmuci_get_value_by_section_fallback_def((struct uci_section *)data, "retry_max_interval", "30720");
 	return 0;
 }

@@ -396,7 +396,7 @@ static int set_xmpp_connection_retry_max_interval(char *refparam, struct dmctx *
 /*#Device.XMPP.Connection.{i}.UseTLS!UCI:xmpp/xmpp_connection,@i-1/usetls*/
 static int get_xmpp_connection_server_usetls(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value)
 {
-	dmuci_get_value_by_section_string((struct uci_section *)data, "usetls", value);
+	*value = dmuci_get_value_by_section_fallback_def((struct uci_section *)data, "usetls", "1");
 	return 0;
 }

@@ -450,7 +450,7 @@ static int get_xmpp_connection_server_number_of_entries(char *refparam, struct d
 /*#Device.XMPP.Connection.{i}.Server.{i}.Enable!UCI:xmpp/xmpp_connection,@i-1/enable*/
 static int get_xmpp_connection_server_enable(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value)
 {
-	dmuci_get_value_by_section_string((struct uci_section *)data, "enable", value);
+	*value = dmuci_get_value_by_section_fallback_def((struct uci_section *)data, "enable", "1");
 	return 0;
 }

@@ -524,7 +524,7 @@ static int set_xmpp_connection_server_server_address(char *refparam, struct dmct
 /*#Device.XMPP.Connection.{i}.Server.{i}.Port!UCI:xmpp/xmpp_connection,@i-1/port*/
 static int get_xmpp_connection_server_port(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value)
 {
-	dmuci_get_value_by_section_string((struct uci_section *)data, "port", value);
+	*value = dmuci_get_value_by_section_fallback_def((struct uci_section *)data, "port", "5222");
 	return 0;
 }

@@ -590,14 +590,14 @@ static int browsexmpp_connection_serverInst(struct dmctx *dmctx, DMNODE *parent_

 /* *** Device.XMPP. *** */
 DMOBJ tDeviceXMPPObj[] = {
-/* OBJ, permission, addobj, delobj, checkdep, browseinstobj, forced_inform, notification, nextdynamicobj, nextobj, leaf, linker, bbfdm_type*/
+/* OBJ, permission, addobj, delobj, checkdep, browseinstobj, forced_inform, notification, nextdynamicobj, nextobj, leaf, linker, bbfdm_type, uniqueKeys*/
 {"XMPP", &DMREAD, NULL, NULL, NULL, NULL, NULL, NULL, NULL, tXMPPObj, tXMPPParams, NULL, BBFDM_BOTH},
 {0}
 };

 DMOBJ tXMPPObj[] = {
-/* OBJ, permission, addobj, delobj, checkdep, browseinstobj, forced_inform, notification, nextdynamicobj, nextobj, leaf, linker, bbfdm_type*/
-{"Connection", &DMWRITE, add_xmpp_connection, delete_xmpp_connection, NULL, browsexmpp_connectionInst, NULL, NULL, NULL, tXMPPConnectionObj, tXMPPConnectionParams, NULL, BBFDM_BOTH},
+/* OBJ, permission, addobj, delobj, checkdep, browseinstobj, forced_inform, notification, nextdynamicobj, nextobj, leaf, linker, bbfdm_type, uniqueKeys*/
+{"Connection", &DMWRITE, add_xmpp_connection, delete_xmpp_connection, NULL, browsexmpp_connectionInst, NULL, NULL, NULL, tXMPPConnectionObj, tXMPPConnectionParams, NULL, BBFDM_BOTH, LIST_KEY{"Alias", "Username", "Domain", "Resource", NULL}},
 {0}
 };

@@ -610,8 +610,8 @@ DMLEAF tXMPPParams[] = {

 /* *** Device.XMPP.Connection.{i}. *** */
 DMOBJ tXMPPConnectionObj[] = {
-/* OBJ, permission, addobj, delobj, checkdep, browseinstobj, forced_inform, notification, nextdynamicobj, nextobj, leaf, linker, bbfdm_type*/
-{"Server", &DMREAD, NULL, NULL, NULL, browsexmpp_connection_serverInst, NULL, NULL, NULL, NULL, tXMPPConnectionServerParams, NULL, BBFDM_BOTH},
+/* OBJ, permission, addobj, delobj, checkdep, browseinstobj, forced_inform, notification, nextdynamicobj, nextobj, leaf, linker, bbfdm_type, uniqueKeys*/
+{"Server", &DMREAD, NULL, NULL, NULL, browsexmpp_connection_serverInst, NULL, NULL, NULL, NULL, tXMPPConnectionServerParams, NULL, BBFDM_BOTH, LIST_KEY{"Alias", "ServerAddress", "Port", NULL}},
 {0}
 };
Author	SHA1	Message	Date
Jani Juvan	63db10eb1f	easy-soc-lib: Fix Makefile to pass broadcom chip id properly	2020-11-06 08:35:41 +01:00
vdutta	651ad4ce22	map-1905: Add validate function in plugin	2020-11-06 10:14:22 +05:30
vdutta	51a3b0ad35	uspd: Added ubus methods to list_inform and init_notify	2020-11-05 15:50:09 +05:30
Oskar Viljasaar	0c8b1ea046	iop: genconfig: add iopsys-bcm2711 (rpi-4) support	2020-11-02 17:33:21 +01:00
Oskar Viljasaar	104805a36e	feeds_update: add support for iopsys-bcm27xx	2020-11-02 17:32:25 +01:00
Oskar Viljasaar	a1bfb1b568	iop: genconfig_min: add iopsys-bcm2711 (rpi-4) support	2020-11-02 17:31:41 +01:00
Sukru Senli	5c744f71e3	remove reference to iopsys_brcm63xx_mips target	2020-11-01 10:42:32 +01:00
Sukru Senli	20ca483d80	iop: genconfig: change juci theme directory	2020-10-31 12:28:24 +01:00
Sukru Senli	7a466c989c	iop: do not select loop-detector	2020-10-31 12:14:53 +01:00
Kenneth Johansson	ff63939e84	ssh_upgrade: Add handling for config option. can now handle no reboot and keep config options.	2020-10-30 19:06:22 +01:00
Kenneth Johansson	3b283b8f3a	iop: ssh_upgrade: use sysupgrade as default. sysupgrade is now more functional than iopu so use that instead.	2020-10-29 18:33:00 +01:00
Jakob Olsson	d93d72587e	ieee1905: 20.0.30	2020-10-29 13:51:52 +01:00
Ronny Nilsson	b098ef3dc2	Add support for TaaS smoketesting of images. For developers and Jenkins etc. A short hand command for testing the just built image on real hardware. To be used before pushing commits and nightly images to public.	2020-10-28 16:11:26 +01:00
Simon Tate	8c69fc062a	bulkdata: Bulkdata fails to build on x86 To get bulkdata to build on x86, added limitation on the asprintf %.*s to use integer type (as per the programming manual).	2020-10-27 13:05:24 +01:00
Amin Ben Ramdhane	8ad4f32786	bbf: 2.7-2020-10-23	2020-10-23 18:08:30 +01:00
vdutta	71b66376f0	uspd: Fix fault codes - Generate fault for add_object/del_object if path is invalid - Generate fault in case of add_object/del_object/operate/set if the search query is failed - Fix set_attribute method to apply the attribute changes	2020-10-23 11:15:14 +05:30
Amin Ben Ramdhane	48525b051a	icwmp: 5.2-2020-10-19	2020-10-19 23:44:00 +01:00
Amin Ben Ramdhane	753e894b69	bbf: 2.6-2020-10-19	2020-10-19 23:40:23 +01:00
Amin Ben Ramdhane	ce701702c5	XMPP,BulkData,UDPecho,TWAMP: Fixed invalid int && unsignedInt && hexBinary parameter values	2020-10-19 23:37:01 +01:00
Omar Kallel	11550d140a	Add new notification feature & delete icwmp_notifd (cherry picked from commit `37865ab486`)	2020-10-18 11:31:14 +02:00
Sukru Senli	f622a96054	icwmp: keep cwmp session backup xml file over upgrade (cherry picked from commit `2284fcabbd`)	2020-10-18 11:29:55 +02:00
Jakob Olsson	3f19a43df2	map-1905: 0.0.13	2020-10-15 12:31:24 +02:00
Amin Ben Ramdhane	d2fedc407a	icwmp: 5.1-2020-10-09	2020-10-15 07:28:50 +01:00
Amin Ben Ramdhane	783fd44680	uspd: Fix compilation issue	2020-10-14 17:15:36 +01:00
Amin Ben Ramdhane	614774cb8b	bbf: 2.5-2020-10-14	2020-10-14 17:14:57 +01:00
Amin Ben Ramdhane	84521942ca	XMPP, BulkData, TWAMP: add unique keys	2020-10-14 17:07:02 +01:00
Rahul	bbbbdf9650	qosmngr: add log Syslog added to log non-availability of traffic policing on the wan port on 63138, this is a chip level limitation.	2020-10-14 15:13:50 +05:30
Rahul	98071d157d	qosmngr: add support for dhcp options as classification params DHCP option value 60, 61 and 77 can now be used to identify lan clients. Details of UCI as follows: config classify option src_vendor_class_id 'abc' // DHCP option 60. option dst_vendor_class_id 'abc' // DHCP option 60. option src_client_id 'xyz' // DHCP option 61 option dst_client_id 'xyz' // DHCP option 61 option src_user_class_id 'dfg' // DHCP option 77 option dst_user_class_id 'dfg' // DHCP option 77	2020-10-14 11:31:48 +05:30
Kenneth Johansson	d829f00e07	iop: ssh_upgrade: remove debug printout	2020-10-13 21:56:33 +02:00
Kenneth Johansson	640535a2ef	iop: ssh_upgrade now defaults to use the last.pkgtb file.	2020-10-13 21:46:30 +02:00
Amin Ben Ramdhane	7837417219	bbf: 2.4-2020-10-13	2020-10-13 13:00:10 +01:00
Amin Ben Ramdhane	269cbe364e	udpecho: Fix invalid dateTime parameter values	2020-10-13 12:57:33 +01:00
Rahul	54cc458a2d	qosmngr: add support for upstream policing on dg400prime	2020-10-12 22:32:39 +05:30
Sukru Senli	fdc882b6e0	iop: select icwmp instead of icwmp-curl	2020-10-11 15:15:20 +02:00
vdutta	346eaf0414	map-1905: Fix parsing of channel preference tlv	2020-10-08 17:29:10 +05:30
nevadita.chatterjee	d946f11c32	map-topology:Added version	2020-10-07 17:48:53 +05:30
Sukru Senli	c0957a425a	icwmp: remove unnecessary parts from init script	2020-10-07 13:58:05 +02:00
vdutta	8015a503ac	ieee1905: Fix crash in ex400	2020-10-07 16:37:49 +05:30
vdutta	a7d09f5ede	map-1905: Multiple fixes - Change structure for countrycode in CAC capability - Fix segfault in timestamp tlv	2020-10-07 16:34:18 +05:30
Amin Ben Ramdhane	8a5b49d585	icwmp: 5.0-2020-09-29	2020-10-01 22:59:32 +01:00
Amin Ben Ramdhane	ac69ea616e	bbf: 2.3-2020-09-29	2020-10-01 22:58:13 +01:00
Amin Ben Ramdhane	f358d6338d	Update XMPP & BulkData & UDPEcho to the latest version of bbf	2020-10-01 22:57:00 +01:00
Jakob Olsson	c514903145	wifimngr: 8.2.9	2020-10-01 15:36:45 +02:00
Anjan Chanda	dd69c371ae	wifimngr: 8.2.8	2020-09-30 07:36:40 +02:00
Anjan Chanda	4a1ab17bd4	easy-soc-libs: 5.3.14	2020-09-30 07:33:41 +02:00
Rahul	208b2cc8e5	qosmngr: add support for traffic policing Support for traffic policing added to allow configuration of ingress rate limiting. Test (on panther): - ingress rate limiting on per lan port basis for US traffic. - ingress rate limiting on wan port for DS traffic. - when ingress rate limiting is applied on traffic in one direction, then traffic in other direction remains un-affected, that is, if ingress rate limiting is applied in DS, then US traffic on the port is unaffected Note: Autotest are ready and will be merge for now with the tag not_ready. Once devel is ready or if we decide to merge this to release-5.3, the same can be tagged ready and executed as part of nightly suite.	2020-09-29 19:36:03 +05:30
vdutta	2e934a7169	uspd: B#3272 improvements in resolving paths	2020-09-24 13:38:38 +05:30
Anjan Chanda	b06980688a	map-topology: 1.5.5 - notify topology change event	2020-09-24 09:41:28 +02:00
Amin Ben Ramdhane	29b9605e02	icwmp: 5.0-2020-09-15	2020-09-23 19:26:53 +01:00
Amin Ben Ramdhane	0afa721bca	bbf: 2.2-2020-09-21	2020-09-23 19:24:18 +01:00
Amin Ben Ramdhane	3c0de388d1	Ticket refs #3228 : QEMU - ICWMP is segfaulting Fix missing objects	2020-09-23 19:19:04 +01:00
vdutta	aa1741e87a	ieee1905: Get auth mode from bss.security	2020-09-23 18:59:24 +05:30
Anjan Chanda	3040359e85	map-controller: 1.0.3-internal	2020-09-23 14:58:20 +02:00
Anjan Chanda	237286f42d	map-agent: 2.0.3-internal	2020-09-23 14:57:50 +02:00
vdutta	7758b30397	ieee1905: Remove redundant info from ubus objects	2020-09-22 19:54:22 +05:30
Sukru Senli	7b0dce915c	iop: genconfig: comment out mediatek open parts	2020-09-22 12:33:23 +02:00
Grzegorz Sluja	b6fdd0115a	wifimngr: Add support of local source build If You want to build wifimngr from Your local sources downloaded into ~/git, the following actions are needed: 1) set LOCAL_DEV=1 in wifimngr/Makefile 2) clean and compile wifimngr with command: make V=s package/feeds/iopsys/wifimngr/{clean,compile} Signed-off-by: Grzegorz Sluja <grzegorz.sluja@iopsys.eu>	2020-09-22 11:34:31 +02:00
Kenneth Johansson	392e08e2fc	genconfig: rename variable. just to make it clear what config path this is.	2020-09-21 18:18:56 +02:00
Jakob Olsson	2ae2110799	rearrange start orders for topology and ieee1905	2020-09-21 16:16:15 +02:00
Jakob Olsson	773e7af7f6	wfadatad: use service_running hook to wait for ieee1905 object	2020-09-21 09:13:51 +02:00
Jakob Olsson	75e9a5360f	ieee1905: config trigger to reload	2020-09-21 09:13:51 +02:00
Jakob Olsson	db5e42434e	ieee1905: change start order from 99 to 13	2020-09-21 09:13:51 +02:00
Jakob Olsson	00fd7efa3b	wfadatad: wait up to 2 seconds if ieee1905 is not up before start	2020-09-21 09:13:51 +02:00
Jakob Olsson	34f495f0a5	map-topology: iterate til ieee1905 object is up	2020-09-18 16:14:30 +02:00
Anjan Chanda	e3b7c9c238	ieee1905d: enable map plugin in default config	2020-09-18 15:16:56 +02:00
Anjan Chanda	e3f2e715c1	wfadatad: 2.3.0	2020-09-18 15:12:37 +02:00
Anjan Chanda	4c149ff680	map-topology: 1.5.1	2020-09-17 21:29:07 +02:00
Anjan Chanda	959b0546bc	wifimngr: 8.2.3	2020-09-17 21:28:28 +02:00
Anjan Chanda	e39430ceaf	easy-soc-libs: 5.3.3	2020-09-17 21:27:45 +02:00
Amin Ben Ramdhane	6ea9942320	xmpp, udpecho, twamp: compile with fPIC	2020-09-17 18:12:03 +01:00
Amin Ben Ramdhane	a5e812f785	bbf: 2.1-2020-09-17	2020-09-17 10:20:34 +01:00
vdutta	a604987a3e	uspd: Optimize to reduce cpu usages	2020-09-17 11:12:52 +05:30
Anjan Chanda	7b2d8edacf	map-topology: 1.5.0	2020-09-17 07:40:40 +02:00
Jakob Olsson	47b2b4fc51	map-topology: include mdns changes	2020-09-16 18:24:01 +02:00
Jakob Olsson	6b3e6bcd11	map-topology: add dependency on libavahi-nodbus-support	2020-09-16 16:30:09 +02:00
Anjan Chanda	52726289cc	wifimngr: 8.1.0	2020-09-16 16:07:37 +02:00
Anjan Chanda	6c2aac5db5	easy-soc-libs: 5.0.3	2020-09-16 16:07:15 +02:00
Sukru Senli	bfc2b17a72	bulkdata: compile with fPIC	2020-09-16 10:03:12 +02:00
Sukru Senli	e98422f81e	icwmp: set userid empty in cwmp config; it will be filled by uci-default	2020-09-16 08:22:26 +02:00
Sukru Senli	841a76a7e6	move tr-069 packages out of trx69 folder	2020-09-15 16:20:11 +02:00
Grzegorz Sluja	1760ea526c	wifimngr: Set default debug level to ERR When wifimngr debugging is enabled debug level is set to ERR only by default. Signed-off-by: Grzegorz Sluja <grzegorz.sluja@iopsys.eu>	2020-09-15 10:50:01 +02:00
Yalu Zhang	b5a493e540	Update package bbf TR-104: add some missing parameters	2020-09-15 09:56:45 +02:00
Omar Kallel	7f00d0419f	Add the file /lib/upgrade/keep.d/icwmp when installing icwmp	2020-09-14 17:32:42 +01:00
Markus Gothe	64da6686af	Fix gryphon LED module crash. Update gryphon LED module to work with Linux 4.1 and not to crash when 'gpiod_get_index()' fails. Change-Id: I27fcbe3ad9dbc755eabdd3f2120544b171b07885	2020-09-14 16:18:01 +02:00
Amin Ben Ramdhane	8cc1877efd	bbf: 2.0-2020-09-12	2020-09-12 15:44:13 +01:00
Roman Azarenko	6673a85a21	iop: generate_tarballs: bcmkernel: add symlink if missing, partially fix shellcheck warnings	2020-09-11 19:01:53 +02:00
nevadita.chatterjee	3e07ea7f8d	map-topology: Config file change	2020-09-11 19:28:47 +05:30
sverma	8b4ef46681	wfadatad: Changes UBUS objects name	2020-09-11 18:54:27 +05:30
Anjan Chanda	f35e41cc0c	wifimngr: 8.0.4	2020-09-11 13:14:57 +02:00
Anjan Chanda	0aff258e29	easy-soc-libs: 4.9.1	2020-09-11 13:14:11 +02:00
Amin Ben Ramdhane	d919f4440e	icwmp: 5.0-2020-09-10	2020-09-11 10:13:42 +01:00
Kenneth Johansson	9d20839041	make ./iop ssh_upgrade work on sdk504 ./iop ssh_upgrade will now install latest image on broadcom boards.	2020-09-10 19:54:59 +02:00
Kenneth Johansson	36ec134e33	genconfig: make sure there is an empty line. when concatenating configurations there has to be an empty line at the end otherwise the last line could be combined with the next configuration option.	2020-09-10 17:32:31 +02:00
Amin Ben Ramdhane	ea57418313	Ticket #2910 : Separate BBF packages to their own packages with their own config files	2020-09-10 10:59:47 +01:00
Omar Kallel	c61aa804ce	icwmp: 09-09-2020	2020-09-09 15:37:22 +01:00
Omar Kallel	19bbb87682	icwmp: Active notification 08/09/2020	2020-09-08 17:42:40 +01:00
Amin Ben Ramdhane	3ee01927b1	bbf: 2.0-2020-09-08	2020-09-08 12:29:00 +01:00
Roman Azarenko	d9f6b37bd7	questd: 5.2.1	2020-09-08 11:42:30 +02:00
Ronny Nilsson	c3dd0a996b	base-files: move db to etc Due to read only rootfs the /lib/db will move into /etc.	2020-09-07 12:27:43 +02:00