diff --git a/br-ext-chip-ingenic/configs/t10_lite_defconfig b/br-ext-chip-ingenic/configs/t10_lite_defconfig
index b27dbd6a..f46253c2 100644
--- a/br-ext-chip-ingenic/configs/t10_lite_defconfig
+++ b/br-ext-chip-ingenic/configs/t10_lite_defconfig
@@ -37,6 +37,7 @@ BR2_LINUX_KERNEL_LZMA=y
 BR2_OPENIPC_SOC_VENDOR="ingenic"
 BR2_OPENIPC_SOC_MODEL="t10"
 BR2_OPENIPC_SOC_FAMILY="t20"
+BR2_OPENIPC_SNS_MODEL=""
 BR2_OPENIPC_FLAVOR="lite"
 BR2_OPENIPC_FLASH_SIZE="8"
 
diff --git a/br-ext-chip-ingenic/configs/t20_lite_defconfig b/br-ext-chip-ingenic/configs/t20_lite_defconfig
index 82c359f6..2d3bca9f 100644
--- a/br-ext-chip-ingenic/configs/t20_lite_defconfig
+++ b/br-ext-chip-ingenic/configs/t20_lite_defconfig
@@ -37,6 +37,7 @@ BR2_LINUX_KERNEL_LZMA=y
 BR2_OPENIPC_SOC_VENDOR="ingenic"
 BR2_OPENIPC_SOC_MODEL="t20"
 BR2_OPENIPC_SOC_FAMILY="t20"
+BR2_OPENIPC_SNS_MODEL=""
 BR2_OPENIPC_FLAVOR="lite"
 BR2_OPENIPC_FLASH_SIZE="8"
 
diff --git a/br-ext-chip-ingenic/configs/t20_ultimate_defconfig b/br-ext-chip-ingenic/configs/t20_ultimate_defconfig
index c85610b6..e8e23ca7 100644
--- a/br-ext-chip-ingenic/configs/t20_ultimate_defconfig
+++ b/br-ext-chip-ingenic/configs/t20_ultimate_defconfig
@@ -37,6 +37,7 @@ BR2_LINUX_KERNEL_LZMA=y
 BR2_OPENIPC_SOC_VENDOR="ingenic"
 BR2_OPENIPC_SOC_MODEL="t20"
 BR2_OPENIPC_SOC_FAMILY="t20"
+BR2_OPENIPC_SNS_MODEL=""
 BR2_OPENIPC_FLAVOR="ultimate"
 BR2_OPENIPC_FLASH_SIZE="16"
 
diff --git a/br-ext-chip-ingenic/configs/t21_lite_defconfig b/br-ext-chip-ingenic/configs/t21_lite_defconfig
index 23441a8a..0148c033 100644
--- a/br-ext-chip-ingenic/configs/t21_lite_defconfig
+++ b/br-ext-chip-ingenic/configs/t21_lite_defconfig
@@ -37,6 +37,7 @@ BR2_LINUX_KERNEL_LZMA=y
 BR2_OPENIPC_SOC_VENDOR="ingenic"
 BR2_OPENIPC_SOC_MODEL="t21"
 BR2_OPENIPC_SOC_FAMILY="t21"
+BR2_OPENIPC_SNS_MODEL=""
 BR2_OPENIPC_FLAVOR="lite"
 BR2_OPENIPC_FLASH_SIZE="8"
 
diff --git a/br-ext-chip-ingenic/configs/t21_ultimate_defconfig b/br-ext-chip-ingenic/configs/t21_ultimate_defconfig
index 3e37fb85..cbdefdd8 100644
--- a/br-ext-chip-ingenic/configs/t21_ultimate_defconfig
+++ b/br-ext-chip-ingenic/configs/t21_ultimate_defconfig
@@ -37,6 +37,7 @@ BR2_LINUX_KERNEL_LZMA=y
 BR2_OPENIPC_SOC_VENDOR="ingenic"
 BR2_OPENIPC_SOC_MODEL="t21"
 BR2_OPENIPC_SOC_FAMILY="t21"
+BR2_OPENIPC_SNS_MODEL=""
 BR2_OPENIPC_FLAVOR="ultimate"
 BR2_OPENIPC_FLASH_SIZE="16"
 
diff --git a/br-ext-chip-ingenic/configs/t30_lite_defconfig b/br-ext-chip-ingenic/configs/t30_lite_defconfig
index fcda5dbb..535de0d0 100644
--- a/br-ext-chip-ingenic/configs/t30_lite_defconfig
+++ b/br-ext-chip-ingenic/configs/t30_lite_defconfig
@@ -37,6 +37,7 @@ BR2_LINUX_KERNEL_LZMA=y
 BR2_OPENIPC_SOC_VENDOR="ingenic"
 BR2_OPENIPC_SOC_MODEL="t30"
 BR2_OPENIPC_SOC_FAMILY="t21"
+BR2_OPENIPC_SNS_MODEL=""
 BR2_OPENIPC_FLAVOR="lite"
 BR2_OPENIPC_FLASH_SIZE="8"
 
diff --git a/br-ext-chip-ingenic/configs/t31_fpv_defconfig b/br-ext-chip-ingenic/configs/t31_fpv_defconfig
index 7d458fbe..78bb68c0 100644
--- a/br-ext-chip-ingenic/configs/t31_fpv_defconfig
+++ b/br-ext-chip-ingenic/configs/t31_fpv_defconfig
@@ -37,6 +37,7 @@ BR2_LINUX_KERNEL_LZMA=y
 BR2_OPENIPC_SOC_VENDOR="ingenic"
 BR2_OPENIPC_SOC_MODEL="t31"
 BR2_OPENIPC_SOC_FAMILY="t31"
+BR2_OPENIPC_SNS_MODEL=""
 BR2_OPENIPC_FLAVOR="fpv"
 BR2_OPENIPC_FLASH_SIZE="8"
 
diff --git a/br-ext-chip-ingenic/configs/t31_lite_defconfig b/br-ext-chip-ingenic/configs/t31_lite_defconfig
index d85f1878..8b36161a 100644
--- a/br-ext-chip-ingenic/configs/t31_lite_defconfig
+++ b/br-ext-chip-ingenic/configs/t31_lite_defconfig
@@ -37,6 +37,7 @@ BR2_LINUX_KERNEL_LZMA=y
 BR2_OPENIPC_SOC_VENDOR="ingenic"
 BR2_OPENIPC_SOC_MODEL="t31"
 BR2_OPENIPC_SOC_FAMILY="t31"
+BR2_OPENIPC_SNS_MODEL=""
 BR2_OPENIPC_FLAVOR="lite"
 BR2_OPENIPC_FLASH_SIZE="8"
 
diff --git a/br-ext-chip-ingenic/configs/t31_ultimate_defconfig b/br-ext-chip-ingenic/configs/t31_ultimate_defconfig
index 3546bd43..2600927f 100644
--- a/br-ext-chip-ingenic/configs/t31_ultimate_defconfig
+++ b/br-ext-chip-ingenic/configs/t31_ultimate_defconfig
@@ -37,6 +37,7 @@ BR2_LINUX_KERNEL_LZMA=y
 BR2_OPENIPC_SOC_VENDOR="ingenic"
 BR2_OPENIPC_SOC_MODEL="t31"
 BR2_OPENIPC_SOC_FAMILY="t31"
+BR2_OPENIPC_SNS_MODEL=""
 BR2_OPENIPC_FLAVOR="ultimate"
 BR2_OPENIPC_FLASH_SIZE="16"
 
diff --git a/br-ext-chip-ingenic/configs/t40_lite_defconfig b/br-ext-chip-ingenic/configs/t40_lite_defconfig
index 6f1db05d..e679fe2d 100644
--- a/br-ext-chip-ingenic/configs/t40_lite_defconfig
+++ b/br-ext-chip-ingenic/configs/t40_lite_defconfig
@@ -37,6 +37,7 @@ BR2_LINUX_KERNEL_LZMA=y
 BR2_OPENIPC_SOC_VENDOR="ingenic"
 BR2_OPENIPC_SOC_MODEL="t40"
 BR2_OPENIPC_SOC_FAMILY="t40"
+BR2_OPENIPC_SNS_MODEL=""
 BR2_OPENIPC_FLAVOR="lite"
 BR2_OPENIPC_FLASH_SIZE="8"
 
diff --git a/br-ext-chip-ingenic/configs/t40_ultimate_defconfig b/br-ext-chip-ingenic/configs/t40_ultimate_defconfig
index a50d2c2a..63303315 100644
--- a/br-ext-chip-ingenic/configs/t40_ultimate_defconfig
+++ b/br-ext-chip-ingenic/configs/t40_ultimate_defconfig
@@ -37,6 +37,7 @@ BR2_LINUX_KERNEL_LZMA=y
 BR2_OPENIPC_SOC_VENDOR="ingenic"
 BR2_OPENIPC_SOC_MODEL="t40"
 BR2_OPENIPC_SOC_FAMILY="t40"
+BR2_OPENIPC_SNS_MODEL=""
 BR2_OPENIPC_FLAVOR="ultimate"
 BR2_OPENIPC_FLASH_SIZE="16"
 
diff --git a/general/Config.in b/general/Config.in
index f50f8e7a..e4cddeed 100644
--- a/general/Config.in
+++ b/general/Config.in
@@ -10,6 +10,10 @@ config BR2_OPENIPC_SOC_FAMILY
 	string "SoC family"
 	default "hi3516ev200"
 
+config BR2_OPENIPC_SNS_MODEL
+        string "Sensor model"
+        default ""
+
 config BR2_OPENIPC_FLAVOR
 	string "OpenIPC flavor"
 	default "lite"
diff --git a/general/external.mk b/general/external.mk
index a4658fab..3014445c 100644
--- a/general/external.mk
+++ b/general/external.mk
@@ -1,6 +1,7 @@
 export OPENIPC_SOC_VENDOR := $(call qstrip,$(BR2_OPENIPC_SOC_VENDOR))
 export OPENIPC_SOC_MODEL := $(call qstrip,$(BR2_OPENIPC_SOC_MODEL))
 export OPENIPC_SOC_FAMILY := $(call qstrip,$(BR2_OPENIPC_SOC_FAMILY))
+export OPENIPC_SNS_MODEL := $(call qstrip,$(BR2_OPENIPC_SNS_MODEL))
 export OPENIPC_FLAVOR := $(call qstrip,$(BR2_OPENIPC_FLAVOR))
 
 EXTERNAL_VENDOR := $(BR2_EXTERNAL)/../br-ext-chip-$(OPENIPC_SOC_VENDOR)
diff --git a/general/package/ingenic-opensdk/ingenic-opensdk.mk b/general/package/ingenic-opensdk/ingenic-opensdk.mk
index f5c39320..bee33371 100644
--- a/general/package/ingenic-opensdk/ingenic-opensdk.mk
+++ b/general/package/ingenic-opensdk/ingenic-opensdk.mk
@@ -13,6 +13,7 @@ INGENIC_OPENSDK_LICENSE_FILES = LICENSE
 INGENIC_OPENSDK_MODULE_SUBDIRS = kernel
 INGENIC_OPENSDK_MODULE_MAKE_OPTS = \
 	SOC=$(OPENIPC_SOC_MODEL) \
+	SNS=$(OPENIPC_SNS_MODEL) \
 	INSTALL_MOD_PATH=$(TARGET_DIR) \
 	INSTALL_MOD_DIR=ingenic
 
diff --git a/general/package/ingenic-osdrv-t20/ingenic-osdrv-t20.mk b/general/package/ingenic-osdrv-t20/ingenic-osdrv-t20.mk
index 300544cc..9cd30902 100644
--- a/general/package/ingenic-osdrv-t20/ingenic-osdrv-t20.mk
+++ b/general/package/ingenic-osdrv-t20/ingenic-osdrv-t20.mk
@@ -9,6 +9,7 @@ INGENIC_OSDRV_T20_SITE =
 INGENIC_OSDRV_T20_LICENSE = MIT
 INGENIC_OSDRV_T20_LICENSE_FILES = LICENSE
 
+ifeq ($(OPENIPC_SNS_MODEL),)
 define INGENIC_OSDRV_T20_INSTALL_TARGET_CMDS
 	$(INSTALL) -m 755 -d $(TARGET_DIR)/etc/sensor
 	$(INSTALL) -m 644 -t $(TARGET_DIR)/etc/sensor $(INGENIC_OSDRV_T20_PKGDIR)/files/sensor/*.yaml
@@ -27,5 +28,18 @@ define INGENIC_OSDRV_T20_INSTALL_TARGET_CMDS
 	$(INSTALL) -m 755 -d $(TARGET_DIR)/usr/lib
 	$(INSTALL) -m 644 -t $(TARGET_DIR)/usr/lib/ $(INGENIC_OSDRV_T20_PKGDIR)/files/lib/*.so
 endef
+else
+define INGENIC_OSDRV_T20_INSTALL_TARGET_CMDS
+	$(INSTALL) -m 755 -d $(TARGET_DIR)/etc/sensor
+	$(INSTALL) -m 644 -t $(TARGET_DIR)/etc/sensor $(INGENIC_OSDRV_T20_PKGDIR)/files/sensor/$(OPENIPC_SNS_MODEL).yaml
+	$(INSTALL) -m 644 -t $(TARGET_DIR)/etc/sensor $(INGENIC_OSDRV_T20_PKGDIR)/files/sensor/params/*$(OPENIPC_SNS_MODEL).bin
+
+	$(INSTALL) -m 755 -d $(TARGET_DIR)/usr/bin
+	$(INSTALL) -m 755 -t $(TARGET_DIR)/usr/bin $(INGENIC_OSDRV_T20_PKGDIR)/files/script/load*
+
+	$(INSTALL) -m 755 -d $(TARGET_DIR)/usr/lib
+	$(INSTALL) -m 644 -t $(TARGET_DIR)/usr/lib/ $(INGENIC_OSDRV_T20_PKGDIR)/files/lib/*.so
+endef
+endif
 
 $(eval $(generic-package))
diff --git a/general/package/ingenic-osdrv-t21/ingenic-osdrv-t21.mk b/general/package/ingenic-osdrv-t21/ingenic-osdrv-t21.mk
index 34f32cbd..656545d5 100644
--- a/general/package/ingenic-osdrv-t21/ingenic-osdrv-t21.mk
+++ b/general/package/ingenic-osdrv-t21/ingenic-osdrv-t21.mk
@@ -9,6 +9,7 @@ INGENIC_OSDRV_T21_SITE =
 INGENIC_OSDRV_T21_LICENSE = MIT
 INGENIC_OSDRV_T21_LICENSE_FILES = LICENSE
 
+ifeq ($(OPENIPC_SNS_MODEL),)
 define INGENIC_OSDRV_T21_INSTALL_TARGET_CMDS
 	$(INSTALL) -m 755 -d $(TARGET_DIR)/etc/sensor
 	$(INSTALL) -m 644 -t $(TARGET_DIR)/etc/sensor $(INGENIC_OSDRV_T21_PKGDIR)/files/sensor/*.yaml
@@ -26,5 +27,18 @@ define INGENIC_OSDRV_T21_INSTALL_TARGET_CMDS
 	$(INSTALL) -m 755 -d $(TARGET_DIR)/usr/lib
 	$(INSTALL) -m 644 -t $(TARGET_DIR)/usr/lib $(INGENIC_OSDRV_T21_PKGDIR)/files/lib/*.so
 endef
+else
+define INGENIC_OSDRV_T21_INSTALL_TARGET_CMDS
+	$(INSTALL) -m 755 -d $(TARGET_DIR)/etc/sensor
+	$(INSTALL) -m 644 -t $(TARGET_DIR)/etc/sensor $(INGENIC_OSDRV_T21_PKGDIR)/files/sensor/$(OPENIPC_SNS_MODEL).yaml
+	$(INSTALL) -m 644 -t $(TARGET_DIR)/etc/sensor $(INGENIC_OSDRV_T21_PKGDIR)/files/sensor/params/$(OPENIPC_SNS_MODEL)-$(OPENIPC_SOC_MODEL).bin
+
+	$(INSTALL) -m 755 -d $(TARGET_DIR)/usr/bin
+	$(INSTALL) -m 755 -t $(TARGET_DIR)/usr/bin $(INGENIC_OSDRV_T21_PKGDIR)/files/script/load*
+
+	$(INSTALL) -m 755 -d $(TARGET_DIR)/usr/lib
+	$(INSTALL) -m 644 -t $(TARGET_DIR)/usr/lib $(INGENIC_OSDRV_T21_PKGDIR)/files/lib/*.so
+endef
+endif
 
 $(eval $(generic-package))
diff --git a/general/package/ingenic-osdrv-t30/Config.in b/general/package/ingenic-osdrv-t30/Config.in
index 01a54efa..3a01c71b 100644
--- a/general/package/ingenic-osdrv-t30/Config.in
+++ b/general/package/ingenic-osdrv-t30/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_INGENIC_OSDRV_T30
 	bool "ingenic-osdrv-t30"
+        select BR2_PACKAGE_INGENIC_OPENSDK
 	help
 	  ingenic-osdrv-t30 - Ingenic kernel modules and libs
 
diff --git a/general/package/ingenic-osdrv-t30/files/script/load_ingenic b/general/package/ingenic-osdrv-t30/files/script/load_ingenic
index a637c9cc..42a5d37d 100755
--- a/general/package/ingenic-osdrv-t30/files/script/load_ingenic
+++ b/general/package/ingenic-osdrv-t30/files/script/load_ingenic
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 KMOD_PATH=/lib/modules/$(uname -r)/ingenic
-SOC=$(ipcinfo -f || fw_printenv -n soc)
+SOC=$(fw_printenv -n soc)
 vendor=$(ipcinfo -v)
 
 if [ ! -f /usr/sbin/sensor_cli ]; then
@@ -22,14 +22,15 @@ check_return() {
 	fi
 }
 
-lsmod | grep "sinfo" >/dev/null
+lsmod | grep -q "sinfo"
 if [ $? -ne 0 ]; then
-	insmod ${KMOD_PATH/%\//}/sinfo.ko
-	check_return "insmod sinfo"
+	modprobe sinfo.ko
+	check_return "modprobe sinfo"
 fi
 
-if fw_printenv -n sensor >/dev/null; then
-	export SENSOR=$(fw_printenv -n sensor)
+SENSOR=$(fw_printenv -n sensor)
+if [ -n "$SENSOR" ]; then
+	export ${SENSOR}
 	log_vendor "Get data from environment and set SENSOR as ${SENSOR}"
 else
 	echo 1 >/proc/jz/sinfo/info
@@ -46,13 +47,11 @@ else
 	fi
 fi
 
-
 case ${SENSOR} in
-*)
-	ISP_PARAM=""
-	SENSOR_PARAM=""
-	break
-	;;
+	*)
+		ISP_PARAM=""
+		SENSOR_PARAM=""
+		;;
 esac
 
 echo --------------------
@@ -61,35 +60,20 @@ echo "SENSOR: ${SENSOR}"
 echo "SENSOR_PARAM: ${SENSOR_PARAM}"
 echo --------------------
 
-lsmod | grep "tx_isp" >/dev/null
+lsmod | grep -q "tx_isp"
 if [ $? -ne 0 ]; then
-	insmod ${KMOD_PATH/%\//}/tx-isp-${SOC}.ko ${ISP_PARAM}
-	check_return "insmod isp drv"
+	modprobe tx-isp-${SOC} ${ISP_PARAM}
+	check_return "modprobe isp drv"
 fi
 
-lsmod | grep ${SENSOR} >/dev/null
+lsmod | grep -q ${SENSOR}
 if [ $? -ne 0 ]; then
-	insmod ${KMOD_PATH/%\//}/sensor_${SENSOR}_${SOC}.ko ${SENSOR_PARAM}
-	check_return "insmod sensor drv"
+	modprobe sensor_${SENSOR}_${SOC} ${SENSOR_PARAM}
+	check_return "modprobe sensor drv"
 fi
 
-lsmod | grep "audio" >/dev/null
+lsmod | grep -q "audio"
 if [ $? -ne 0 ]; then
-	insmod ${KMOD_PATH/%\//}/audio.ko spk_gpio=-1
-	check_return "insmod audio"
-fi
-
-lsmod | grep "gpio" >/dev/null
-if [ $? -ne 0 ]; then
-	insmod ${KMOD_PATH/%\//}/gpio.ko
-	check_return "insmod gpio"
-fi
-
-if [ ! -z "$(lsmod | grep "gpio")" ]; then
-	GPIOS=".nightMode.irCutPin1 .nightMode.irCutPin2 .nightMode.irSensorPin .nightMode.backlightPin .audio.speakerPin"
-	for GPIO in $(echo ${GPIOS})
-	do
-	  G=$(cli -g ${GPIO})
-	  [ ! -z "${G}" ] && echo ${G} > /proc/gpio_claim/gpio
-	done
+	modprobe audio spk_gpio=-1
+	check_return "modprobe audio"
 fi
diff --git a/general/package/ingenic-osdrv-t30/ingenic-osdrv-t30.mk b/general/package/ingenic-osdrv-t30/ingenic-osdrv-t30.mk
index a20c1859..bcc260f8 100644
--- a/general/package/ingenic-osdrv-t30/ingenic-osdrv-t30.mk
+++ b/general/package/ingenic-osdrv-t30/ingenic-osdrv-t30.mk
@@ -9,109 +9,13 @@ INGENIC_OSDRV_T30_SITE =
 INGENIC_OSDRV_T30_LICENSE = MIT
 INGENIC_OSDRV_T30_LICENSE_FILES = LICENSE
 
+ifeq ($(OPENIPC_SNS_MODEL),)
 define INGENIC_OSDRV_T30_INSTALL_TARGET_CMDS
 	$(INSTALL) -m 755 -d $(TARGET_DIR)/etc/sensor
 	$(INSTALL) -m 644 -t $(TARGET_DIR)/etc/sensor $(INGENIC_OSDRV_T30_PKGDIR)/files/sensor/*.yaml
 
-	# $(INSTALL) -m 644 -t $(TARGET_DIR)/etc/sensor $(INGENIC_OSDRV_T30_PKGDIR)/files/sensor/params/bg0806.bin
-	# $(INSTALL) -m 644 -t $(TARGET_DIR)/etc/sensor $(INGENIC_OSDRV_T30_PKGDIR)/files/sensor/params/gc2023.bin
-	# $(INSTALL) -m 644 -t $(TARGET_DIR)/etc/sensor $(INGENIC_OSDRV_T30_PKGDIR)/files/sensor/params/gc2033.bin
-	# $(INSTALL) -m 644 -t $(TARGET_DIR)/etc/sensor $(INGENIC_OSDRV_T30_PKGDIR)/files/sensor/params/gc2053.bin
-	# $(INSTALL) -m 644 -t $(TARGET_DIR)/etc/sensor $(INGENIC_OSDRV_T30_PKGDIR)/files/sensor/params/imx291.bin
-	# $(INSTALL) -m 644 -t $(TARGET_DIR)/etc/sensor $(INGENIC_OSDRV_T30_PKGDIR)/files/sensor/params/imx307.bin
-	# $(INSTALL) -m 644 -t $(TARGET_DIR)/etc/sensor $(INGENIC_OSDRV_T30_PKGDIR)/files/sensor/params/imx323.bin
-	# $(INSTALL) -m 644 -t $(TARGET_DIR)/etc/sensor $(INGENIC_OSDRV_T30_PKGDIR)/files/sensor/params/imx335.bin
-	# $(INSTALL) -m 644 -t $(TARGET_DIR)/etc/sensor $(INGENIC_OSDRV_T30_PKGDIR)/files/sensor/params/jxf22.bin
-	# $(INSTALL) -m 644 -t $(TARGET_DIR)/etc/sensor $(INGENIC_OSDRV_T30_PKGDIR)/files/sensor/params/jxf23.bin
-	# $(INSTALL) -m 644 -t $(TARGET_DIR)/etc/sensor $(INGENIC_OSDRV_T30_PKGDIR)/files/sensor/params/jxh62.bin
-	# $(INSTALL) -m 644 -t $(TARGET_DIR)/etc/sensor $(INGENIC_OSDRV_T30_PKGDIR)/files/sensor/params/ncu_bg0806.bin
-	# $(INSTALL) -m 644 -t $(TARGET_DIR)/etc/sensor $(INGENIC_OSDRV_T30_PKGDIR)/files/sensor/params/ncu_gc2023.bin
-	# $(INSTALL) -m 644 -t $(TARGET_DIR)/etc/sensor $(INGENIC_OSDRV_T30_PKGDIR)/files/sensor/params/ncu_gc2033.bin
-	# $(INSTALL) -m 644 -t $(TARGET_DIR)/etc/sensor $(INGENIC_OSDRV_T30_PKGDIR)/files/sensor/params/ncu_gc2053.bin
-	# $(INSTALL) -m 644 -t $(TARGET_DIR)/etc/sensor $(INGENIC_OSDRV_T30_PKGDIR)/files/sensor/params/ncu_imx291.bin
-	# $(INSTALL) -m 644 -t $(TARGET_DIR)/etc/sensor $(INGENIC_OSDRV_T30_PKGDIR)/files/sensor/params/ncu_imx307.bin
-	# $(INSTALL) -m 644 -t $(TARGET_DIR)/etc/sensor $(INGENIC_OSDRV_T30_PKGDIR)/files/sensor/params/ncu_imx323.bin
-	# $(INSTALL) -m 644 -t $(TARGET_DIR)/etc/sensor $(INGENIC_OSDRV_T30_PKGDIR)/files/sensor/params/ncu_imx335.bin
-	# $(INSTALL) -m 644 -t $(TARGET_DIR)/etc/sensor $(INGENIC_OSDRV_T30_PKGDIR)/files/sensor/params/ncu_jxf22.bin
-	# $(INSTALL) -m 644 -t $(TARGET_DIR)/etc/sensor $(INGENIC_OSDRV_T30_PKGDIR)/files/sensor/params/ncu_jxf23.bin
-	# $(INSTALL) -m 644 -t $(TARGET_DIR)/etc/sensor $(INGENIC_OSDRV_T30_PKGDIR)/files/sensor/params/ncu_jxh62.bin
-	# $(INSTALL) -m 644 -t $(TARGET_DIR)/etc/sensor $(INGENIC_OSDRV_T30_PKGDIR)/files/sensor/params/ncu_os02b10.bin
-	# $(INSTALL) -m 644 -t $(TARGET_DIR)/etc/sensor $(INGENIC_OSDRV_T30_PKGDIR)/files/sensor/params/ncu_os05a10.bin
-	$(INSTALL) -m 644 -t $(TARGET_DIR)/etc/sensor $(INGENIC_OSDRV_T30_PKGDIR)/files/sensor/params/ncu_ov2735b.bin
-	$(INSTALL) -m 644 -t $(TARGET_DIR)/etc/sensor $(INGENIC_OSDRV_T30_PKGDIR)/files/sensor/params/ncu_ov2735.bin
-	# $(INSTALL) -m 644 -t $(TARGET_DIR)/etc/sensor $(INGENIC_OSDRV_T30_PKGDIR)/files/sensor/params/ncu_ov4689.bin
-	# $(INSTALL) -m 644 -t $(TARGET_DIR)/etc/sensor $(INGENIC_OSDRV_T30_PKGDIR)/files/sensor/params/ncu_ov5648.bin
-	# $(INSTALL) -m 644 -t $(TARGET_DIR)/etc/sensor $(INGENIC_OSDRV_T30_PKGDIR)/files/sensor/params/ncu_ps5250.bin
-	# $(INSTALL) -m 644 -t $(TARGET_DIR)/etc/sensor $(INGENIC_OSDRV_T30_PKGDIR)/files/sensor/params/ncu_ps5270.bin
-	# $(INSTALL) -m 644 -t $(TARGET_DIR)/etc/sensor $(INGENIC_OSDRV_T30_PKGDIR)/files/sensor/params/ncu_ps5280.bin
-	# $(INSTALL) -m 644 -t $(TARGET_DIR)/etc/sensor $(INGENIC_OSDRV_T30_PKGDIR)/files/sensor/params/ncu_sc1235.bin
-	# $(INSTALL) -m 644 -t $(TARGET_DIR)/etc/sensor $(INGENIC_OSDRV_T30_PKGDIR)/files/sensor/params/ncu_sc1245.bin
-	# $(INSTALL) -m 644 -t $(TARGET_DIR)/etc/sensor $(INGENIC_OSDRV_T30_PKGDIR)/files/sensor/params/ncu_sc2135.bin
-	# $(INSTALL) -m 644 -t $(TARGET_DIR)/etc/sensor $(INGENIC_OSDRV_T30_PKGDIR)/files/sensor/params/ncu_sc2232.bin
-	# $(INSTALL) -m 644 -t $(TARGET_DIR)/etc/sensor $(INGENIC_OSDRV_T30_PKGDIR)/files/sensor/params/ncu_sc2235.bin
-	# $(INSTALL) -m 644 -t $(TARGET_DIR)/etc/sensor $(INGENIC_OSDRV_T30_PKGDIR)/files/sensor/params/ncu_sc4236.bin
-	# $(INSTALL) -m 644 -t $(TARGET_DIR)/etc/sensor $(INGENIC_OSDRV_T30_PKGDIR)/files/sensor/params/ncu_sc5235.bin
-	# $(INSTALL) -m 644 -t $(TARGET_DIR)/etc/sensor $(INGENIC_OSDRV_T30_PKGDIR)/files/sensor/params/os02b10.bin
-	# $(INSTALL) -m 644 -t $(TARGET_DIR)/etc/sensor $(INGENIC_OSDRV_T30_PKGDIR)/files/sensor/params/os05a10.bin
 	$(INSTALL) -m 644 -t $(TARGET_DIR)/etc/sensor $(INGENIC_OSDRV_T30_PKGDIR)/files/sensor/params/ov2735b.bin
 	$(INSTALL) -m 644 -t $(TARGET_DIR)/etc/sensor $(INGENIC_OSDRV_T30_PKGDIR)/files/sensor/params/ov2735.bin
-	# $(INSTALL) -m 644 -t $(TARGET_DIR)/etc/sensor $(INGENIC_OSDRV_T30_PKGDIR)/files/sensor/params/ov4689.bin
-	# $(INSTALL) -m 644 -t $(TARGET_DIR)/etc/sensor $(INGENIC_OSDRV_T30_PKGDIR)/files/sensor/params/ov5648.bin
-	# $(INSTALL) -m 644 -t $(TARGET_DIR)/etc/sensor $(INGENIC_OSDRV_T30_PKGDIR)/files/sensor/params/ps5250.bin
-	# $(INSTALL) -m 644 -t $(TARGET_DIR)/etc/sensor $(INGENIC_OSDRV_T30_PKGDIR)/files/sensor/params/ps5270.bin
-	# $(INSTALL) -m 644 -t $(TARGET_DIR)/etc/sensor $(INGENIC_OSDRV_T30_PKGDIR)/files/sensor/params/ps5280.bin
-	# $(INSTALL) -m 644 -t $(TARGET_DIR)/etc/sensor $(INGENIC_OSDRV_T30_PKGDIR)/files/sensor/params/sc1235.bin
-	# $(INSTALL) -m 644 -t $(TARGET_DIR)/etc/sensor $(INGENIC_OSDRV_T30_PKGDIR)/files/sensor/params/sc1245.bin
-	# $(INSTALL) -m 644 -t $(TARGET_DIR)/etc/sensor $(INGENIC_OSDRV_T30_PKGDIR)/files/sensor/params/sc2135.bin
-	# $(INSTALL) -m 644 -t $(TARGET_DIR)/etc/sensor $(INGENIC_OSDRV_T30_PKGDIR)/files/sensor/params/sc2232.bin
-	# $(INSTALL) -m 644 -t $(TARGET_DIR)/etc/sensor $(INGENIC_OSDRV_T30_PKGDIR)/files/sensor/params/sc2235.bin
-	# $(INSTALL) -m 644 -t $(TARGET_DIR)/etc/sensor $(INGENIC_OSDRV_T30_PKGDIR)/files/sensor/params/sc4236.bin
-	# $(INSTALL) -m 644 -t $(TARGET_DIR)/etc/sensor $(INGENIC_OSDRV_T30_PKGDIR)/files/sensor/params/sc5235.bin
-
-	$(INSTALL) -m 755 -d $(TARGET_DIR)/lib/modules/3.10.14__isvp_monkey_1.0__/ingenic
-	# $(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/3.10.14__isvp_monkey_1.0__/ingenic $(INGENIC_OSDRV_T30_PKGDIR)/files/kmod/sensor_bg0806_t30.ko
-	# $(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/3.10.14__isvp_monkey_1.0__/ingenic $(INGENIC_OSDRV_T30_PKGDIR)/files/kmod/sensor_fuxsc1020_t30.ko
-	# $(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/3.10.14__isvp_monkey_1.0__/ingenic $(INGENIC_OSDRV_T30_PKGDIR)/files/kmod/sensor_gc2023_t30.ko
-	# $(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/3.10.14__isvp_monkey_1.0__/ingenic $(INGENIC_OSDRV_T30_PKGDIR)/files/kmod/sensor_gc2033_t30.ko
-	# $(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/3.10.14__isvp_monkey_1.0__/ingenic $(INGENIC_OSDRV_T30_PKGDIR)/files/kmod/sensor_gc2053_t30.ko
-	# $(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/3.10.14__isvp_monkey_1.0__/ingenic $(INGENIC_OSDRV_T30_PKGDIR)/files/kmod/sensor_imx291_t30.ko
-	# $(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/3.10.14__isvp_monkey_1.0__/ingenic $(INGENIC_OSDRV_T30_PKGDIR)/files/kmod/sensor_imx307_t30.ko
-	# $(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/3.10.14__isvp_monkey_1.0__/ingenic $(INGENIC_OSDRV_T30_PKGDIR)/files/kmod/sensor_imx323_t30.ko
-	# $(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/3.10.14__isvp_monkey_1.0__/ingenic $(INGENIC_OSDRV_T30_PKGDIR)/files/kmod/sensor_imx327_t30.ko
-	# $(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/3.10.14__isvp_monkey_1.0__/ingenic $(INGENIC_OSDRV_T30_PKGDIR)/files/kmod/sensor_imx335_t30.ko
-	# $(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/3.10.14__isvp_monkey_1.0__/ingenic $(INGENIC_OSDRV_T30_PKGDIR)/files/kmod/sensor_imx385_t30.ko
-	# $(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/3.10.14__isvp_monkey_1.0__/ingenic $(INGENIC_OSDRV_T30_PKGDIR)/files/kmod/sensor_jxf22_t30.ko
-	# $(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/3.10.14__isvp_monkey_1.0__/ingenic $(INGENIC_OSDRV_T30_PKGDIR)/files/kmod/sensor_jxf23_t30.ko
-	# $(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/3.10.14__isvp_monkey_1.0__/ingenic $(INGENIC_OSDRV_T30_PKGDIR)/files/kmod/sensor_jxh62_t30.ko
-	# $(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/3.10.14__isvp_monkey_1.0__/ingenic $(INGENIC_OSDRV_T30_PKGDIR)/files/kmod/sensor_jxk03_t30.ko
-	# $(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/3.10.14__isvp_monkey_1.0__/ingenic $(INGENIC_OSDRV_T30_PKGDIR)/files/kmod/sensor_os02b10_t30.ko
-	# $(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/3.10.14__isvp_monkey_1.0__/ingenic $(INGENIC_OSDRV_T30_PKGDIR)/files/kmod/sensor_os05a10_t30.ko
-	# $(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/3.10.14__isvp_monkey_1.0__/ingenic $(INGENIC_OSDRV_T30_PKGDIR)/files/kmod/sensor_ov2718_t30.ko
-	# $(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/3.10.14__isvp_monkey_1.0__/ingenic $(INGENIC_OSDRV_T30_PKGDIR)/files/kmod/sensor_ov2732_t30.ko
-	$(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/3.10.14__isvp_monkey_1.0__/ingenic $(INGENIC_OSDRV_T30_PKGDIR)/files/kmod/sensor_ov2735b_t30.ko
-	$(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/3.10.14__isvp_monkey_1.0__/ingenic $(INGENIC_OSDRV_T30_PKGDIR)/files/kmod/sensor_ov2735_t30.ko
-	# $(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/3.10.14__isvp_monkey_1.0__/ingenic $(INGENIC_OSDRV_T30_PKGDIR)/files/kmod/sensor_ov4689_t30.ko
-	# $(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/3.10.14__isvp_monkey_1.0__/ingenic $(INGENIC_OSDRV_T30_PKGDIR)/files/kmod/sensor_ov5648_t30.ko
-	# $(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/3.10.14__isvp_monkey_1.0__/ingenic $(INGENIC_OSDRV_T30_PKGDIR)/files/kmod/sensor_ps5250_t30.ko
-	# $(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/3.10.14__isvp_monkey_1.0__/ingenic $(INGENIC_OSDRV_T30_PKGDIR)/files/kmod/sensor_ps5260_t30.ko
-	# $(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/3.10.14__isvp_monkey_1.0__/ingenic $(INGENIC_OSDRV_T30_PKGDIR)/files/kmod/sensor_ps5270_t30.ko
-	# $(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/3.10.14__isvp_monkey_1.0__/ingenic $(INGENIC_OSDRV_T30_PKGDIR)/files/kmod/sensor_ps5280_t30.ko
-	# $(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/3.10.14__isvp_monkey_1.0__/ingenic $(INGENIC_OSDRV_T30_PKGDIR)/files/kmod/sensor_sc1235_t30.ko
-	# $(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/3.10.14__isvp_monkey_1.0__/ingenic $(INGENIC_OSDRV_T30_PKGDIR)/files/kmod/sensor_sc1245a_t30.ko
-	# $(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/3.10.14__isvp_monkey_1.0__/ingenic $(INGENIC_OSDRV_T30_PKGDIR)/files/kmod/sensor_sc1245_t30.ko
-	# $(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/3.10.14__isvp_monkey_1.0__/ingenic $(INGENIC_OSDRV_T30_PKGDIR)/files/kmod/sensor_sc2135_t30.ko
-	# $(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/3.10.14__isvp_monkey_1.0__/ingenic $(INGENIC_OSDRV_T30_PKGDIR)/files/kmod/sensor_sc2232h_t30.ko
-	# $(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/3.10.14__isvp_monkey_1.0__/ingenic $(INGENIC_OSDRV_T30_PKGDIR)/files/kmod/sensor_sc2232_t30.ko
-	# $(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/3.10.14__isvp_monkey_1.0__/ingenic $(INGENIC_OSDRV_T30_PKGDIR)/files/kmod/sensor_sc2235_t30.ko
-	# $(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/3.10.14__isvp_monkey_1.0__/ingenic $(INGENIC_OSDRV_T30_PKGDIR)/files/kmod/sensor_sc2310_t30.ko
-	# $(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/3.10.14__isvp_monkey_1.0__/ingenic $(INGENIC_OSDRV_T30_PKGDIR)/files/kmod/sensor_sc4236_t30.ko
-	# $(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/3.10.14__isvp_monkey_1.0__/ingenic $(INGENIC_OSDRV_T30_PKGDIR)/files/kmod/sensor_sc4335_t30.ko
-	# $(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/3.10.14__isvp_monkey_1.0__/ingenic $(INGENIC_OSDRV_T30_PKGDIR)/files/kmod/sensor_sc5235_t30.ko
-
-	$(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/3.10.14__isvp_monkey_1.0__/ingenic $(INGENIC_OSDRV_T30_PKGDIR)/files/kmod/audio.ko
-	$(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/3.10.14__isvp_monkey_1.0__/ingenic $(INGENIC_OSDRV_T30_PKGDIR)/files/kmod/gpio.ko
-	$(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/3.10.14__isvp_monkey_1.0__/ingenic $(INGENIC_OSDRV_T30_PKGDIR)/files/kmod/sinfo.ko
-	$(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/3.10.14__isvp_monkey_1.0__/ingenic $(INGENIC_OSDRV_T30_PKGDIR)/files/kmod/tx-isp-t30.ko
 
 	$(INSTALL) -m 755 -d $(TARGET_DIR)/usr/bin
 	$(INSTALL) -m 755 -t $(TARGET_DIR)/usr/bin $(INGENIC_OSDRV_T30_PKGDIR)/files/script/load*
@@ -119,5 +23,18 @@ define INGENIC_OSDRV_T30_INSTALL_TARGET_CMDS
 	$(INSTALL) -m 755 -d $(TARGET_DIR)/usr/lib
 	$(INSTALL) -m 644 -t $(TARGET_DIR)/usr/lib/ $(INGENIC_OSDRV_T30_PKGDIR)/files/lib/*.so
 endef
+else
+define INGENIC_OSDRV_T30_INSTALL_TARGET_CMDS
+	$(INSTALL) -m 755 -d $(TARGET_DIR)/etc/sensor
+	$(INSTALL) -m 644 -t $(TARGET_DIR)/etc/sensor $(INGENIC_OSDRV_T30_PKGDIR)/files/sensor/$(OPENIPC_SNS_MODEL).yaml
+	$(INSTALL) -m 644 -t $(TARGET_DIR)/etc/sensor $(INGENIC_OSDRV_T30_PKGDIR)/files/sensor/params/*$(OPENIPC_SNS_MODEL).bin
+
+	$(INSTALL) -m 755 -d $(TARGET_DIR)/usr/bin
+	$(INSTALL) -m 755 -t $(TARGET_DIR)/usr/bin $(INGENIC_OSDRV_T30_PKGDIR)/files/script/load*
+
+	$(INSTALL) -m 755 -d $(TARGET_DIR)/usr/lib
+	$(INSTALL) -m 644 -t $(TARGET_DIR)/usr/lib/ $(INGENIC_OSDRV_T30_PKGDIR)/files/lib/*.so
+endef
+endif
 
 $(eval $(generic-package))
diff --git a/general/package/ingenic-osdrv-t31/ingenic-osdrv-t31.mk b/general/package/ingenic-osdrv-t31/ingenic-osdrv-t31.mk
index 7b27e763..783994d2 100644
--- a/general/package/ingenic-osdrv-t31/ingenic-osdrv-t31.mk
+++ b/general/package/ingenic-osdrv-t31/ingenic-osdrv-t31.mk
@@ -9,10 +9,10 @@ INGENIC_OSDRV_T31_SITE =
 INGENIC_OSDRV_T31_LICENSE = MIT
 INGENIC_OSDRV_T31_LICENSE_FILES = LICENSE
 
+ifeq ($(OPENIPC_SNS_MODEL),)
 define INGENIC_OSDRV_T31_INSTALL_TARGET_CMDS
 	$(INSTALL) -m 755 -d $(TARGET_DIR)/etc/sensor
 	$(INSTALL) -m 644 -t $(TARGET_DIR)/etc/sensor $(INGENIC_OSDRV_T31_PKGDIR)/files/sensor/*.yaml
-	# $(INSTALL) -m 644 -t $(TARGET_DIR)/etc/sensor $(INGENIC_OSDRV_T31_PKGDIR)/files/sensor/params/*.bin
 
 	$(INSTALL) -m 644 -t $(TARGET_DIR)/etc/sensor $(INGENIC_OSDRV_T31_PKGDIR)/files/sensor/params/gc2053-t31.bin
 	$(INSTALL) -m 644 -t $(TARGET_DIR)/etc/sensor $(INGENIC_OSDRV_T31_PKGDIR)/files/sensor/params/gc2083-t31.bin
@@ -34,9 +34,17 @@ define INGENIC_OSDRV_T31_INSTALL_TARGET_CMDS
 	$(INSTALL) -m 644 -t $(TARGET_DIR)/etc/sensor $(INGENIC_OSDRV_T31_PKGDIR)/files/sensor/params/sc4236-t31.bin
 	$(INSTALL) -m 644 -t $(TARGET_DIR)/etc/sensor $(INGENIC_OSDRV_T31_PKGDIR)/files/sensor/params/sc5235-t31.bin
 
-	# Modules for T31 are built from the openingenic repository sources, so we don't need to copy them.
-	# $(INSTALL) -m 755 -d $(TARGET_DIR)/lib/modules/3.10.14__isvp_swan_1.0__/ingenic
-	# $(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/3.10.14__isvp_swan_1.0__/ingenic $(INGENIC_OSDRV_T31_PKGDIR)/files/kmod/*.ko
+	$(INSTALL) -m 755 -d $(TARGET_DIR)/usr/bin
+	$(INSTALL) -m 755 -t $(TARGET_DIR)/usr/bin $(INGENIC_OSDRV_T31_PKGDIR)/files/script/load*
+
+	$(INSTALL) -m 755 -d $(TARGET_DIR)/usr/lib
+	$(INSTALL) -m 644 -t $(TARGET_DIR)/usr/lib/ $(INGENIC_OSDRV_T31_PKGDIR)/files/lib/*.so
+endef
+else
+define INGENIC_OSDRV_T31_INSTALL_TARGET_CMDS
+	$(INSTALL) -m 755 -d $(TARGET_DIR)/etc/sensor
+	$(INSTALL) -m 644 -t $(TARGET_DIR)/etc/sensor $(INGENIC_OSDRV_T31_PKGDIR)/files/sensor/$(OPENIPC_SNS_MODEL).yaml
+	$(INSTALL) -m 644 -t $(TARGET_DIR)/etc/sensor $(INGENIC_OSDRV_T31_PKGDIR)/files/sensor/params/$(OPENIPC_SNS_MODEL)-$(OPENIPC_SOC_MODEL).bin
 
 	$(INSTALL) -m 755 -d $(TARGET_DIR)/usr/bin
 	$(INSTALL) -m 755 -t $(TARGET_DIR)/usr/bin $(INGENIC_OSDRV_T31_PKGDIR)/files/script/load*
@@ -44,5 +52,6 @@ define INGENIC_OSDRV_T31_INSTALL_TARGET_CMDS
 	$(INSTALL) -m 755 -d $(TARGET_DIR)/usr/lib
 	$(INSTALL) -m 644 -t $(TARGET_DIR)/usr/lib/ $(INGENIC_OSDRV_T31_PKGDIR)/files/lib/*.so
 endef
+endif
 
 $(eval $(generic-package))
diff --git a/general/package/ingenic-osdrv-t40/ingenic-osdrv-t40.mk b/general/package/ingenic-osdrv-t40/ingenic-osdrv-t40.mk
index 56c1e482..e14d45f5 100644
--- a/general/package/ingenic-osdrv-t40/ingenic-osdrv-t40.mk
+++ b/general/package/ingenic-osdrv-t40/ingenic-osdrv-t40.mk
@@ -9,6 +9,7 @@ INGENIC_OSDRV_T40_SITE =
 INGENIC_OSDRV_T40_LICENSE = MIT
 INGENIC_OSDRV_T40_LICENSE_FILES = LICENSE
 
+ifeq ($(OPENIPC_SNS_MODEL),)
 define INGENIC_OSDRV_T40_INSTALL_TARGET_CMDS
 	$(INSTALL) -m 755 -d $(TARGET_DIR)/etc/sensor
 	$(INSTALL) -m 644 -t $(TARGET_DIR)/etc/sensor $(INGENIC_OSDRV_T40_PKGDIR)/files/sensor/*.yaml
@@ -23,8 +24,17 @@ define INGENIC_OSDRV_T40_INSTALL_TARGET_CMDS
 	$(INSTALL) -m 644 -t $(TARGET_DIR)/etc/sensor $(INGENIC_OSDRV_T40_PKGDIR)/files/sensor/params/sc8238-t40.bin
 	$(INSTALL) -m 644 -t $(TARGET_DIR)/etc/sensor $(INGENIC_OSDRV_T40_PKGDIR)/files/sensor/params/sc830ai-t40.bin
 
-        # Modules for T40 are built from the openingenic repository sources, so we don't need to copy them.
-	#$(INSTALL) -m 755 -d $(TARGET_DIR)/lib/modules/4.4.94/ingenic
+	$(INSTALL) -m 755 -d $(TARGET_DIR)/usr/bin
+	$(INSTALL) -m 755 -t $(TARGET_DIR)/usr/bin $(INGENIC_OSDRV_T40_PKGDIR)/files/script/load*
+
+	$(INSTALL) -m 755 -d $(TARGET_DIR)/usr/lib
+	$(INSTALL) -m 644 -t $(TARGET_DIR)/usr/lib/ $(INGENIC_OSDRV_T40_PKGDIR)/files/lib/*.so
+endef
+else
+define INGENIC_OSDRV_T40_INSTALL_TARGET_CMDS
+	$(INSTALL) -m 755 -d $(TARGET_DIR)/etc/sensor
+	$(INSTALL) -m 644 -t $(TARGET_DIR)/etc/sensor $(INGENIC_OSDRV_T40_PKGDIR)/files/sensor/$(OPENIPC_SNS_MODEL).yaml
+	$(INSTALL) -m 644 -t $(TARGET_DIR)/etc/sensor $(INGENIC_OSDRV_T40_PKGDIR)/files/sensor/params/$(OPENIPC_SNS_MODEL)-$(OPENIPC_SOC_MODEL).bin
 
 	$(INSTALL) -m 755 -d $(TARGET_DIR)/usr/bin
 	$(INSTALL) -m 755 -t $(TARGET_DIR)/usr/bin $(INGENIC_OSDRV_T40_PKGDIR)/files/script/load*
@@ -32,5 +42,6 @@ define INGENIC_OSDRV_T40_INSTALL_TARGET_CMDS
 	$(INSTALL) -m 755 -d $(TARGET_DIR)/usr/lib
 	$(INSTALL) -m 644 -t $(TARGET_DIR)/usr/lib/ $(INGENIC_OSDRV_T40_PKGDIR)/files/lib/*.so
 endef
+endif
 
 $(eval $(generic-package))