him411/nss-packages-breeze303
1
0
Fork 0
mirror of https://github.com/breeze303/nss-packages.git synced 2025-12-16 08:44:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

ssdk-shell: bump 12.0.5 to match ssdk 12.4.r4

Browse Source 
Signed-off-by: Sean Khan <datapronix@protonmail.com>
This commit is contained in:
Sean Khan 2024-04-13 15:49:49 -04:00
parent 2151cf9df5
commit 2b4e3b2b37
2 changed files with 106 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
qca-ssdk-shell/Makefile
View File

@ -5,9 +5,11 @@ PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE_URL:=https://git.codelinaro.org/clo/qsdk/oss/ssdk-shell.git
PKG_SOURCE_PROTO:=git
PKG_SOURCE_DATE:=2022-06-09
PKG_SOURCE_VERSION:=0e1460b64a61355bebace6773070272610b12199
PKG_MIRROR_HASH:=b08dfd1a2e70660a900080a781c1ad074d3121255d97808569d22cbc3934dc16
PKG_SOURCE_DATE:= 2023-10-23
PKG_SOURCE_VERSION:=001660c
PKG_MIRROR_HASH:=85a4288ea742a9f9764756a57588a8d0735d61cbe015dff140722dbc3ef6c0e5
QSDK_VERSION:=12.4.r4
PKG_VERSION:=$(QSDK_VERSION)-$(PKG_SOURCE_DATE)-$(PKG_SOURCE_VERSION)
include $(INCLUDE_DIR)/kernel.mk
include $(INCLUDE_DIR)/package.mk
@ -35,6 +37,8 @@ QCASSDK_CONFIG_OPTS+= TOOL_PATH=$(CONFIG_TOOLCHAIN_BIN_PATH) \
LDFLAGS="$(TARGET_LDFLAGS)" \
ARCH=$(LINUX_KARCH)
# TARGET_CFLAGS := $(filter-out -O%,$(TARGET_CFLAGS)) -Os
define Build/Compile
$(MAKE) -C $(PKG_BUILD_DIR) $(PKG_JOBS) $(strip $(QCASSDK_CONFIG_OPTS))
endef

99
qca-ssdk-shell/patches/0002-qca-ssdk-shell-fix-ioctl-segfault.patch Normal file
View File

@ -0,0 +1,99 @@
Index: qca-ssdk-shell-12.4.5.r5-2023-12-06-f07a66e/include/init/ssdk_init.h
===================================================================
--- qca-ssdk-shell-12.4.5.r5-2023-12-06-f07a66e.orig/include/init/ssdk_init.h
+++ qca-ssdk-shell-12.4.5.r5-2023-12-06-f07a66e/include/init/ssdk_init.h
@@ -33,8 +33,6 @@ extern "C" {
#define SSDK_MAX_VIRTUAL_PORT_NUM \
(SSDK_MAX_VIRTUAL_PORT_ID-SSDK_MIN_VIRTUAL_PORT_ID+1)
-#define IOCTL_COMPAT
-
/*qca808x_start*/
typedef enum {
HSL_MDIO = 1,
@@ -267,17 +265,6 @@ typedef struct
a_bool_t in_interfacectrl;
} ssdk_features;
/*qca808x_start*/
-#ifdef IOCTL_COMPAT
- typedef struct
- {
- hsl_init_mode cpu_mode;
- hsl_access_mode reg_mode;
- ssdk_chip_type chip_type;
- a_uint32_t chip_revision;
- a_uint32_t nl_prot;
- } ssdk_init_cfg_us;
-#endif
-
#define CFG_STR_SIZE 20
typedef struct
{
@@ -294,11 +281,7 @@ typedef struct
/*qca808x_end*/
ssdk_features features;
/*qca808x_start*/
-#ifdef IOCTL_COMPAT
- ssdk_init_cfg_us init_cfg;
-#else
ssdk_init_cfg init_cfg;
-#endif
} ssdk_cfg_t;
sw_error_t
ssdk_init(a_uint32_t dev_id, ssdk_init_cfg *cfg);
Index: qca-ssdk-shell-12.4.5.r5-2023-12-06-f07a66e/src/shell/shell.c
===================================================================
--- qca-ssdk-shell-12.4.5.r5-2023-12-06-f07a66e.orig/src/shell/shell.c
+++ qca-ssdk-shell-12.4.5.r5-2023-12-06-f07a66e/src/shell/shell.c
@@ -615,10 +615,8 @@ cmd_socket_init(int dev_id)
#endif
init_cfg.chip_type=CHIP_UNSPECIFIED;
/*qca808x_end*/
-#ifndef IOCTL_COMPAT
init_cfg.reg_func.mdio_set = NULL;
init_cfg.reg_func.mdio_get = NULL;
-#endif
/*qca808x_start*/
rv = ssdk_init(dev_id, &init_cfg);
if (SW_OK == rv)
Index: qca-ssdk-shell-12.4.5.r5-2023-12-06-f07a66e/src/shell/shell_io.c
===================================================================
--- qca-ssdk-shell-12.4.5.r5-2023-12-06-f07a66e.orig/src/shell/shell_io.c
+++ qca-ssdk-shell-12.4.5.r5-2023-12-06-f07a66e/src/shell/shell_io.c
@@ -11513,15 +11513,7 @@ static void
_cmd_collect_shell_cfg(ssdk_cfg_t *shell_cfg)
{
memset(shell_cfg, 0, sizeof(ssdk_cfg_t));
-#ifdef IOCTL_COMPAT
- shell_cfg->init_cfg.cpu_mode = init_cfg.cpu_mode;
- shell_cfg->init_cfg.reg_mode = init_cfg.reg_mode;
- shell_cfg->init_cfg.chip_type = init_cfg.chip_type;
- shell_cfg->init_cfg.chip_revision = init_cfg.chip_revision;
- shell_cfg->init_cfg.nl_prot = init_cfg.nl_prot;
-#else
shell_cfg->init_cfg = init_cfg;
-#endif
#ifdef VERSION
aos_mem_copy(shell_cfg->build_ver, VERSION, sizeof(VERSION));
@@ -11588,7 +11580,7 @@ _cmd_collect_shell_cfg(ssdk_cfg_t *shell
static void
_cmd_data_print_cfg(ssdk_cfg_t *entry)
{
- ssdk_init_cfg_us *init = &(entry->init_cfg);
+ ssdk_init_cfg *init = &(entry->init_cfg);
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);
@@ -11599,10 +11591,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*/
-#if 0
-dprintf("[inf defined]:mdio_set(%s) mdio_get(%s) header_reg_set(%s) header_reg_get(%s)\n",
+ dprintf("[inf defined]:mdio_set(%s) mdio_get(%s) header_reg_set(%s) header_reg_get(%s)\n",
DEFINED2STR(mdio_set), DEFINED2STR(mdio_get), DEFINED2STR(header_reg_set), DEFINED2STR(header_reg_get));
-#endif
/*qca808x_start*/
}