From f36f14d88039e02e213a361508cb345ae9f19c51 Mon Sep 17 00:00:00 2001 From: Dmitry Ilyin Date: Mon, 22 Aug 2022 18:46:29 +0300 Subject: [PATCH] Bump hisilicon-opensdk (+mipi_rx) and use modprobe everywhere --- .../files/script/load_goke | 30 +++++++++---------- .../goke-osdrv-gk7205v200.mk | 2 +- .../hisilicon-opensdk/hisilicon-opensdk.mk | 2 +- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/general/package/goke-osdrv-gk7205v200/files/script/load_goke b/general/package/goke-osdrv-gk7205v200/files/script/load_goke index 7e7c013c..b862d2cf 100755 --- a/general/package/goke-osdrv-gk7205v200/files/script/load_goke +++ b/general/package/goke-osdrv-gk7205v200/files/script/load_goke @@ -84,19 +84,19 @@ insert_osal() { MMZ=$(awk -F '=' '$1=="mmz"{print $2}' RS=" " /proc/cmdline) if [ -z "$MMZ" ]; then - insmod ../extra/open_osal.ko anony=1 mmz_allocator=gk mmz=anonymous,0,$mmz_start,$mmz_size || report_error + modprobe open_osal anony=1 mmz_allocator=gk mmz=anonymous,0,$mmz_start,$mmz_size || report_error else - insmod ../extra/open_osal.ko anony=1 mmz_allocator=cma mmz=$MMZ || report_error + modprobe open_osal anony=1 mmz_allocator=cma mmz=$MMZ || report_error fi } insert_detect() { - insmod ../extra/open_sys_config.ko chip=$CHIP_TYPE sensors=unknown g_cmos_yuv_flag=$YUV_TYPE0 board=$BOARD + modprobe open_sys_config chip=$CHIP_TYPE sensors=unknown g_cmos_yuv_flag=$YUV_TYPE0 board=$BOARD insert_osal insmod gk7205v200_base.ko - insmod ../extra/open_isp.ko - insmod ../extra/open_sensor_i2c.ko - insmod ../extra/open_sensor_spi.ko + modprobe open_isp + modprobe open_sensor_i2c + modprobe open_sensor_spi } remove_detect() { @@ -129,7 +129,7 @@ remove_audio() { } insert_isp() { - insmod ../extra/open_isp.ko + modprobe open_isp } insert_sil9024() { @@ -156,12 +156,12 @@ insert_adv7179() { insert_isp_piris() { if [ "$CHIP_TYPE" == "gk7605v100" -a "$BOARD" == "demo" ]; then - insmod ../extra/open_piris.ko + modprobe open_piris fi } insert_ko() { - insmod ../extra/open_sys_config.ko chip=$CHIP_TYPE sensors=$SENSOR g_cmos_yuv_flag=$YUV_TYPE0 board=$BOARD + modprobe open_sys_config chip=$CHIP_TYPE sensors=$SENSOR g_cmos_yuv_flag=$YUV_TYPE0 board=$BOARD insert_osal insmod gk7205v200_base.ko insmod gk7205v200_sys.ko @@ -181,22 +181,22 @@ insert_ko() { insmod gk7205v200_h265e.ko insmod gk7205v200_jpege.ko insmod gk7205v200_ive.ko save_power=0 - insmod ../extra/open_pwm.ko - insmod ../extra/open_sensor_i2c.ko - insmod ../extra/open_sensor_spi.ko + modprobe open_pwm + modprobe open_sensor_i2c + modprobe open_sensor_spi # insert_isp_piris # unused on OpenIPC # insert_sil9024; # unused on OpenIPC # BT1120 insert_audio - insmod mipi_rx.ko + modprobe open_mipi_rx # insmod gk7205v200_pm.ko # unused on OpenIPC - insmod ../extra/open_wdt.ko + modprobe open_wdt } remove_ko() { rmmod -w open_wdt # rmmod -w gk7205v200_pm # unused on OpenIPC remove_audio - rmmod -w mipi_rx + rmmod -w open_mipi_rx # rmmod -w open_piris # unused on OpenIPC # rmmod -w sil9024 &> /dev/null # unused on OpenIPC rmmod -w gk7205v200_ive diff --git a/general/package/goke-osdrv-gk7205v200/goke-osdrv-gk7205v200.mk b/general/package/goke-osdrv-gk7205v200/goke-osdrv-gk7205v200.mk index 1adae5e8..272eb09e 100644 --- a/general/package/goke-osdrv-gk7205v200/goke-osdrv-gk7205v200.mk +++ b/general/package/goke-osdrv-gk7205v200/goke-osdrv-gk7205v200.mk @@ -73,7 +73,7 @@ define GOKE_OSDRV_GK7205V200_INSTALL_TARGET_CMDS ### $(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/$(LINUX_VERSION_PROBED)/goke $(BR2_EXTERNAL_GOKE_PATH)/package/goke-osdrv-gk7205v200/files/kmod/isp_sample_ist.ko ### $(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/$(LINUX_VERSION_PROBED)/goke $(BR2_EXTERNAL_GOKE_PATH)/package/goke-osdrv-gk7205v200/files/kmod/isp_sensor_i2c.ko ### $(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/$(LINUX_VERSION_PROBED)/goke $(BR2_EXTERNAL_GOKE_PATH)/package/goke-osdrv-gk7205v200/files/kmod/isp_sensor_spi.ko - $(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/$(LINUX_VERSION_PROBED)/goke $(BR2_EXTERNAL_GOKE_PATH)/package/goke-osdrv-gk7205v200/files/kmod/mipi_rx.ko + ### $(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/$(LINUX_VERSION_PROBED)/goke $(BR2_EXTERNAL_GOKE_PATH)/package/goke-osdrv-gk7205v200/files/kmod/mipi_rx.ko ### $(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/$(LINUX_VERSION_PROBED)/goke $(BR2_EXTERNAL_GOKE_PATH)/package/goke-osdrv-gk7205v200/files/kmod/osal.ko ## $(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/$(LINUX_VERSION_PROBED)/goke $(BR2_EXTERNAL_GOKE_PATH)/package/goke-osdrv-gk7205v200/files/kmod/ssp_ota5182_ex.ko ## $(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/$(LINUX_VERSION_PROBED)/goke $(BR2_EXTERNAL_GOKE_PATH)/package/goke-osdrv-gk7205v200/files/kmod/ssp_st7789_ex.ko diff --git a/general/package/hisilicon-opensdk/hisilicon-opensdk.mk b/general/package/hisilicon-opensdk/hisilicon-opensdk.mk index bb54f10b..c29b37b4 100644 --- a/general/package/hisilicon-opensdk/hisilicon-opensdk.mk +++ b/general/package/hisilicon-opensdk/hisilicon-opensdk.mk @@ -4,7 +4,7 @@ # ################################################################################ -HISILICON_OPENSDK_VERSION = 6b1e33444bd044252fed702b0eee8e5375ea8c6e +HISILICON_OPENSDK_VERSION = a768b49b7540cb564891c3577071446acb8ac7c3 HISILICON_OPENSDK_SITE = $(call github,openipc,openhisilicon,$(HISILICON_OPENSDK_VERSION)) HISILICON_OPENSDK_LICENSE = GPL-3.0 HISILICON_OPENSDK_LICENSE_FILES = LICENSE