Merge pull request #141 from cronyx/master

enable watchdog, pwm and vfat modules for goke, sync imx335 sensor co…
pull/146/head
Igor Zalatov 2022-01-06 18:55:44 +03:00 committed by GitHub
commit e4fbb23323
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 120 additions and 185 deletions

View File

@ -333,7 +333,7 @@ xm550() {
# gk7205v200 # OpenIPC
# gk7205v200_fpv # FPV
# gk7205v200_ufanet # Ufanet
# gk7205v300 # OpenIPC
gk7205v300 # OpenIPC
# gk7605v100 # testing..
#
#######
@ -372,7 +372,7 @@ xm550() {
#
#######
#
nt98562 # OpenIPC
# nt98562 # OpenIPC
#
# nt98566 # OpenIPC
#

View File

@ -1,4 +1,3 @@
f2fs
vfat
#usb-storage
#vfat

View File

@ -49,7 +49,7 @@ YUV_TYPE0=0; # 0 -- raw, 1 --DC, 2 --bt1120, 3 --bt656
# mmz_size=32M; # 32M, mmz size
# GK7205V200
# GK7205V300
#
# mem_total=128 # 128M, total mem
# mem_start=0x40000000 # phy mem start
@ -139,7 +139,7 @@ insert_ko()
insmod osal.ko anony=1 mmz_allocator=gk mmz=anonymous,0,$mmz_start,$mmz_size || report_error
insmod gk7205v200_base.ko
insmod gk7205v200_sys.ko
insmod gk7205v200_tde.ko
# insmod gk7205v200_tde.ko
insmod gk7205v200_rgn.ko
insmod gk7205v200_vgs.ko
insmod gk7205v200_vi.ko
@ -155,7 +155,7 @@ insert_ko()
insmod gk7205v200_h265e.ko
insmod gk7205v200_jpege.ko
insmod gk7205v200_ive.ko save_power=0
# insmod isp_pwm.ko # unused on OpenIPC
insmod isp_pwm.ko
insmod isp_sensor_i2c.ko
insmod isp_sensor_spi.ko
# insert_isp_piris # unused on OpenIPC
@ -163,10 +163,12 @@ insert_ko()
insert_audio
insmod mipi_rx.ko
# insmod gk7205v200_pm.ko # unused on OpenIPC
insmod gk7205v200_wdt.ko
}
remove_ko()
{
rmmod gk7205v200_wdt
# rmmod gk7205v200_pm # unused on OpenIPC
remove_audio
rmmod mipi_rx
@ -187,10 +189,10 @@ remove_ko()
rmmod gk7205v200_vi
rmmod gk7205v200_vgs
rmmod gk7205v200_rgn
rmmod gk7205v200_tde
# rmmod gk7205v200_tde
rmmod isp_sensor_i2c &> /dev/null
rmmod isp_sensor_spi &> /dev/null
# rmmod isp_pwm # unused on OpenIPC
rmmod isp_pwm
rmmod gk7205v200_sys
rmmod gk7205v200_base
rmmod osal

View File

@ -0,0 +1,68 @@
[sensor]
Sensor_type=stSnsImx335Obj
Mode=WDR_MODE_NONE
DllFile=libsns_imx335.so
[mode]
input_mode=INPUT_MODE_MIPI
raw_bitness=12
clock=27MHz
[mipi]
lane_id = 0|1|2|3|-1|-1|-1|-1| ;lane_id: -1 - disable
[isp_image]
Isp_FrameRate=20
Isp_Bayer=BAYER_RGGB
[vi_dev]
Input_mod=VI_MODE_MIPI
Work_mod = VI_WORK_MODE_1Multiplex
Mask_num = 2
Mask_0 = 0xFFF00000
Mask_1 = 0x0
Scan_mode = VI_SCAN_PROGRESSIVE
Data_seq = VI_DATA_SEQ_YUYV
Vsync =1 ; vertical synchronization signal
;VI_VSYNC_PULSE,
VsyncNeg=1 ;Polarity of the vertical synchronization signal
;VI_VSYNC_NEG_HIGH = 0,
;VI_VSYNC_NEG_LOW /*if VIU_VSYNC_E
Hsync =0 ;Attribute of the horizontal synchronization signal
;VI_HSYNC_VALID_SINGNAL = 0,
;VI_HSYNC_PULSE,
HsyncNeg =0 ;Polarity of the horizontal synchronization signal
;VI_HSYNC_NEG_HIGH = 0,
;VI_HSYNC_NEG_LOW
VsyncValid =1 ;Attribute of the valid vertical synchronization signal
;VI_VSYNC_NORM_PULSE = 0,
;VI_VSYNC_VALID_SINGAL,
VsyncValidNeg =0;Polarity of the valid vertical synchronization signal
;VI_VSYNC_VALID_NEG_HIGH = 0,
;VI_VSYNC_VALID_NEG_LOW
Timingblank_HsyncHfb =0 ;Horizontal front blanking width
Timingblank_HsyncAct =1280 ;Horizontal effetive width
Timingblank_HsyncHbb =0 ;Horizontal back blanking width
Timingblank_VsyncVfb =0 ;Vertical front blanking height
Timingblank_VsyncVact =720 ;Vertical effetive width
Timingblank_VsyncVbb=0 ;Vertical back blanking height
Timingblank_VsyncVbfb =0 ;Even-field vertical front blanking height(interlace, invalid progressive)
Timingblank_VsyncVbact=0 ;Even-field vertical effetive width(interlace, invalid progressive)
Timingblank_VsyncVbbb =0 ;Even-field vertical back blanking height(interlace, invalid progressive)
InputDataType=1 ;VI_DATA_TYPE_YUV = 0,VI_DATA_TYPE_RGB = 1,
DataRev =FALSE ;Data reverse. FALSE = 0; TRUE = 1
DevRect_w=2592
DevRect_h=1944
DevRect_x=200
DevRect_y=20
Combine_mode =0 ;Y/C composite or separation mode
;VI_COMBINE_COMPOSITE = 0 /*Composite mode */
;VI_COMBINE_SEPARATE, /*Separate mode */
Comp_mode =0 ;Component mode (single-component or dual-component)
;VI_COMP_MODE_SINGLE = 0, /*single component mode */
;VI_COMP_MODE_DOUBLE = 1, /*double component mode */
Clock_edge =1 ;Clock edge mode (sampling on the rising or falling edge)
;VI_CLK_EDGE_SINGLE_UP=0, /*rising edge */
;VI_CLK_EDGE_SINGLE_DOWN, /*falling edge */
FullLinesStd=4500

View File

@ -1,39 +1,22 @@
[sensor]
Sensor_type =stSnsImx335Obj ;sensor name
Mode = WDR_MODE_2To1_LINE
DllFile = /usr/lib/sensors/libsns_imx335.so ;sensor lib path
Sensor_type=stSnsImx335Obj
Mode=WDR_MODE_2To1_LINE
DllFile=libsns_imx335.so
[mode]
input_mode =0 ;INPUT_MODE_MIPI = 0
;INPUT_MODE_SUBLVDS = 1
;INPUT_MODE_LVDS = 2 ...etc
raw_bitness = 10
input_mode=INPUT_MODE_MIPI
raw_bitness=12
clock=27MHz
[mipi]
;----------only for mipi_dev---------
data_type = 2 ;raw data type: 8/10/12/14 bit
;DATA_TYPE_RAW_8BIT = 0,
;DATA_TYPE_RAW_10BIT,
;DATA_TYPE_RAW_12BIT,
;DATA_TYPE_RAW_14BIT,
;DATA_TYPE_RAW_16BIT,
;DATA_TYPE_YUV420_8BIT_NORMAL,
;DATA_TYPE_YUV420_8BIT_LEGACY,
;DATA_TYPE_YUV422_8BIT,
lane_id = 0|1|2|3|-1|-1|-1|-1| ;lane_id: -1 - disable
[isp_image]
Isp_x =0
Isp_y =0
Isp_W =2592
Isp_H =1944
Isp_FrameRate=20
Isp_Bayer =0 ;BAYER_RGGB=0, BAYER_GRBG=1, BAYER_GBRG=2, BAYER_BGGR=3
Isp_Bayer=BAYER_RGGB
[vi_dev]
Input_mod = VI_MODE_MIPI
Input_mod=VI_MODE_MIPI
Work_mod = VI_WORK_MODE_1Multiplex
Mask_num = 2
Mask_0 = 0xFFC00000
@ -68,10 +51,10 @@ Timingblank_VsyncVbact=0 ;Even-field vertical effetive width(interlace, inval
Timingblank_VsyncVbbb =0 ;Even-field vertical back blanking height(interlace, invalid progressive)
InputDataType=1 ;VI_DATA_TYPE_YUV = 0,VI_DATA_TYPE_RGB = 1,
DataRev =FALSE ;Data reverse. FALSE = 0; TRUE = 1
DevRect_w=2592 ;
DevRect_h=1944 ;
DevRect_x=200 ;
DevRect_y=20 ;
DevRect_w=2592
DevRect_h=1944
DevRect_x=200
DevRect_y=20
Combine_mode =0 ;Y/C composite or separation mode
;VI_COMBINE_COMPOSITE = 0 /*Composite mode */
@ -82,32 +65,4 @@ Comp_mode =0 ;Component mode (single-component or dual-component)
Clock_edge =1 ;Clock edge mode (sampling on the rising or falling edge)
;VI_CLK_EDGE_SINGLE_UP=0, /*rising edge */
;VI_CLK_EDGE_SINGLE_DOWN, /*falling edge */
;----- only for bt656 ----------
FixCode =0 ;BT656_FIXCODE_1 = 0,
;BT656_FIXCODE_0
FieldPolar=0 ;BT656_FIELD_POLAR_STD = 0
;BT656_FIELD_POLAR_NSTD
DataPath =1 ;ISP enable or bypass
;VI_PATH_BYPASS = 0,/* ISP bypass */
;VI_PATH_ISP = 1,/* ISP enable */
;VI_PATH_RAW = 2,/* Capture raw data, for debug */
[vi_chn]
CapRect_X =0
CapRect_Y =0
CapRect_Width=2592
CapRect_Height=1944
DestSize_Width=2592
DestSize_Height=1944
CapSel =2 ;Frame/field select. ONLY used in interlaced mode
;VI_CAPSEL_TOP = 0, /* top field */
;VI_CAPSEL_BOTTOM, /* bottom field */
;VI_CAPSEL_BOTH, /* top and bottom field */
PixFormat =26;PIXEL_FORMAT_YVU_SEMIPLANAR_420 = 26 ...etc
CompressMode =0 ;COMPRESS_MODE_NONE = 0
;COMPRESS_MODE_SEG =1 ...etc
SrcFrameRate=-1 ;Source frame rate. -1: not controll
FrameRate =-1 ;Target frame rate. -1: not controll
FullLinesStd=4500

View File

@ -1,39 +1,22 @@
[sensor]
Sensor_type =stSnsImx335Obj ;sensor name
Mode = WDR_MODE_2To1_LINE
DllFile = /usr/lib/sensors/libsns_imx335.so ;sensor lib path
Sensor_type=stSnsImx335Obj
Mode=WDR_MODE_2To1_LINE
DllFile=libsns_imx335.so
[mode]
input_mode =0 ;INPUT_MODE_MIPI = 0
;INPUT_MODE_SUBLVDS = 1
;INPUT_MODE_LVDS = 2 ...etc
raw_bitness = 10
input_mode=INPUT_MODE_MIPI
raw_bitness=10
clock=27MHz
[mipi]
;----------only for mipi_dev---------
data_type = 2 ;raw data type: 8/10/12/14 bit
;DATA_TYPE_RAW_8BIT = 0,
;DATA_TYPE_RAW_10BIT,
;DATA_TYPE_RAW_12BIT,
;DATA_TYPE_RAW_14BIT,
;DATA_TYPE_RAW_16BIT,
;DATA_TYPE_YUV420_8BIT_NORMAL,
;DATA_TYPE_YUV420_8BIT_LEGACY,
;DATA_TYPE_YUV422_8BIT,
lane_id = 0|1|2|3|-1|-1|-1|-1| ;lane_id: -1 - disable
[isp_image]
Isp_x =0
Isp_y =0
Isp_W =2592
Isp_H =1520
Isp_FrameRate=25
Isp_Bayer =0 ;BAYER_RGGB=0, BAYER_GRBG=1, BAYER_GBRG=2, BAYER_BGGR=3
Isp_Bayer=BAYER_RGGB
[vi_dev]
Input_mod = VI_MODE_MIPI
Input_mod=VI_MODE_MIPI
Work_mod = VI_WORK_MODE_1Multiplex
Mask_num = 2
Mask_0 = 0xFFC00000
@ -68,10 +51,10 @@ Timingblank_VsyncVbact=0 ;Even-field vertical effetive width(interlace, inval
Timingblank_VsyncVbbb =0 ;Even-field vertical back blanking height(interlace, invalid progressive)
InputDataType=1 ;VI_DATA_TYPE_YUV = 0,VI_DATA_TYPE_RGB = 1,
DataRev =FALSE ;Data reverse. FALSE = 0; TRUE = 1
DevRect_w=2592 ;
DevRect_h=1520 ;
DevRect_x=200 ;
DevRect_y=400 ;
DevRect_w=2592
DevRect_h=1520
DevRect_x=200
DevRect_y=400
Combine_mode =0 ;Y/C composite or separation mode
;VI_COMBINE_COMPOSITE = 0 /*Composite mode */
@ -82,32 +65,7 @@ Comp_mode =0 ;Component mode (single-component or dual-component)
Clock_edge =1 ;Clock edge mode (sampling on the rising or falling edge)
;VI_CLK_EDGE_SINGLE_UP=0, /*rising edge */
;VI_CLK_EDGE_SINGLE_DOWN, /*falling edge */
;----- only for bt656 ----------
FixCode =0 ;BT656_FIXCODE_1 = 0,
;BT656_FIXCODE_0
FieldPolar=0 ;BT656_FIELD_POLAR_STD = 0
;BT656_FIELD_POLAR_NSTD
DataPath =1 ;ISP enable or bypass
;VI_PATH_BYPASS = 0,/* ISP bypass */
;VI_PATH_ISP = 1,/* ISP enable */
;VI_PATH_RAW = 2,/* Capture raw data, for debug */
FullLinesStd=4500
[vi_chn]
CapRect_X =0
CapRect_Y =120
CapRect_Width=2592
CapRect_Height=1520
DestSize_Width=2592
DestSize_Height=1520
CapSel =2 ;Frame/field select. ONLY used in interlaced mode
;VI_CAPSEL_TOP = 0, /* top field */
;VI_CAPSEL_BOTTOM, /* bottom field */
;VI_CAPSEL_BOTH, /* top and bottom field */
PixFormat =26;PIXEL_FORMAT_YVU_SEMIPLANAR_420 = 26 ...etc
CompressMode =0 ;COMPRESS_MODE_NONE = 0
;COMPRESS_MODE_SEG =1 ...etc
SrcFrameRate=-1 ;Source frame rate. -1: not controll
FrameRate =-1 ;Target frame rate. -1: not controll
CapRect_Y=120

View File

@ -1,41 +1,22 @@
[sensor]
Sensor_type =stSnsImx335Obj ;sensor name
Mode = WDR_MODE_NONE
DllFile = /usr/lib/sensors/libsns_imx335.so ;sensor lib path
Sensor_type=stSnsImx335Obj
Mode=WDR_MODE_NONE
DllFile=libsns_imx335.so
[mode]
input_mode =0 ;INPUT_MODE_MIPI = 0
;INPUT_MODE_SUBLVDS = 1
;INPUT_MODE_LVDS = 2 ...etc
raw_bitness = 10
input_mode=INPUT_MODE_MIPI
raw_bitness=10
clock=27MHz
[mipi]
;----------only for mipi_dev---------
data_type = 2 ;raw data type: 8/10/12/14 bit
;DATA_TYPE_RAW_8BIT = 0,
;DATA_TYPE_RAW_10BIT,
;DATA_TYPE_RAW_12BIT,
;DATA_TYPE_RAW_14BIT,
;DATA_TYPE_RAW_16BIT,
;DATA_TYPE_YUV420_8BIT_NORMAL,
;DATA_TYPE_YUV420_8BIT_LEGACY,
;DATA_TYPE_YUV422_8BIT,
lane_id = 0|1|2|3|-1|-1|-1|-1| ;lane_id: -1 - disable
[isp_image]
Isp_x =0
Isp_y =0
Isp_W =2592
Isp_H =1520
Isp_FrameRate=25
Isp_Bayer =0 ;BAYER_RGGB=0, BAYER_GRBG=1, BAYER_GBRG=2, BAYER_BGGR=3
Isp_Bayer=BAYER_RGGB
[vi_dev]
Input_mod = VI_MODE_MIPI
Input_mod=VI_MODE_MIPI
Work_mod = VI_WORK_MODE_1Multiplex
Mask_num = 2
Mask_0 = 0xFFF00000
@ -70,10 +51,10 @@ Timingblank_VsyncVbact=0 ;Even-field vertical effetive width(interlace, inval
Timingblank_VsyncVbbb =0 ;Even-field vertical back blanking height(interlace, invalid progressive)
InputDataType=1 ;VI_DATA_TYPE_YUV = 0,VI_DATA_TYPE_RGB = 1,
DataRev =FALSE ;Data reverse. FALSE = 0; TRUE = 1
DevRect_w=2592 ;
DevRect_h=1520 ;
DevRect_x=200 ;
DevRect_y=20 ;
DevRect_w=2592
DevRect_h=1520
DevRect_x=200
DevRect_y=20
Combine_mode =0 ;Y/C composite or separation mode
;VI_COMBINE_COMPOSITE = 0 /*Composite mode */
@ -84,32 +65,4 @@ Comp_mode =0 ;Component mode (single-component or dual-component)
Clock_edge =1 ;Clock edge mode (sampling on the rising or falling edge)
;VI_CLK_EDGE_SINGLE_UP=0, /*rising edge */
;VI_CLK_EDGE_SINGLE_DOWN, /*falling edge */
;----- only for bt656 ----------
FixCode =0 ;BT656_FIXCODE_1 = 0,
;BT656_FIXCODE_0
FieldPolar=0 ;BT656_FIELD_POLAR_STD = 0
;BT656_FIELD_POLAR_NSTD
DataPath =1 ;ISP enable or bypass
;VI_PATH_BYPASS = 0,/* ISP bypass */
;VI_PATH_ISP = 1,/* ISP enable */
;VI_PATH_RAW = 2,/* Capture raw data, for debug */
[vi_chn]
CapRect_X =0
CapRect_Y =0
CapRect_Width=2592
CapRect_Height=1520
DestSize_Width=2592
DestSize_Height=1520
CapSel =2 ;Frame/field select. ONLY used in interlaced mode
;VI_CAPSEL_TOP = 0, /* top field */
;VI_CAPSEL_BOTTOM, /* bottom field */
;VI_CAPSEL_BOTH, /* top and bottom field */
PixFormat =26;PIXEL_FORMAT_YVU_SEMIPLANAR_420 = 26 ...etc
CompressMode =0 ;COMPRESS_MODE_NONE = 0
;COMPRESS_MODE_SEG =1 ...etc
SrcFrameRate=-1 ;Source frame rate. -1: not controll
FrameRate =-1 ;Target frame rate. -1: not controll
FullLinesStd=3300

View File

@ -56,7 +56,7 @@ define GOKE_OSDRV_GK7205V200_INSTALL_TARGET_CMDS
$(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/4.9.37/goke $(BR2_EXTERNAL_GOKE_PATH)/package/goke-osdrv-gk7205v200/files/kmod/gk7205v200_rc.ko
$(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/4.9.37/goke $(BR2_EXTERNAL_GOKE_PATH)/package/goke-osdrv-gk7205v200/files/kmod/gk7205v200_rgn.ko
$(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/4.9.37/goke $(BR2_EXTERNAL_GOKE_PATH)/package/goke-osdrv-gk7205v200/files/kmod/gk7205v200_sys.ko
$(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/4.9.37/goke $(BR2_EXTERNAL_GOKE_PATH)/package/goke-osdrv-gk7205v200/files/kmod/gk7205v200_tde.ko
## $(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/4.9.37/goke $(BR2_EXTERNAL_GOKE_PATH)/package/goke-osdrv-gk7205v200/files/kmod/gk7205v200_tde.ko
$(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/4.9.37/goke $(BR2_EXTERNAL_GOKE_PATH)/package/goke-osdrv-gk7205v200/files/kmod/gk7205v200_vedu.ko
$(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/4.9.37/goke $(BR2_EXTERNAL_GOKE_PATH)/package/goke-osdrv-gk7205v200/files/kmod/gk7205v200_venc.ko
$(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/4.9.37/goke $(BR2_EXTERNAL_GOKE_PATH)/package/goke-osdrv-gk7205v200/files/kmod/gk7205v200_vgs.ko
@ -65,7 +65,7 @@ define GOKE_OSDRV_GK7205V200_INSTALL_TARGET_CMDS
$(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/4.9.37/goke $(BR2_EXTERNAL_GOKE_PATH)/package/goke-osdrv-gk7205v200/files/kmod/gk7205v200_vpss.ko
$(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/4.9.37/goke $(BR2_EXTERNAL_GOKE_PATH)/package/goke-osdrv-gk7205v200/files/kmod/gk7205v200_wdt.ko
## $(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/4.9.37/goke $(BR2_EXTERNAL_GOKE_PATH)/package/goke-osdrv-gk7205v200/files/kmod/isp_piris.ko
## $(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/4.9.37/goke $(BR2_EXTERNAL_GOKE_PATH)/package/goke-osdrv-gk7205v200/files/kmod/isp_pwm.ko
$(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/4.9.37/goke $(BR2_EXTERNAL_GOKE_PATH)/package/goke-osdrv-gk7205v200/files/kmod/isp_pwm.ko
## $(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/4.9.37/goke $(BR2_EXTERNAL_GOKE_PATH)/package/goke-osdrv-gk7205v200/files/kmod/isp_sample_ist.ko
$(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/4.9.37/goke $(BR2_EXTERNAL_GOKE_PATH)/package/goke-osdrv-gk7205v200/files/kmod/isp_sensor_i2c.ko
$(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/4.9.37/goke $(BR2_EXTERNAL_GOKE_PATH)/package/goke-osdrv-gk7205v200/files/kmod/isp_sensor_spi.ko

View File

@ -45,7 +45,7 @@ YUV_TYPE0=0; # 0 -- raw, 1 --DC, 2 --bt1120, 3 --bt656
# mmz_size=32M; # 32M, mmz size
#
#
# Hi3516Ev200
# Hi3516Ev300
#
# mem_total=128 # 128M, total mem
# mem_start=0x40000000 # phy mem start