EN7523 uboot

dectmngr/files/etc/init.d/dectmngr

@@ -11,6 +11,8 @@ PROG=/usr/sbin/dectmngr
 LOG_PATH=/var/log/dectmngr
 DB_PATH=/etc/dect
 
+DECT_GPIO=$(db -q get hw.board.dect_gpio)
+
 # Ask dectmngr to exit nicely and wait for it to clean up, which is a slow process.
 stop_and_wait_dectmngr() {
 	pidof $NAME && killall -q $NAME
@@ -30,7 +32,7 @@ start_service() {
 
 	test $(db get hw.board.hasDect) = "0" && return
 
-	echo 1 > /sys/class/gpio/gpio14/value
+	[ -n "$DECT_GPIO" ] && echo 1 > /sys/class/gpio/gpio${DECT_GPIO}/value
 
 	rfpi=$(db -q get hw.board.dect_rfpi)
 	[ -n "$rfpi" -a ${#rfpi} -eq 14 ] && opt_ext="$opt_ext -rfpi $rfpi"
@@ -71,7 +73,7 @@ start_service() {
 stop_service() {
 	test $(db get hw.board.hasDect) = "0" && return
 
-	echo 0 > /sys/class/gpio/gpio14/value
+	[ -n "$DECT_GPIO" ] && echo 0 > /sys/class/gpio/gpio${DECT_GPIO}/value
 	stop_and_wait_dectmngr
 }
 
@@ -86,8 +88,10 @@ service_triggers()
 }
 
 boot() {
-	echo 14 > /sys/class/gpio/export
-	echo out > /sys/class/gpio/gpio14/direction
+	[ -n "$DECT_GPIO" ] && {
+		echo ${DECT_GPIO} > /sys/class/gpio/export
+		echo out > /sys/class/gpio/gpio${DECT_GPIO}/direction
+	}
 
 	[ ! -d $LOG_PATH ] && mkdir -p $LOG_PATH
 	[ ! -d $DB_PATH ] && mkdir -p $DB_PATH

icwmp/patches/100-fix-calloc.patch

@@ -1,12 +0,0 @@
-diff --git a/ssl_utils.c b/ssl_utils.c
-index db66fea..cb9d0d8 100644
---- a/ssl_utils.c
-+++ b/ssl_utils.c
-@@ -29,6 +29,7 @@
- #endif
- 
- #include <string.h>
-+#include <stdlib.h>
- 
- #include "common.h"
- #include "log.h"

libtrace/patches/100-fix-SIOCGSTAMP-undeclared-error.patch

@@ -1,12 +0,0 @@
-diff --git a/lib/format_linux.c b/lib/format_linux.c
-index 5bc9a5a..1acb746 100644
---- a/lib/format_linux.c
-+++ b/lib/format_linux.c
-@@ -52,6 +52,7 @@
- #include <unistd.h>
- #include <string.h>
- #include <assert.h>
-+#include <linux/sockios.h>
- 
- #ifdef HAVE_INTTYPES_H
- #  include <inttypes.h>

map-agent/Makefile

@@ -5,9 +5,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=map-agent
-PKG_VERSION:=7.2.1
+PKG_VERSION:=7.2.2
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=b3e3a21c9a938ce719a0ea609c965852586d6778
+PKG_SOURCE_VERSION:=8168d68c118d0dde0ff798fd0c8ed1d6a18bc99d
 PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@iopsys.eu>
 
 PKG_LICENSE:=PROPRIETARY IOPSYS

map-agent/files/etc/init.d/mapagent

@@ -80,7 +80,8 @@ validate_agent_section() {
 		'vlan_segregation:bool:false' \
 		'resend_num:uinteger:0' \
 		'dyn_cntlr_sync:bool:true' \
-		'island_prevention:bool:true'
+		'island_prevention:bool:false' \
+		'eth_onboards_wifi_bhs:bool:false'
 
 
 	[ "$?" -ne 0 ] && {
@@ -148,7 +149,8 @@ validate_radio_section() {
 			'include_sta_stats:bool:false' \
 			'include_sta_metric:bool:false' \
 			'rcpi_hysteresis_margin:range(0,255)' \
-			'report_util_threshold:range(0,255)'
+			'report_util_threshold:range(0,255)' \
+			'encryption:or("sae", "psk2", "sae-mixed")'
 
 	[ "$?" -ne 0 ] && {
 		logger -s -t "mapagent" "Validation of radio section failed"

map-controller/files/etc/init.d/mapcontroller

@@ -23,7 +23,9 @@ validate_controller_section() {
 		'enable_sta_steer:bool:false' \
 		'enable_bsta_steer:bool:false' \
 		'use_bcn_metrics:bool:false' \
-		'use_usta_metrics:bool:false'
+		'use_usta_metrics:bool:false' \
+		'allow_bgdfs:range(0,2629744)' \
+		'channel_plan:range(0,2629744)'
 
 	[ "$?" -ne 0 ] && {
 		logger -s -t "mapcontroller" "Validation of controller section failed"

uboot/Makefile

@@ -6,24 +6,25 @@
 #
 
 include $(TOPDIR)/rules.mk
+include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=u-boot
-PKG_VERSION:=2016.08
+PKG_VERSION:=2022.04
 
+PKG_SOURCE_VERSION:=a804b5702065f6ffc052856cb070d84f555eb53b
 PKG_SOURCE_PROTO:=git
-
-ifdef CONFIG_TARGET_iopsys_econet
-PKG_SOURCE_URL:=https://dev.iopsys.eu/ensemble/u-boot.git
-PKG_SOURCE_VERSION:=1b320f0656bfc8504fa4f771dd77d8e403ed00e0
-else
 PKG_SOURCE_URL:=https://dev.iopsys.eu/fork/uboot.git
-PKG_SOURCE_VERSION:=4cd73fe5db0ebfc1242ca9c85c14d7f0718eaf73
-endif
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+# ifdef CONFIG_TARGET_iopsys_econet
+# PKG_SOURCE_URL:=https://dev.iopsys.eu/ensemble/u-boot.git
+# PKG_SOURCE_VERSION:=1b320f0656bfc8504fa4f771dd77d8e403ed00e0
+# else
+# endif
+
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
 
 PKG_LICENSE:=GPL-2.0-or-later
 
@@ -59,9 +60,18 @@ define uboot/en7562
   UBOOT_IMG:=u-boot-nand.bin
 endef
 
+define uboot/en7523
+  TITLE:=U-Boot for the en7523
+  CONFIG:=econet-en7562-basic
+  DEPENDS:=@TARGET_iopsys_econet
+  UBOOT_IMG:=u-boot-nand.bin
+endef
+
+
 UBOOTS := \
 	ex400 \
-	en7562
+	en7562 \
+	en7523
 
 define Package/uboot/template
 define Package/uboot-$(1)
@@ -101,6 +111,8 @@ define Build/Compile
 		CROSS_COMPILE=$(TARGET_CROSS)
 	+$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
 		CROSS_COMPILE=$(TARGET_CROSS) env
+	+$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
+		CROSS_COMPILE=$(TARGET_CROSS) envtools
 endef
 
 # don't install /etc/init.d/uboot for intel-mips as it's not needed

wfadatad/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=wfadatad
-PKG_VERSION:=7.0.3
+PKG_VERSION:=7.0.5
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=5132917381acd81f3b043ee041beaa8630e2bd12
+PKG_SOURCE_VERSION:=6548ed2d6aaf957d799188d4ff43894c2dd575cb
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/wfadatad.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip

wfadatad/files/decollector.init

@@ -7,7 +7,7 @@ USE_PROCD=1
 PROG=/usr/sbin/decollector
 
 service_running() {
-	ubus -t 2 wait_for ieee1905 ieee1905.map
+	ubus -t 2 wait_for ieee1905 ieee1905.map topology
 }
 
 start_service() {