treewide: Bump to consolidated release QSDK-12.5

Signed-off-by: Sean Khan <datapronix@protonmail.com>
This commit is contained in:
Sean Khan 2024-06-23 16:39:16 -04:00
parent 174edae00a
commit b00980f17b
12 changed files with 39 additions and 50 deletions

View File

@ -7,8 +7,8 @@ PKG_SOURCE_URL:=https://git.codelinaro.org/clo/qsdk/oss/lklm/qca-mcs.git
PKG_SOURCE_DATE:=2024-02-27
PKG_SOURCE_PROTO:=git
PKG_SOURCE_VERSION:=26d6424
PKG_MIRROR_HASH:=c9ac582b77123b9d187038b6f8fdb2020bd3a9708fb826773aa775768a60b0e7
QSDK_VERSION:=12.5.r2
PKG_MIRROR_HASH:=29378ca75358d85ab04d0f7c5c63988bac4a02477ba29f983085ff99fc4f337e
QSDK_VERSION:=12.5
PKG_VERSION:=$(QSDK_VERSION)-$(PKG_SOURCE_DATE)-$(PKG_SOURCE_VERSION)
PKG_BUILD_PARALLEL:=1

View File

@ -7,8 +7,8 @@ PKG_SOURCE_URL:=https://git.codelinaro.org/clo/qsdk/oss/lklm/nss-cfi.git
PKG_SOURCE_PROTO:=git
PKG_SOURCE_DATE:=2022-12-15
PKG_SOURCE_VERSION:=5cd07ce
PKG_MIRROR_HASH:=4f6fc96b7f17875d4d1059b13f686d3515a8a2768f752cbb0da2a04c389fdf61
QSDK_VERSION:=12.5.r2
PKG_MIRROR_HASH:=2f13bf2c61a2da1cdb61a6dbeceb731c0b934388d53c0c84d278de3f9f6359fd
QSDK_VERSION:=12.5
PKG_VERSION:=$(QSDK_VERSION)-$(PKG_SOURCE_DATE)-$(PKG_SOURCE_VERSION)
PKG_BUILD_PARALLEL:=1

View File

@ -1,14 +1,14 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=qca-nss-clients
PKG_RELEASE:=2
PKG_RELEASE:=3
PKG_SOURCE_URL:=https://git.codelinaro.org/clo/qsdk/oss/lklm/nss-clients.git
PKG_SOURCE_PROTO:=git
PKG_SOURCE_DATE:=2024-03-05
PKG_SOURCE_VERSION:=9a53b18
PKG_MIRROR_HASH:=d9ce4f5ae5880eee9d0ae08e12ce32f58be2e5a01b56ff3e31e145892038b516
QSDK_VERSION:=12.5.r2
PKG_MIRROR_HASH:=79560a2e89147b19b9d76fbecbca867d66acf37b8ae0911b745ae98d1dfb46cb
QSDK_VERSION:=12.5
PKG_VERSION:=$(QSDK_VERSION)-$(PKG_SOURCE_DATE)-$(PKG_SOURCE_VERSION)
PKG_BUILD_PARALLEL:=1

View File

@ -7,8 +7,8 @@ PKG_SOURCE_URL:=https://git.codelinaro.org/clo/qsdk/oss/lklm/nss-crypto.git
PKG_SOURCE_PROTO:=git
PKG_SOURCE_DATE:=2022-12-15
PKG_SOURCE_VERSION:=3c5a574
PKG_MIRROR_HASH:=f2431119277ceac18721c2f4d043a38ed144b5ee1c3e0b406ee0f86a561dce28
QSDK_VERSION:=12.5.r2
PKG_MIRROR_HASH:=9788743ad04c552c743380ced2c95b1a819024b205c91f4c224b9dbb85472a9c
QSDK_VERSION:=12.5
PKG_VERSION:=$(QSDK_VERSION)-$(PKG_SOURCE_DATE)-$(PKG_SOURCE_VERSION)
PKG_BUILD_PARALLEL:=1

View File

@ -1,14 +1,14 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=qca-nss-drv
PKG_RELEASE:=4
PKG_RELEASE:=5
PKG_SOURCE_URL:=https://git.codelinaro.org/clo/qsdk/oss/lklm/nss-drv.git
PKG_SOURCE_PROTO:=git
PKG_SOURCE_DATE:=2024-03-26
PKG_SOURCE_VERSION:=29df418
PKG_MIRROR_HASH:=134fbac81637351ab3d383c3f78ec13886c9c4b00d06f04d58ae2c7f735636d9
QSDK_VERSION:=12.5.r2
PKG_SOURCE_DATE:=2024-04-06
PKG_SOURCE_VERSION:=53a0dc1
PKG_MIRROR_HASH:=51f27c886863acaca308ff24fb57a3c776e3c3dd84360a752cb5359a5f47a9e0
QSDK_VERSION:=12.5
PKG_VERSION:=$(QSDK_VERSION)-$(PKG_SOURCE_DATE)-$(PKG_SOURCE_VERSION)
PKG_BUILD_PARALLEL:=1

View File

@ -1,14 +1,14 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=qca-nss-ecm
PKG_RELEASE:=2
PKG_RELEASE:=3
PKG_SOURCE_URL:=https://git.codelinaro.org/clo/qsdk/oss/lklm/qca-nss-ecm.git
PKG_SOURCE_PROTO:=git
PKG_SOURCE_DATE:=2024-04-16
PKG_SOURCE_VERSION:=220718d
PKG_MIRROR_HASH:=1513af220ecde3c07be2943e987dd7594ee6a3977213722df8e7c71688cec903
QSDK_VERSION:=12.5.r2
PKG_SOURCE_DATE:=2024-06-17
PKG_SOURCE_VERSION:=937d47c
PKG_MIRROR_HASH:=c2f7c500f6434537ba4b583d9034c87fafae5d5abe1514a6ff61949b64ed8f84
QSDK_VERSION:=12.5
PKG_VERSION:=$(QSDK_VERSION)-$(PKG_SOURCE_DATE)-$(PKG_SOURCE_VERSION)
PKG_BUILD_PARALLEL:=1

View File

@ -14,7 +14,7 @@ Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
--- a/Makefile
+++ b/Makefile
@@ -20,7 +20,6 @@
@@ -4,7 +4,6 @@
ifeq ($(ECM_FRONT_END_SFE_ENABLE), y)
obj-m += examples/ecm_sfe_l2.o
endif
@ -22,7 +22,7 @@ Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
obj-m += ecm.o
ifeq ($(BUILD_ECM_WIFI_PLUGIN),y)
@@ -40,6 +39,9 @@ endif
@@ -24,6 +23,9 @@ endif
ifeq ($(EXAMPLES_BUILD_OVS),y)
obj-m += examples/ecm_ovs.o
endif
@ -32,7 +32,7 @@ Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
ecm-y := \
frontends/cmn/ecm_ae_classifier.o \
@@ -131,10 +133,18 @@ ccflags-$(ECM_INTERFACE_BOND_ENABLE) +=
@@ -115,10 +117,18 @@ ccflags-$(ECM_INTERFACE_BOND_ENABLE) +=
# Define ECM_INTERFACE_PPPOE_ENABLE=y in order
# to enable support for PPPoE acceleration.
# #############################################################################
@ -52,7 +52,7 @@ Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
# Define ECM_INTERFACE_L2TPV2_ENABLE=y in order
# to enable support for l2tpv2 acceleration.
# #############################################################################
@@ -167,6 +177,12 @@ endif
@@ -151,6 +161,12 @@ endif
ccflags-$(ECM_INTERFACE_PPP_ENABLE) += -DECM_INTERFACE_PPP_ENABLE
# #############################################################################
@ -65,7 +65,7 @@ Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
# Define ECM_INTERFACE_GRE_TAP_ENABLE=y in order
# to enable support for GRE TAP interface.
# #############################################################################
@@ -249,7 +265,9 @@ ccflags-$(ECM_INTERFACE_OVS_BRIDGE_ENABL
@@ -233,7 +249,9 @@ ccflags-$(ECM_INTERFACE_OVS_BRIDGE_ENABL
# #############################################################################
# Define ECM_INTERFACE_VLAN_ENABLE=y in order to enable support for VLAN
# #############################################################################
@ -76,7 +76,7 @@ Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
ccflags-$(ECM_INTERFACE_VLAN_ENABLE) += -DECM_INTERFACE_VLAN_ENABLE
# #############################################################################
@@ -291,7 +309,9 @@ ccflags-$(ECM_CLASSIFIER_OVS_ENABLE) +=
@@ -275,7 +293,9 @@ ccflags-$(ECM_CLASSIFIER_OVS_ENABLE) +=
# #############################################################################
# Define ECM_CLASSIFIER_MARK_ENABLE=y in order to enable mark classifier.
# #############################################################################
@ -87,7 +87,7 @@ Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
ecm-$(ECM_CLASSIFIER_MARK_ENABLE) += ecm_classifier_mark.o
ccflags-$(ECM_CLASSIFIER_MARK_ENABLE) += -DECM_CLASSIFIER_MARK_ENABLE
@@ -315,7 +335,9 @@ ccflags-$(ECM_CLASSIFIER_NL_ENABLE) += -
@@ -299,7 +319,9 @@ ccflags-$(ECM_CLASSIFIER_NL_ENABLE) += -
# #############################################################################
# Define ECM_CLASSIFIER_DSCP_ENABLE=y in order to enable DSCP classifier.
# #############################################################################
@ -98,7 +98,7 @@ Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
ecm-$(ECM_CLASSIFIER_DSCP_ENABLE) += ecm_classifier_dscp.o
ccflags-$(ECM_CLASSIFIER_DSCP_ENABLE) += -DECM_CLASSIFIER_DSCP_ENABLE
ccflags-$(ECM_CLASSIFIER_DSCP_IGS) += -DECM_CLASSIFIER_DSCP_IGS
@@ -334,7 +356,9 @@ ccflags-$(ECM_CLASSIFIER_HYFI_ENABLE) +=
@@ -318,7 +340,9 @@ ccflags-$(ECM_CLASSIFIER_HYFI_ENABLE) +=
# the Parental Controls subsystem classifier in ECM. Currently disabled until
# customers require it / if they need to integrate their Parental Controls with it.
# #############################################################################
@ -109,7 +109,7 @@ Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
ecm-$(ECM_CLASSIFIER_PCC_ENABLE) += ecm_classifier_pcc.o
ccflags-$(ECM_CLASSIFIER_PCC_ENABLE) += -DECM_CLASSIFIER_PCC_ENABLE
@@ -379,27 +403,36 @@ ccflags-$(ECM_NON_PORTED_SUPPORT_ENABLE)
@@ -367,27 +391,36 @@ ccflags-$(ECM_NON_PORTED_SUPPORT_ENABLE)
# #############################################################################
# Define ECM_STATE_OUTPUT_ENABLE=y to support XML state output
# #############################################################################
@ -149,7 +149,7 @@ Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
ccflags-$(ECM_TRACKER_DPI_SUPPORT_ENABLE) += -DECM_TRACKER_DPI_SUPPORT_ENABLE
# #############################################################################
@@ -407,14 +440,18 @@ ccflags-$(ECM_TRACKER_DPI_SUPPORT_ENABLE
@@ -395,14 +428,18 @@ ccflags-$(ECM_TRACKER_DPI_SUPPORT_ENABLE
# support for the database keeping lists of connections that are assigned
# on a per TYPE of classifier basis.
# #############################################################################

View File

@ -15,7 +15,7 @@
+EXPORT_SYMBOL(ecm_nss_ipv4_is_conn_limit_reached);
--- a/frontends/nss/ecm_nss_non_ported_ipv4.c
+++ b/frontends/nss/ecm_nss_non_ported_ipv4.c
@@ -1831,6 +1831,7 @@ struct ecm_front_end_connection_instance
@@ -1847,6 +1847,7 @@ struct ecm_front_end_connection_instance
return feci;
}

View File

@ -1,14 +1,14 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=qca-ssdk-shell
PKG_RELEASE:=2
PKG_RELEASE:=3
PKG_SOURCE_URL:=https://git.codelinaro.org/clo/qsdk/oss/ssdk-shell.git
PKG_SOURCE_PROTO:=git
PKG_SOURCE_DATE:=2023-11-27
PKG_SOURCE_VERSION:=0a70480
PKG_MIRROR_HASH:=0aa66dce0a42259b319a9005437baab44cbc4a2e94ee5cda7c7bf9f535c65f51
QSDK_VERSION:=12.5.r2
PKG_SOURCE_DATE:=2024-05-06
PKG_SOURCE_VERSION:=83c1a4a
PKG_MIRROR_HASH:=527801f679ea4b544eada6a5e8f581f472b76a8e1ecd6e38bd6271108250bafd
QSDK_VERSION:=12.5
PKG_VERSION:=$(QSDK_VERSION)-$(PKG_SOURCE_DATE)-$(PKG_SOURCE_VERSION)
include $(INCLUDE_DIR)/kernel.mk

View File

@ -1,11 +0,0 @@
--- a/src/fal_uk/fal_port_ctrl.c
+++ b/src/fal_uk/fal_port_ctrl.c
@@ -214,7 +214,7 @@ fal_port_hibernate_get(a_uint32_t dev_id
sw_error_t
fal_port_cdt(a_uint32_t dev_id, fal_port_t port_id, a_uint32_t mdi_pair,
- a_uint32_t *cable_status, a_uint32_t *cable_len)
+ fal_cable_status_t * cable_status, a_uint32_t *cable_len)
{
sw_error_t rv;

View File

@ -54,7 +54,7 @@
if (SW_OK == rv)
--- a/src/shell/shell_io.c
+++ b/src/shell/shell_io.c
@@ -11806,15 +11806,7 @@ static void
@@ -11835,15 +11835,7 @@ static void
_cmd_collect_shell_cfg(ssdk_cfg_t *shell_cfg)
{
memset(shell_cfg, 0, sizeof(ssdk_cfg_t));
@ -70,7 +70,7 @@
#ifdef VERSION
aos_mem_copy(shell_cfg->build_ver, VERSION, sizeof(VERSION));
@@ -11881,7 +11873,7 @@ _cmd_collect_shell_cfg(ssdk_cfg_t *shell
@@ -11910,7 +11902,7 @@ _cmd_collect_shell_cfg(ssdk_cfg_t *shell
static void
_cmd_data_print_cfg(ssdk_cfg_t *entry)
{
@ -79,7 +79,7 @@
dprintf("[build verison]:%-10s [build date]:%s\n", entry->build_ver, entry->build_date);
dprintf("[chip type]:%-14s [arch]:%-12s [os]:%s\n", entry->chip_type, entry->cpu_type, entry->os_info);
@@ -11892,10 +11884,8 @@ _cmd_data_print_cfg(ssdk_cfg_t *entry)
@@ -11921,10 +11913,8 @@ _cmd_data_print_cfg(ssdk_cfg_t *entry)
cmd_cpu_mode(init->cpu_mode), cmd_access_mode(init->reg_mode),
init->nl_prot);
/*qca808x_end*/

View File

@ -1,6 +1,6 @@
--- a/src/shell/shell_io.c
+++ b/src/shell/shell_io.c
@@ -40876,7 +40876,7 @@ sw_error_t
@@ -40905,7 +40905,7 @@ sw_error_t
cmd_data_check_tunnel_flags_parser(char *cmd_str, void * val, a_uint32_t size)
{
char *cmd;