mirror of https://github.com/OpenIPC/firmware.git
				
				
				
			Fix ipcinfo invocation
							parent
							
								
									8bfe982719
								
							
						
					
					
						commit
						2abe157730
					
				|  | @ -154,7 +154,7 @@ insert_sns() { | ||||||
|                 devmem 0x200f0058 32 0x1 # spi0_sdi |                 devmem 0x200f0058 32 0x1 # spi0_sdi | ||||||
|                 devmem 0x200f005c 32 0x1 # spi0_csn |                 devmem 0x200f005c 32 0x1 # spi0_csn | ||||||
|                 ;; |                 ;; | ||||||
|         imx123_spi) |         imx123) | ||||||
|                 devmem 0x200f0050 32 0x1 # spi0_sclk |                 devmem 0x200f0050 32 0x1 # spi0_sclk | ||||||
|                 devmem 0x200f0054 32 0x1 # spi0_sdo |                 devmem 0x200f0054 32 0x1 # spi0_sdo | ||||||
|                 devmem 0x200f0058 32 0x1 # spi0_sdi |                 devmem 0x200f0058 32 0x1 # spi0_sdi | ||||||
|  | @ -165,7 +165,7 @@ insert_sns() { | ||||||
|                 devmem 0x20030104 32 0x0     # VI 250MHz |                 devmem 0x20030104 32 0x0     # VI 250MHz | ||||||
|                 insmod sensor_spi.ko |                 insmod sensor_spi.ko | ||||||
|                 ;; |                 ;; | ||||||
|         imx123 | imx178) |         imx178) | ||||||
|                 devmem 0x200f0050 32 0x2     # i2c0_scl |                 devmem 0x200f0050 32 0x2     # i2c0_scl | ||||||
|                 devmem 0x200f0054 32 0x2     # i2c0_sda |                 devmem 0x200f0054 32 0x2     # i2c0_sda | ||||||
|                 devmem 0x2003002c 32 0xF0007 # sensor unreset, clk 25MHz, VI 250MHz |                 devmem 0x2003002c 32 0xF0007 # sensor unreset, clk 25MHz, VI 250MHz | ||||||
|  | @ -449,7 +449,7 @@ else | ||||||
|                 logger -s -p daemon.info -t hisilicon "Get data from environment and set SENSOR as ${SENSOR}" |                 logger -s -p daemon.info -t hisilicon "Get data from environment and set SENSOR as ${SENSOR}" | ||||||
|         else |         else | ||||||
|                 insert_detect |                 insert_detect | ||||||
|                 SENSOR_DETECT=$(ipcinfo -s) |                 SENSOR_DETECT=$(ipcinfo --short-sensor) | ||||||
|                 export SENSOR=${SENSOR_DETECT:=unknown} |                 export SENSOR=${SENSOR_DETECT:=unknown} | ||||||
|                 remove_detect |                 remove_detect | ||||||
|                 logger -s -p daemon.info -t hisilicon "Get data from ipcinfo and set SENSOR as ${SENSOR}" |                 logger -s -p daemon.info -t hisilicon "Get data from ipcinfo and set SENSOR as ${SENSOR}" | ||||||
|  |  | ||||||
|  | @ -408,7 +408,7 @@ else | ||||||
|         logger -s -p daemon.info -t hisilicon "Get data from environment and set SENSOR as ${SENSOR}" |         logger -s -p daemon.info -t hisilicon "Get data from environment and set SENSOR as ${SENSOR}" | ||||||
|     else |     else | ||||||
|         insert_detect |         insert_detect | ||||||
|         SENSOR_DETECT=$(ipcinfo -s) |         SENSOR_DETECT=$(ipcinfo --short-sensor) | ||||||
|         export SENSOR=${SENSOR_DETECT:=unknown} |         export SENSOR=${SENSOR_DETECT:=unknown} | ||||||
|         remove_detect |         remove_detect | ||||||
|         logger -s -p daemon.info -t hisilicon "Get data from ipcinfo and set SENSOR as ${SENSOR}" |         logger -s -p daemon.info -t hisilicon "Get data from ipcinfo and set SENSOR as ${SENSOR}" | ||||||
|  |  | ||||||
|  | @ -40,7 +40,6 @@ insert_detect() | ||||||
|         insmod sensor_i2c.ko |         insmod sensor_i2c.ko | ||||||
|         insmod sensor_spi.ko |         insmod sensor_spi.ko | ||||||
|         SENSOR=ar0130 insert_sns |         SENSOR=ar0130 insert_sns | ||||||
|         ipcinfo -s |  | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| remove_detect() | remove_detect() | ||||||
|  | @ -344,7 +343,7 @@ else | ||||||
|                 logger -s -p daemon.info -t hisilicon "Get data from environment and set SENSOR as ${SENSOR}" |                 logger -s -p daemon.info -t hisilicon "Get data from environment and set SENSOR as ${SENSOR}" | ||||||
|         else |         else | ||||||
|                 insert_detect |                 insert_detect | ||||||
|                 SENSOR_DETECT=$(ipcinfo -s) |                 SENSOR_DETECT=$(ipcinfo --short-sensor) | ||||||
|                 export SENSOR=${SENSOR_DETECT:=unknown} |                 export SENSOR=${SENSOR_DETECT:=unknown} | ||||||
|                 remove_detect |                 remove_detect | ||||||
|                 logger -s -p daemon.info -t hisilicon "Get data from ipcinfo and set SENSOR as ${SENSOR}" |                 logger -s -p daemon.info -t hisilicon "Get data from ipcinfo and set SENSOR as ${SENSOR}" | ||||||
|  |  | ||||||
|  | @ -330,7 +330,7 @@ else | ||||||
|         logger -s -p daemon.info -t hisilicon "Get data from environment and set SENSOR as ${SENSOR}" |         logger -s -p daemon.info -t hisilicon "Get data from environment and set SENSOR as ${SENSOR}" | ||||||
|     else |     else | ||||||
|         insert_detect |         insert_detect | ||||||
|         SENSOR_DETECT=$(ipcinfo -s) |         SENSOR_DETECT=$(ipcinfo --short-sensor) | ||||||
|         export SENSOR=${SENSOR_DETECT:=unknown} |         export SENSOR=${SENSOR_DETECT:=unknown} | ||||||
|         remove_detect |         remove_detect | ||||||
|         logger -s -p daemon.info -t hisilicon "Get data from ipcinfo and set SENSOR as ${SENSOR}" |         logger -s -p daemon.info -t hisilicon "Get data from ipcinfo and set SENSOR as ${SENSOR}" | ||||||
|  |  | ||||||
|  | @ -360,7 +360,7 @@ else | ||||||
| 		logger -s -p daemon.info -t hisilicon "Get data from environment and set SENSOR as ${SENSOR}" | 		logger -s -p daemon.info -t hisilicon "Get data from environment and set SENSOR as ${SENSOR}" | ||||||
| 	else | 	else | ||||||
| 		insert_detect | 		insert_detect | ||||||
| 		SENSOR_DETECT=$(ipcinfo -s) | 		SENSOR_DETECT=$(ipcinfo --short-sensor) | ||||||
| 		export SENSOR=${SENSOR_DETECT:=unknown} | 		export SENSOR=${SENSOR_DETECT:=unknown} | ||||||
| 		remove_detect | 		remove_detect | ||||||
| 		logger -s -p daemon.info -t hisilicon "Get data from ipcinfo and set SENSOR as ${SENSOR}" | 		logger -s -p daemon.info -t hisilicon "Get data from ipcinfo and set SENSOR as ${SENSOR}" | ||||||
|  |  | ||||||
|  | @ -879,7 +879,7 @@ else | ||||||
| 		logger -s -p daemon.info -t hisilicon "Get data from environment and set SENSOR as ${SENSOR}" | 		logger -s -p daemon.info -t hisilicon "Get data from environment and set SENSOR as ${SENSOR}" | ||||||
| 	else | 	else | ||||||
| 		insert_detect | 		insert_detect | ||||||
| 		SENSOR_DETECT=$(ipcinfo -s) | 		SENSOR_DETECT=$(ipcinfo --short-sensor) | ||||||
| 		export SENSOR=${SENSOR_DETECT:=unknown} | 		export SENSOR=${SENSOR_DETECT:=unknown} | ||||||
| 		remove_detect | 		remove_detect | ||||||
| 		logger -s -p daemon.info -t hisilicon "Get data from ipcinfo and set SENSOR as ${SENSOR}" | 		logger -s -p daemon.info -t hisilicon "Get data from ipcinfo and set SENSOR as ${SENSOR}" | ||||||
|  |  | ||||||
|  | @ -168,7 +168,7 @@ else | ||||||
|         logger -s -p daemon.info -t novatek "Get data from environment and set SENSOR as ${SENSOR}" |         logger -s -p daemon.info -t novatek "Get data from environment and set SENSOR as ${SENSOR}" | ||||||
|     else |     else | ||||||
|         #insert_ko |         #insert_ko | ||||||
|         SENSOR_DETECT=$(ipcinfo -s) |         SENSOR_DETECT=$(ipcinfo --short-sensor) | ||||||
|         export SENSOR=${SENSOR_DETECT:=unknown} |         export SENSOR=${SENSOR_DETECT:=unknown} | ||||||
|         logger -s -p daemon.info -t novatek "Get data from ipcinfo and set SENSOR as ${SENSOR}" |         logger -s -p daemon.info -t novatek "Get data from ipcinfo and set SENSOR as ${SENSOR}" | ||||||
|         fw_setenv sensor $SENSOR && logger -s -p daemon.info -t novatek "Write detected ${SENSOR} to U-Boot ENV" |         fw_setenv sensor $SENSOR && logger -s -p daemon.info -t novatek "Write detected ${SENSOR} to U-Boot ENV" | ||||||
|  |  | ||||||
|  | @ -37,7 +37,7 @@ start() { | ||||||
| 	export TZ=$(cat /etc/TZ) | 	export TZ=$(cat /etc/TZ) | ||||||
| 	load_xiongmai -i | 	load_xiongmai -i | ||||||
| 	# | 	# | ||||||
| 	SNS_TYPE=$(ipcinfo --short_sensor) | 	SNS_TYPE=$(ipcinfo --short-sensor) | ||||||
| 	logger -s -p daemon.info -t xiongmai "You sensor is $SNS_TYPE" | 	logger -s -p daemon.info -t xiongmai "You sensor is $SNS_TYPE" | ||||||
| 	# | 	# | ||||||
| 	load_majestic | 	load_majestic | ||||||
|  |  | ||||||
|  | @ -38,7 +38,7 @@ start() { | ||||||
| 	load_xiongmai -i | 	load_xiongmai -i | ||||||
| 	# | 	# | ||||||
| 	if [ ! -f /usr/lib/libsns.so ]; then | 	if [ ! -f /usr/lib/libsns.so ]; then | ||||||
| 		SNS_TYPE=$(ipcinfo --short_sensor) | 		SNS_TYPE=$(ipcinfo --short-sensor) | ||||||
| 		logger -s -p daemon.info -t xiongmai "You sensor is $SNS_TYPE and symlink to libsns.so not found" | 		logger -s -p daemon.info -t xiongmai "You sensor is $SNS_TYPE and symlink to libsns.so not found" | ||||||
| 		case $SNS_TYPE in | 		case $SNS_TYPE in | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
		Loading…
	
		Reference in New Issue