From 501e59f90a79900b8ade178e7ed8af7e80f8079c Mon Sep 17 00:00:00 2001 From: Dmitry Ermakov Date: Sun, 29 Jan 2023 23:19:49 +0300 Subject: [PATCH] [GK710x] Fix osdrv paths (#624) --- .../patches/0000-gk710x-kernel-3.4.43.patch | 2 +- .../goke-osdrv-gk710x/goke-osdrv-gk710x.mk | 16 ++++++++++++---- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/br-ext-chip-goke/board/gk710x/kernel/patches/0000-gk710x-kernel-3.4.43.patch b/br-ext-chip-goke/board/gk710x/kernel/patches/0000-gk710x-kernel-3.4.43.patch index 03c38e78..72dfe8fb 100644 --- a/br-ext-chip-goke/board/gk710x/kernel/patches/0000-gk710x-kernel-3.4.43.patch +++ b/br-ext-chip-goke/board/gk710x/kernel/patches/0000-gk710x-kernel-3.4.43.patch @@ -298833,7 +298833,7 @@ index 6f8fbcf1..7d89860d 100644 MODULE_ARCH_VERMAGIC - +#else -+#define VERMAGIC_STRING "3.4.43-Goke" ++#define VERMAGIC_STRING UTS_RELEASE +#endif diff --git a/net/ipv4/ipconfig.c b/net/ipv4/ipconfig.c index 92ac7e73..924f357f 100644 diff --git a/general/package/goke-osdrv-gk710x/goke-osdrv-gk710x.mk b/general/package/goke-osdrv-gk710x/goke-osdrv-gk710x.mk index 4fd3f88d..ae53e71a 100644 --- a/general/package/goke-osdrv-gk710x/goke-osdrv-gk710x.mk +++ b/general/package/goke-osdrv-gk710x/goke-osdrv-gk710x.mk @@ -9,6 +9,14 @@ GOKE_OSDRV_GK710X_SITE = GOKE_OSDRV_GK710X_LICENSE = MIT GOKE_OSDRV_GK710X_LICENSE_FILES = LICENSE +CHIP := $(shell echo $(BOARD) | cut -d "_" -f 1) + +ifeq ($(CHIP),gk7102) + FIRMWARE=gk_fw_710x.bin +else ifeq ($(CHIP),gk7102s) + FIRMWARE=gk_fw_710xs.bin +endif + define GOKE_OSDRV_GK710X_INSTALL_TARGET_CMDS $(INSTALL) -m 755 -d $(TARGET_DIR)/etc/init.d $(INSTALL) -m 755 -t $(TARGET_DIR)/etc/init.d $(BR2_EXTERNAL_GOKE_PATH)/package/goke-osdrv-gk710x/files/script/S95goke @@ -18,11 +26,11 @@ define GOKE_OSDRV_GK710X_INSTALL_TARGET_CMDS $(INSTALL) -m 644 -t $(TARGET_DIR)/etc/sensors $(BR2_EXTERNAL_GOKE_PATH)/package/goke-osdrv-gk710x/files/sensor/config/sc1135.bin $(INSTALL) -m 755 -d $(TARGET_DIR)/lib/firmware - $(INSTALL) -m 644 -t $(TARGET_DIR)/lib/firmware $(BR2_EXTERNAL_GOKE_PATH)/package/goke-osdrv-gk710x/files/sensor/fw/*.bin + $(INSTALL) -m 644 -t $(TARGET_DIR)/lib/firmware $(BR2_EXTERNAL_GOKE_PATH)/package/goke-osdrv-gk710x/files/sensor/fw/$(FIRMWARE) - $(INSTALL) -m 755 -d $(TARGET_DIR)/lib/modules/3.4.43-Goke/goke - $(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/3.4.43-Goke/goke $(BR2_EXTERNAL_GOKE_PATH)/package/goke-osdrv-gk710x/files/kmod/*.ko - $(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/3.4.43-Goke/goke $(BR2_EXTERNAL_GOKE_PATH)/package/goke-osdrv-gk710x/files/sensor/*.ko + $(INSTALL) -m 755 -d $(TARGET_DIR)/lib/modules/3.4.43-gk/goke + $(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/3.4.43-gk/goke $(BR2_EXTERNAL_GOKE_PATH)/package/goke-osdrv-gk710x/files/kmod/*.ko + $(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/3.4.43-gk/goke $(BR2_EXTERNAL_GOKE_PATH)/package/goke-osdrv-gk710x/files/sensor/*.ko $(INSTALL) -m 755 -d $(TARGET_DIR)/usr/bin $(INSTALL) -m 755 -t $(TARGET_DIR)/usr/bin $(BR2_EXTERNAL_GOKE_PATH)/package/goke-osdrv-gk710x/files/script/load_*