Redmine#27829 - easy-soc-libs: Use correct chipset defintions

The struct for passing ioctl() data does differ in size (and offsets) on different platforms, hence we need to pass the correct defines to the compiler. Change-Id: If81a4bd79b21c5e93443e5ef48fb3f1b07058f60
bbf: 1.6-2020-08-25
2025-12-24 19:14:05 +08:00 · 2020-08-31 15:47:20 +02:00 · 2020-08-26 11:33:23 +01:00 · 2020-08-06 13:53:27 +02:00 · 2020-08-03 16:16:42 +02:00 · 2020-07-31 15:24:30 +02:00
9 changed files with 47 additions and 21 deletions
--- a/bbf/Makefile
+++ b/bbf/Makefile
@@ -5,11 +5,11 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=libbbfdm
-PKG_VERSION:=1.5-2020-06-22
+PKG_VERSION:=1.6-2020-08-25
 PKG_FIXUP:=autoreconf
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/bbf.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=e4f1fd86536db003db0b0b1c7dcc8a899574525c
+PKG_SOURCE_VERSION:=bfe14a431d408614ed30e2d831ebd927eab719e2
 PKG_RELEASE=$(PKG_SOURCE_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
--- 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:=3.3.1
+PKG_VERSION:=3.3.12
 PKG_RELEASE:=1

 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=8dc10d48aeb5f936196ec78b58ad6ff1fcb357e9
+PKG_SOURCE_VERSION:=f508577fae01c4820fad884a5a0847d26104721c
 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
@@ -64,8 +64,17 @@ ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_mips),y)
  KERNEL_DIR:=$(BUILD_DIR)/bcmkernel/bcm963xx
 else ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_arm),y)
  TARGET_PLATFORM=BROADCOM
-  TARGET_CFLAGS +=-DIOPSYS_BROADCOM -DCONFIG_BCM963138 \
+  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/mcastmngr/files/etc/hotplug.d/iface/mcast.hotplug
+++ b/mcastmngr/files/etc/hotplug.d/iface/mcast.hotplug
@@ -10,16 +10,22 @@ network_get_device l3device $INTERFACE

 compare_mcast_proxy_upstream() {
        local upstream
+	local mode="$2"

-        config_get upstream $1 upstream_interface
+	if [ "$mode" == "proxy" ]; then
+		config_get upstream $1 upstream_interface
+	else
+		config_get upstream $1 interface
+	fi

-		for dev in $upstream; do
-			if [ "$l3device" == "$dev" ]; then
-				ubus call uci commit '{"config":"mcast"}'
-				exit
-			fi
-		done
+	for dev in $upstream; do
+		if [ "$l3device" == "$dev" ]; then
+			ubus call uci commit '{"config":"mcast"}'
+			exit
+		fi
+	done
 }

 config_load mcast
-config_foreach compare_mcast_proxy_upstream "proxy"
+config_foreach compare_mcast_proxy_upstream "proxy" "proxy"
+config_foreach compare_mcast_proxy_upstream "snooping" "snooping"
--- a/mcastmngr/files/etc/init.d/mcast
+++ b/mcastmngr/files/etc/init.d/mcast
@@ -9,6 +9,7 @@ NAME=mcast
 include /lib/network
 include /lib/mcast

+
 service_triggers() {
 	procd_add_reload_trigger network $NAME
 }
@@ -24,6 +25,11 @@ start_service() {
 	procd_close_instance
 }

+boot() {
+	setup_mcast_mode
+	start
+}
+
 stop_service() {
 	service_stop $PROG_EXE
 }
--- a/mcastmngr/files/lib/mcast/broadcom.sh
+++ b/mcastmngr/files/lib/mcast/broadcom.sh
@@ -395,6 +395,11 @@ config_global_params() {
 	echo $mldv2_unsolicited_report_interval > /proc/sys/net/ipv6/conf/all/mldv2_unsolicited_report_interval
 }

+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
+}
+
 configure_mcast() {
 	rm -f $CONFFILE
 	touch $CONFFILE
--- a/obuspa/Makefile
+++ b/obuspa/Makefile
@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=obuspa
-PKG_VERSION:=2.0.17
+PKG_VERSION:=2.0.20

 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=447a01c0334b564450586b88cc54ac523122609f
+PKG_SOURCE_VERSION:=44fa7f29682e89ca3992a9c88c5bdefa1cacdc52
 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
@@ -9,10 +9,10 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk

 PKG_NAME:=peripheral_manager
-PKG_VERSION:=1.0.4
+PKG_VERSION:=1.0.5
 PKG_RELEASE:=1

-PKG_SOURCE_VERSION:=f702bbdcc270cb878588846c7e675f5e4ca53740
+PKG_SOURCE_VERSION:=0513e171013512bc14ef8b650c715e3fd9c59820
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/peripheral-manager

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

 PKG_NAME:=uspd
-PKG_VERSION:=1.0.25
+PKG_VERSION:=2.0.0

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

 PKG_NAME:=wifimngr
-PKG_VERSION:=2.9.2
+PKG_VERSION:=2.9.3

 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=2275a9461c4c0051ef24b39eaa83cc1b85391b94
+PKG_SOURCE_VERSION:=9e3b8786e1be1ed7fbde1894c779f63b476fa8bc
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/wifimngr.git
 PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@iopsys.eu>
Author	SHA1	Message	Date
Markus Gothe	c394034abd	Redmine#27829 - easy-soc-libs: Use correct chipset defintions The struct for passing ioctl() data does differ in size (and offsets) on different platforms, hence we need to pass the correct defines to the compiler. Change-Id: If81a4bd79b21c5e93443e5ef48fb3f1b07058f60	2020-08-31 15:47:20 +02:00
Amin Ben Ramdhane	ff6f0d86e3	bbf: 1.6-2020-08-25	2020-08-26 11:33:23 +01:00
Omar Kallel	9c374abe87	bbf: 1.5-2020-08-06	2020-08-06 13:53:27 +02:00
Omar Kallel	2abf1cbd60	bbf: 1.5-2020-08-03	2020-08-03 16:16:42 +02:00
vdutta	42ac8650cc	obuspa: 2.0.20	2020-07-31 15:24:30 +02:00
vdutta	6620496980	uspd: 2.0.0	2020-07-31 15:23:48 +02:00
Omar Kallel	1b0d5ca9f2	bbf: 1.5-2020-07-28	2020-07-29 15:07:22 +02:00
Rahul	fc9b4f5be2	mcastmngr: handle mcast config for ifup in snooping The handling of ifup event in case of snooping config was missing. Note: ifup event is generated only for l3 interface, so, say ethx is member of br-y which has proto none. In this case if ethx link goes down and comes up again, IPTV will not work without a mcast reload. From the look of it this will be the case in old version as well and at the moment I don't know how this can be handled but considering this is a remote scenario in my opinion I don't think the risk is too high. I would continue to look for a solution ofcourse.	2020-07-17 10:29:40 +02:00
vdutta	f80a9e5d96	obsupa: Updated to 2.0.19	2020-07-13 20:30:28 +05:30
vdutta	c130ffe882	uspd: Updated to 1.0.26	2020-07-13 20:28:50 +05:30
vdutta	84b5b1a42f	bbf: 1.5-2020-07-13	2020-07-13 20:27:41 +05:30
Anjan Chanda	60fcda1616	wifimngr 2.9.3: report opclass in global opclass numbers	2020-07-13 15:34:06 +02:00
Amin Ben Ramdhane	a3df9da723	bbf: 1.5-2020-07-10	2020-07-11 12:42:30 +02:00
Amin Ben Ramdhane	ed169fbc0c	bbf: 1.5-2020-07-09	2020-07-10 12:11:06 +02:00
Anjan Chanda	41405f112b	easy-soc-libs 3.3.12 - libwifi: report all supported opclasses	2020-07-10 10:20:06 +02:00
Anjan Chanda	6cce55d77a	easy-soc-libs 3.3.11 - libwifi: bcm: fix radio counters	2020-07-09 08:21:04 +02:00
Amin Ben Ramdhane	b266e2a2fa	bbf: 1.5-2020-07-08	2020-07-08 10:18:36 +02:00
Omar Kallel	491b977545	bbf: 1.5-2020-07-07	2020-07-07 14:10:55 +02:00
Rahul	42a4daae03	mcastmngr: fix multicast forwarding on untagged interface. Modifying the lookup method for forwarding multicast packets enables forwarding on both tagged and untagged upstream interfaces. I have tested: - forwarding of traffic in untagged interface. - forwarding of traffic on tagged interface. - response to queries in above scenarios by upstream server. - forwarding of unsolicited joins and leaves to upstream server. I cannot see a fault at the moment	2020-07-06 13:23:04 +02:00
pitchaiah prakash	84ea2908c6	peripheral_manager: 1.0.5	2020-06-30 08:58:31 +02:00
vdutta	c333460ac6	obsupa: Suppress schema errors in get if its present in uspd	2020-06-30 11:34:30 +05:30