From a22a2c43867c08fd56934118ce94405201180c75 Mon Sep 17 00:00:00 2001
From: Vivek Kumar Dutta <vivek.dutta@iopsys.eu>
Date: Mon, 22 Jul 2024 12:30:46 +0530
Subject: [PATCH] icwmp: Allow configuration of cwmp params from USP

---
 icwmp/Config.in |  6 ++++++
 icwmp/Makefile  | 17 +++++++++++++++--
 2 files changed, 21 insertions(+), 2 deletions(-)
 create mode 100644 icwmp/Config.in

diff --git a/icwmp/Config.in b/icwmp/Config.in
new file mode 100644
index 000000000..0ba104c17
--- /dev/null
+++ b/icwmp/Config.in
@@ -0,0 +1,6 @@
+menu "Configuration"
+
+config ICWMP_MGMT_FROM_USP
+	bool "Support configuration of ManagementServer from USP"
+	default y
+endmenu
diff --git a/icwmp/Makefile b/icwmp/Makefile
index 8289a72c9..1c074cbcb 100755
--- a/icwmp/Makefile
+++ b/icwmp/Makefile
@@ -8,13 +8,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=icwmp
-PKG_VERSION:=9.8.1
+PKG_VERSION:=9.8.2
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/icwmp.git
-PKG_SOURCE_VERSION:=38f3cc38ecabc908ae799b1e334362ee8bd46545
+PKG_SOURCE_VERSION:=7e86433c31a9d298376db8b25fc49ea0fb84d428
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
@@ -32,8 +32,21 @@ define Package/icwmp
   SUBMENU:=TRx69
   TITLE:=TR069 CWMP client
   DEPENDS:=+libuci +libubox +libblobmsg-json +libubus +libjson-c +libcurl +mxml +libuuid +libbbfdm-api +libopenssl
+  MENU:=1
 endef
 
+define Package/icwmp/description
+ TR069 client implementation with bbfdm backend for TR181 support
+endef
+
+define Package/icwmp/config
+	source "$(SOURCE)/Config.in"
+endef
+
+ifeq ($(CONFIG_ICWMP_MGMT_FROM_USP),y)
+EXTRA_CFLAGS += -DCWMP_DUAL_SUPPORT=BBFDM_BOTH
+endif
+
 ifeq ($(LOCAL_DEV),1)
 define Build/Prepare
 	$(CP) -rf ~/git/icwmp/* $(PKG_BUILD_DIR)/