[no ci] Ingenic: update t21 osdrv (#1234)

general/package/ingenic-osdrv-t21/Config.in

@@ -1,6 +1,6 @@
 config BR2_PACKAGE_INGENIC_OSDRV_T21
 	bool "ingenic-osdrv-t21"
+	select BR2_PACKAGE_INGENIC_OPENSDK
 	help
 	  ingenic-osdrv-t21 - Ingenic kernel modules and libs
-
 	  https://openipc.org

general/package/ingenic-osdrv-t21/files/kmod/Readme.txt

@@ -1,26 +0,0 @@
-FILE                    MD5SUM                              SIZE        GRAB            SOC     FIRMWARE
-
-sensor_jxf23_t21n.ko    d7dadc963c26ce7ca465d361df48a94c    18264       @flyrouter      T21N    CamHi
-sensor_jxf23_t21z.ko    fcdecb6440d83bb206df4b9cf52c2c48    17888       @john           T21Z    CamHi
-sensor_jxf37_t21l.ko    0096780fc07334729e61b35580c3ddf8    17030       @metsys1        T21L    CIP-37210v2
-sensor_jxf37_t21z.ko    3dc2e89d30e968bb85cf048e1d688251    16998       @themactep      T21Z    Shopper+
-sensor_os02b10_t21z.ko  b1b8c6d95306789aeb459d5012b07846    14996       @bob-builder    T21Z    Wansview
-sensor_os02g10_t21z.ko  04f44457f7aeeba058ea676daf96bc8e    16223       @bob-builder    T21Z    Wansview
-sensor_ov2735b_t21z.ko  45a3b49b2ccc064493433cf136ed59a5    16448       @bob-builder    T21Z    Wansview
-sensor_sc1245a_t21n.ko  398dd5eb2ef697fa7f50e648d2d16788    16676       @flyrouter      T21N    Jabsco
-sensor_sc1345_t21z.ko   f4bae56550a385dcbbb11d327f59777a    15864       @themactep      T21Z    Shopper+
-sensor_sc2230_t21n.ko   44e51b2eac0f93c1adcad906c69059fc    15760       @flyrouter      T21N    Jabsco
-sensor_sc2232_t21n.ko   a739485a158a247df079e221ec973ab5    18028       @flyrouter      T21N    Jabsco
-sensor_sc2232h_t21n.ko  b1ad55e6f9f4cdc696f70855a3cbcef8    18237       @flyrouter      T21N    CamHi
-sensor_sc2232h_t21z.ko  14413a6b9a5675f73a2137dba927405c    18253       @john           T21Z    CamHi
-sensor_sc2300_t21z.ko   a66a2ef0444ea67f39a2914ec7a8bbbf    17447       @themactep      T21Z    Shopper+
-sensor_sc2332_t21z.ko   f5cd31d4c1555660fd1ea6014b06429e    15071       @themactep      T21Z    Shopper+
-sensor_sc2335_t21n.ko   9318b3db2f7d79c7c014c04e64a26381    16967       @flyrouter      T21N    CamHi
-sensor_sc2335_t21z.ko   22fc60e4ac52491f9b5df2af244e21bc    17726       @john           T31Z    CamHi
-
-tx-isp-t21l.ko          8e0fe41ff138aee4d011edbf1994e246    732733      @metsys1        T21L    CIP-37210v2
-tx-isp-t21n.ko          f8c577640b9cc31a4a846cb174210755    706092      @flyrouter      T21N    Jabsco
-tx-isp-t21n-2.ko        8e0fe41ff138aee4d011edbf1994e246    732733      @flyrouter      T21N    CamHi
-tx-isp-t21z.ko          8e73245902dc2230fce3593b5a701f27    734529      @john           T21Z    CamHi
-tx-isp-t21z-2.ko        dde2bb198728cb9e3860d2d740a41cd8    734177      @bob-builder    T21Z    Wansview
-tx-isp-t21z-3.ko        f5c56de7cde15721cb8c72a2cb9e796f    732701      @themactep      T21Z    Shoppers

general/package/ingenic-osdrv-t21/files/script/load_ingenic

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 KMOD_PATH=/lib/modules/$(uname -r)/ingenic
-SOC=$(ipcinfo -c)
+SOC=$(ipcinfo -f)
 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
+	modprobe sinfo.ko
-	check_return "insmod sinfo"
+	check_return "modprobe sinfo"
 fi
 
-if fw_printenv -n sensor >/dev/null; then
+SENSOR=$(fw_printenv -n sensor)
-	export 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
@@ -70,7 +71,6 @@ case ${SENSOR} in
 	*)
 		ISP_PARAM="isp_clk=90000000"
 		SENSOR_PARAM="sensor_gpio_func=0"
-	break
 		;;
 esac
 
@@ -80,20 +80,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}
+	modprobe tx-isp-${SOC} ${ISP_PARAM}
-	check_return "insmod isp drv"
+	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}
+	modprobe sensor_${SENSOR}_${SOC} ${SENSOR_PARAM}
-	check_return "insmod sensor drv"
+	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
+	modprobe audio spk_gpio=-1
-	check_return "insmod audio"
+	check_return "modprobe audio"
 fi

general/package/ingenic-osdrv-t21/ingenic-osdrv-t21.mk

@@ -12,7 +12,6 @@ INGENIC_OSDRV_T21_LICENSE_FILES = LICENSE
 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
-	# $(INSTALL) -m 644 -t $(TARGET_DIR)/etc/sensor $(INGENIC_OSDRV_T21_PKGDIR)/files/sensor/params/*.bin
 
 	$(INSTALL) -m 644 -t $(TARGET_DIR)/etc/sensor $(INGENIC_OSDRV_T21_PKGDIR)/files/sensor/params/jxf23-t21.bin
 	$(INSTALL) -m 644 -t $(TARGET_DIR)/etc/sensor $(INGENIC_OSDRV_T21_PKGDIR)/files/sensor/params/jxf37-t21.bin
@@ -21,41 +20,8 @@ define INGENIC_OSDRV_T21_INSTALL_TARGET_CMDS
 	$(INSTALL) -m 644 -t $(TARGET_DIR)/etc/sensor $(INGENIC_OSDRV_T21_PKGDIR)/files/sensor/params/sc2300-t21.bin
 	$(INSTALL) -m 644 -t $(TARGET_DIR)/etc/sensor $(INGENIC_OSDRV_T21_PKGDIR)/files/sensor/params/sc2335-t21.bin
 
-	$(INSTALL) -m 755 -d $(TARGET_DIR)/lib/modules/3.10.14__isvp_turkey_1.0__/ingenic
-	# $(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/3.10.14__isvp_turkey_1.0__/ingenic $(INGENIC_OSDRV_T21_PKGDIR)/files/kmod/*.ko
-
-	$(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/3.10.14__isvp_turkey_1.0__/ingenic $(INGENIC_OSDRV_T21_PKGDIR)/files/kmod/audio.ko
-	$(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/3.10.14__isvp_turkey_1.0__/ingenic $(INGENIC_OSDRV_T21_PKGDIR)/files/kmod/audioout.ko
-	$(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/3.10.14__isvp_turkey_1.0__/ingenic $(INGENIC_OSDRV_T21_PKGDIR)/files/kmod/gpio.ko
-	$(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/3.10.14__isvp_turkey_1.0__/ingenic $(INGENIC_OSDRV_T21_PKGDIR)/files/kmod/ircut.ko
-	$(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/3.10.14__isvp_turkey_1.0__/ingenic $(INGENIC_OSDRV_T21_PKGDIR)/files/kmod/motor.ko
-	$(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/3.10.14__isvp_turkey_1.0__/ingenic $(INGENIC_OSDRV_T21_PKGDIR)/files/kmod/reset.ko
-	$(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/3.10.14__isvp_turkey_1.0__/ingenic $(INGENIC_OSDRV_T21_PKGDIR)/files/kmod/rled.ko
-	$(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/3.10.14__isvp_turkey_1.0__/ingenic $(INGENIC_OSDRV_T21_PKGDIR)/files/kmod/sinfo.ko
-	$(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/3.10.14__isvp_turkey_1.0__/ingenic $(INGENIC_OSDRV_T21_PKGDIR)/files/kmod/wifien.ko
-
-	$(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/3.10.14__isvp_turkey_1.0__/ingenic $(INGENIC_OSDRV_T21_PKGDIR)/files/kmod/tx-isp-t21l.ko
-	$(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/3.10.14__isvp_turkey_1.0__/ingenic $(INGENIC_OSDRV_T21_PKGDIR)/files/kmod/tx-isp-t21n.ko
-	$(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/3.10.14__isvp_turkey_1.0__/ingenic $(INGENIC_OSDRV_T21_PKGDIR)/files/kmod/tx-isp-t21z.ko
-
-	$(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/3.10.14__isvp_turkey_1.0__/ingenic $(INGENIC_OSDRV_T21_PKGDIR)/files/kmod/sensor_jxf23_t21n.ko
-	$(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/3.10.14__isvp_turkey_1.0__/ingenic $(INGENIC_OSDRV_T21_PKGDIR)/files/kmod/sensor_jxf37_t21l.ko
-	$(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/3.10.14__isvp_turkey_1.0__/ingenic $(INGENIC_OSDRV_T21_PKGDIR)/files/kmod/sensor_ov2735b_t21z.ko
-	$(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/3.10.14__isvp_turkey_1.0__/ingenic $(INGENIC_OSDRV_T21_PKGDIR)/files/kmod/sensor_sc2232_t21n.ko
-	$(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/3.10.14__isvp_turkey_1.0__/ingenic $(INGENIC_OSDRV_T21_PKGDIR)/files/kmod/sensor_sc2300_t21z.ko
-	$(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/3.10.14__isvp_turkey_1.0__/ingenic $(INGENIC_OSDRV_T21_PKGDIR)/files/kmod/sensor_sc2335_t21n.ko
-	$(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/3.10.14__isvp_turkey_1.0__/ingenic $(INGENIC_OSDRV_T21_PKGDIR)/files/kmod/sensor_sc2335_t21z.ko
-	# ln -sf sensor_sc2335_t21z.ko $(TARGET_DIR)/lib/modules/3.10.14__isvp_turkey_1.0__/ingenic/sensor_sc2335_t21f.ko
-
 	$(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 -t $(TARGET_DIR)/usr/bin $(INGENIC_OSDRV_T21_PKGDIR)/files/script/ircut_demo
-
-	# $(INSTALL) -m 755 -d $(TARGET_DIR)/usr/lib/sensors/params
-	# $(INSTALL) -m 644 -t $(TARGET_DIR)/usr/lib/sensors/params $(INGENIC_OSDRV_T21_PKGDIR)/files/sensor/params/*.bin
-
-	# $(INSTALL) -m 755 -d $(TARGET_DIR)/usr/lib/sensors/params/WDR
-	# $(INSTALL) -m 644 -t $(TARGET_DIR)/usr/lib/sensors/params/WDR $(INGENIC_OSDRV_T21_PKGDIR)/files/sensor/params/WDR/*.bin
 
 	$(INSTALL) -m 755 -d $(TARGET_DIR)/usr/lib
 	$(INSTALL) -m 644 -t $(TARGET_DIR)/usr/lib $(INGENIC_OSDRV_T21_PKGDIR)/files/lib/*.so