[UPDATE]SDK 2.5.0.8.2

6920_bsp_release/Makefile

@@ -41,9 +41,9 @@ rtt-nano-emmc: prepare
 	scons --useconfig='star_asic_defconfig_emmc';	\
 	scons -j128 || exit;	\
 	cp rtthread.bin ${ACME_IMG_PF_DIR}/star_app_emmc.bin; 	\
-	scons --useconfig='star_asic_defconfig_evb_v24';	\
-	scons -j16 || exit;	\
-	cp rtthread.bin ${ACME_IMG_PF_DIR}/star_app_evb_v24.bin; 	\
+	# scons --useconfig='star_asic_defconfig_evb_v24';	\
+	# scons -j16 || exit;	\
+	# cp rtthread.bin ${ACME_IMG_PF_DIR}/star_app_evb_v24.bin; 	\
 
 rtt-nano: rtt-nano-outdoor_ipc rtt-nano-glasses rtt-nano-emmc 
 	@pushd rt-thread-nano/bsp/sa692x/star; \
@@ -65,6 +65,12 @@ rtt-nano: rtt-nano-outdoor_ipc rtt-nano-glasses rtt-nano-emmc
 	scons --useconfig='star_asic_defconfig_bc22e';	\
 	scons -j16 || exit;	\
 	cp rtthread.bin ${ACME_IMG_PF_DIR}/star_app_bc22e.bin; 	\
+	scons --useconfig='star_asic_defconfig_evb_v24';	\
+	scons -j16 || exit;	\
+	cp rtthread.bin ${ACME_IMG_PF_DIR}/star_app_evb_v24.bin; 	\
+	scons --useconfig='star_asic_defconfig_evb_v16';	\
+	scons -j16 || exit;	\
+	cp rtthread.bin ${ACME_IMG_PF_DIR}/star_app_evb_v16.bin; 	\
 	popd
 
 linux:

6920_bsp_release/linux/kernel/linux-5.10.106/arch/arm/boot/dts/acme/sa6920-ipc-bc6.dts

@@ -198,7 +198,7 @@
 		mclk-gpios = <&portd 11 GPIO_ACTIVE_HIGH>;
 		spk-ctrl-gpios = <&porte 10 GPIO_ACTIVE_HIGH>;
 		/*vad-out-gpios = <&porta 6 GPIO_ACTIVE_HIGH>;*/
-		ldo-en = <0xdf>; /*EN_LDO1P5 bit6:1   EN_LDO1P7 bit5:0*/
+		ldo-en = <0xff>; /*EN_LDO1P5 bit6:1   EN_LDO1P7 bit5:1*/
 	};
 };
 

6920_bsp_release/linux/kernel/linux-5.10.106/drivers/gpio/gpio-dwapb.c

@@ -753,6 +753,7 @@ static int dwapb_gpio_suspend(struct device *dev)
 		ctx->ext = dwapb_read(gpio, offset);
 
 		/* Only port A can provide interrupts */
+#if 0		
 		if (idx == 0) {
 			ctx->int_mask	= dwapb_read(gpio, GPIO_INTMASK);
 			ctx->int_en	= dwapb_read(gpio, GPIO_INTEN);
@@ -763,6 +764,7 @@ static int dwapb_gpio_suspend(struct device *dev)
 			/* Mask out interrupts */
 			dwapb_write(gpio, GPIO_INTMASK, ~ctx->wake_en);
 		}
+#endif			
 	}
 	spin_unlock_irqrestore(&gc->bgpio_lock, flags);
 
@@ -800,6 +802,7 @@ static int dwapb_gpio_resume(struct device *dev)
 		dwapb_write(gpio, offset, ctx->ext);
 
 		/* Only port A can provide interrupts */
+#if 0		
 		if (idx == 0) {
 			dwapb_write(gpio, GPIO_INTTYPE_LEVEL, ctx->int_type);
 			dwapb_write(gpio, GPIO_INT_POLARITY, ctx->int_pol);
@@ -810,6 +813,7 @@ static int dwapb_gpio_resume(struct device *dev)
 			/* Clear out spurious interrupts */
 			dwapb_write(gpio, GPIO_PORTA_EOI, 0xffffffff);
 		}
+#endif			
 	}
 	spin_unlock_irqrestore(&gc->bgpio_lock, flags);
 

6920_bsp_release/linux/kernel/linux-5.10.106/drivers/rpmsg/acme_rpmsg_rpc.c

@@ -322,7 +322,8 @@ int acme_wakeup_source_read(uint32_t code, void* wakeup_data, uint32_t length)
 		kfree(msg);
 		return -1;
 	}
-
+	
+	wakeup_source_acked = 0;
 	mutex_lock(&rpc_dev.mutex);
 	ret = rpmsg_send(rpc_dev.rpdev->ept, msg, sizeof(struct saRPC_MSG) + msg->head.len);
 	if (ret) {
@@ -556,8 +557,8 @@ static int rpmsg_rpc_cb(struct rpmsg_device *rpdev, void *data, int len,
 				break;
 #endif				
 			case RPMSG_CMD_SET_S2MEM_WAKEUP:
-				set_s2m_wakeup_acked = 1;
 				kfifo_in_spinlocked(&rpc_dev.rx_fifo, data, len, &rpc_dev.fifo_lock);
+				set_s2m_wakeup_acked = 1;
 				wake_up(&rpc_dev.rpc_ack_waitq);
 				break;	
 #if 0					
@@ -568,13 +569,14 @@ static int rpmsg_rpc_cb(struct rpmsg_device *rpdev, void *data, int len,
 				break;	
 #endif
 			case RPMSG_CMD_9710_REG_READ:
-				read_sa9710_acked = 1;
 				kfifo_in_spinlocked(&rpc_dev.rx_fifo, data, len, &rpc_dev.fifo_lock);
+				read_sa9710_acked = 1;
 				wake_up(&rpc_dev.rpc_ack_waitq);
-				break;		
+				break;
+				//move wakeup_source_acked after kfifo_in_spinlocked,fix recv date but kfifo_out_spinlocked return 0@2021-09-06 zmh
 			case RPMSG_CMD_WAKEUP_SRC_READ:
-				wakeup_source_acked = 1;
 				kfifo_in_spinlocked(&rpc_dev.rx_fifo, data, len, &rpc_dev.fifo_lock);
+				wakeup_source_acked = 1;
 				wake_up(&rpc_dev.rpc_ack_waitq);
 				break;
             default:

6920_bsp_release/linux/kernel/linux-5.10.106/drivers/spi/spi-dw-core.c

@@ -331,9 +331,6 @@ static u32 dw_spi_prepare_cr0(struct dw_spi *dws, struct spi_device *spi)
 			cr0 |= DWC_SSI_CTRLR0_KEEMBAY_MST;
 	}
 
-	spi_enable_chip(dws, 0);
-	dw_writel(dws, DW_SPI_CTRLR0, cr0);
-	spi_enable_chip(dws, 1);
 	return cr0;
 }
 

6920_bsp_release/linux/kernel/linux-5.10.106/sound/soc/dwc/dwc-i2s.c

@@ -941,6 +941,7 @@ static int dw_i2s_probe(struct platform_device *pdev)
 		break;
 	}
 
+    dev->clk_is_enabled = false;
 	//pclk
 	dev->pclk = devm_clk_get_optional(&pdev->dev, "pclk");
 	if (IS_ERR(dev->pclk)) 
@@ -966,7 +967,8 @@ static int dw_i2s_probe(struct platform_device *pdev)
 				return ret;	
 		}
 	}
-	
+    i2s_clk_enable(dev);
+
 	dev->i2s_reg_comp1 = I2S_COMP_PARAM_1;
 	dev->i2s_reg_comp2 = I2S_COMP_PARAM_2;
 	if (pdata) {

6920_bsp_release/pack_tool/burn_pack_ini/linux/burn_pack_evb-v16-xip-linux32.ini

+[boot_info]
+name = boot_info
+bin_file = bootinfo-6920-linux-xip-aarch32-any-image.bin
+store_addr = auto
+max_size = 24K
+
+[image1]
+# 不要更改name
+name = unspecified
+bin_file = unspecified1
+#存储地址以烧录固件分区为偏移起点, 必须按照Flash擦除最小单元对齐
+#不能加载到DDR, 保存冷启动快起静态参数, store_addr确保占用单独的擦写单元
+store_addr = 0xF90000
+max_size = 8K
+load_addr = 0x202E0000
+
+[image2]
+# 不要更改name
+name = unspecified
+bin_file = unspecified2
+#存储地址以烧录固件分区为偏移起点，必须按照Flash擦除最小单元对齐
+#不能加载到DDR, 保存冷启动快起动态参数, store_addr确保占用单独的擦写单元
+store_addr = 0xFA0000
+max_size = 1K
+load_addr = 0x202F0000
+
+[image3]
+name = star_app
+bin_file = star_app_evb_v16.bin
+store_addr = auto
+max_size = 256K
+
+[image4]
+name = firmware
+bin_file = firmware.bin
+store_addr = auto
+max_size = 256K
+
+[image5]
+name = kernel
+bin_file = zImage
+store_addr = auto
+max_size = 16M
+
+[image6]
+name = dtb
+bin_file = sa6920-ipc-evb-v16.dtb
+store_addr = auto
+max_size = 48K
\ No newline at end of file

6920_bsp_release/rt-thread-nano/bsp/sa692x/star/applications/filter/icr/service_icr.c

@@ -77,6 +77,7 @@ extern SA_S32 ServerLoadIspCfgExt(char *pAttrData, SA_U32 u32AttrSize, char* pPa
 extern SA_S32 ServerLoadIspCfg(ISP_ATTR_ALL_S *pstAttr, char* pPath);
 #endif
 
+extern rt_uint32_t rt_hw_timer_get(void);
 #define BSP_USING_NANO_ICR
 #if defined(BSP_USING_NANO_ICR)
 #include <rtthread.h>
@@ -382,11 +383,11 @@ int icr_ctrl(int on)
     rt_pin_write(HW_ICR_NIGHT_GPIO, PIN_LOW);
 
     if(on){
-        rt_kprintf("%s switch day !\n", __func__);
+        rt_kprintf("[%d]switch day\n", (0xfffffffful-rt_hw_timer_get())/24000);
         rt_pin_write(HW_ICR_DAY_GPIO, PIN_LOW);
         rt_pin_write(HW_ICR_NIGHT_GPIO, PIN_HIGH);
     } else {
-        rt_kprintf("%s switch night !\n", __func__);
+        rt_kprintf("[%d]switch night\n", (0xfffffffful-rt_hw_timer_get())/24000);
         rt_pin_write(HW_ICR_DAY_GPIO, PIN_HIGH);
         rt_pin_write(HW_ICR_NIGHT_GPIO, PIN_LOW);
     }
@@ -1163,14 +1164,14 @@ static void ISP_ICR_SetIcrMode(ALG_MODE_CHANG_STATUS innerChgStat)
         // ServiceICRSetWbStatRestrict(g_curIcrMode);
         //ServiceICRSetAWBCtrl(g_curIcrMode);
         isp_icr_ctrl(ICR_DAY_COLOR == g_curIcrMode ? ICR_ON : ICR_OFF);
-        rt_kprintf("[ICR]WB and filter changed\n");
+        rt_kprintf("[%d]ICR changed\n", (0xfffffffful-rt_hw_timer_get())/24000);
     }
     else if (MODE_CHANGE_COLOR_DOING == innerChgStat)
     {
         // SAMPLE_ICR_SetColor(g_curIcrMode);
         //ServiceICRSetWbStatRestrict(g_curIcrMode);
         // ServerModCtlSwitch(0, g_curIcrMode);
-        rt_kprintf("[ICR]Color changed\n");
+        // rt_kprintf("[ICR]Color changed\n");
     }
 }
 #if 0

6920_bsp_release/rt-thread-nano/bsp/sa692x/star/applications/main.c

@@ -519,9 +519,13 @@ static void MX_GPIO_Init(void)
 #endif
 
 #if (BOARD_PLATFORM==PLAT_BC22E) || (BOARD_PLATFORM==PLAT_BC6)
+    sa_set_padcfs(PADCONF_GPIO_A1,PADC_FS_GPIO_A1);
+    rt_pin_mode(GPIO_PORT_A_PIN_1, PIN_MODE_OUTPUT);
+    rt_pin_write(GPIO_PORT_A_PIN_1, PIN_LOW);
+
     sa_set_padcfs(PADCONF_GPIO_A0,PADC_FS_GPIO_A0);
     rt_pin_mode(GPIO_PORT_A_PIN_0, PIN_MODE_OUTPUT);
-    rt_pin_write(GPIO_PORT_A_PIN_0, PIN_LOW);
+
     sa_set_padcfs(PADCONF_GPIO_D6 ,PADC_FS_GPIO_D6);
     sa_set_padcfs(PADCONF_GPIO_D5 ,PADC_FS_GPIO_D5);
 #endif

6920_bsp_release/rt-thread-nano/bsp/sa692x/star/applications/power_ctrl.c

@@ -526,7 +526,7 @@ void shutdown_filter_powerup_procee(void)
         register_func.pfn_icr_init = SA_ICR_Init;
         register_func.pfn_icr_run = SA_ICR_Run;
         register_func.pfn_icr_exit = SA_ICR_Exit;
-        thread_attr.u32StackSize = 4*1024;
+        thread_attr.u32StackSize = 8*1024;
         thread_attr.u8Priority = 19;
         thread_attr.u32Tick = 5;
         SA_SENSOR_GetSnsObj(&stSnsObj);

6920_bsp_release/rt-thread-nano/bsp/sa692x/star/rtconfig.h

@@ -280,7 +280,7 @@
 #define BSP_USING_PWM
 #define BSP_MOUDLE_WITHIN_TIMER_PWM
 #define BSP_USING_PWM0
-/*CONFIG_BSP_USING_PWM1=y */
+#define BSP_USING_PWM1
 #define BSP_USING_PWM2
 #define BSP_USING_PWM3
 #define BSP_USING_PWM4
@@ -291,19 +291,18 @@
 #define BSP_USING_PWM11
 #define BSP_USING_I2C
 #define BSP_USING_I2C0
-#define BSP_USING_I2C2
+#define BSP_USING_I2C1
 #define BSP_USING_STAR
 #define BSP_USING_WDT
 #define BSP_MOUDLE_WITHIN_WDT
 #define BSP_USING_DMAC
 #define BSP_USING_MAILBOX
 #define BSP_USING_NANO_FILTER
-#define PWM_ID_WL -1
-#define PWM_ID_IR -1
-#define SNS_IMX681
-#define BSP_USING_POWERON_QUICK_START
-#define BSP_STATIC_PARAM_ADDR 0x202E0000
-#define BSP_DYNAMIC_PARAM_ADDR 0x202F0000
+#define PWM_ID_WL 10
+#define PWM_ID_IR 11
+#define IRCUT_DRV_EN_PIN 89
+#define IRCUT_DRV_SPI_CSN_PIN 86
+#define SNS_OS04D10
 #define BSP_USING_SNS_RST_PIN 27
 #define BSP_USING_SPI
 #define BSP_USING_PIN
@@ -311,9 +310,6 @@
 /* Board extended module Drivers */
 
 #define BSP_USING_RPMSG
-/*CONFIG_BSP_USING_PMIC=y */
-/*CONFIG_PMIC_SA9710=y */
-/*CONFIG_BSP_TEST_PMIC=y */
 #define DEFAULT_SELECT
 
 /* sa692x ext Config */
@@ -323,9 +319,7 @@
 #define SA_USEING_LISTENING_PROCEE
 #define RT_USING_CPU_USAGE
 #define BSP_USING_SIMPLE_CMD
-#define BOARD_PLATFORM 4
-#define BSP_USING_I2S0
+#define BOARD_PLATFORM 2
 #define BOOT_FROM_SFC
-#define A55_USING_QSPI
 
 #endif

Release_Note.md

+# 2.5.0.8.2版本0.0
+## 发布日期：2025年03月31日
+
+### 更新内容
+
+1. 更新 IMX681 配置
+2. 修复了一些稳定性问题
+
 # 2.5.0.7.1版本0.3
 ## 发布日期：2025年03月27日
 

common/bin/media_imx681_lp.json → common/bin/media_imx681_stream_2M.json

@@ -17,9 +17,9 @@
         ],        
         "ViDev": 0, "MaxFps": 30.0, "MinFps": 30.0, "Mirror": 0, "Flip": 0, "Rotation": 0, "PyrOff": 0, "TnrOff": 0, "AinrOff": 0, 
         "Gdc": 0, "FilterColor": 0, "ViDumpDepth": 1, 
-        "IspFile": [ "/acme/conf/imx681/bin/3M_linear_Outdoor.bin",
-                     "/acme/conf/imx681/bin/3M_linear_Indoor_diff.bin","","","",
-                     "/acme/conf/imx681/bin/3M_linear_Blc_diff.bin"],
+        "IspFile": [ "/acme/conf/imx681/bin/2M_linear_Outdoor.bin",
+                     "/acme/conf/imx681/bin/2M_linear_Indoor_diff.bin","","","",
+                     "/acme/conf/imx681/bin/2M_linear_Blc_diff.bin"],
         "AinrFile": "/acme/conf/imx681/imx681_v01_001_800_rtl.bin",        
         "ProEnable": 0, "ISO": 100, "AWBCt": 5000, "SportEnable": 0, "MaxIntTime": 30000, 
         "venc": [

common/conf/imx681/isp_build_bin.json

@@ -13,6 +13,12 @@
 			{ "base": "3M_linear_Indoor.bin",   "origin": "3M_linear_Blc.bin",     			"diff":"3M_linear_Blc_diff.bin"},
 			{ "base": "3M_linear_Indoor.bin",   "origin": "3M_linear_Mono.bin",   			"diff":"3M_linear_Mono_diff.bin"},
 
+			{ "base": "2M_linear_Outdoor.bin",  "origin": "2M_linear_Indoor.bin",  			"diff":"2M_linear_Indoor_diff.bin"},
+			{ "base": "2M_linear_Indoor.bin",   "origin": "2M_linear_Aisp.bin",    			"diff":"2M_linear_Aisp_diff.bin"},	
+			{ "base": "2M_linear_Aisp.bin",     "origin": "2M_linear_Aisp_Ligth.bin",   	"diff":"2M_linear_Aisp_Ligth_diff.bin"},
+			{ "base": "2M_linear_Indoor.bin",   "origin": "2M_linear_Blc.bin",     			"diff":"2M_linear_Blc_diff.bin"},
+			{ "base": "2M_linear_Indoor.bin",   "origin": "2M_linear_Mono.bin",   			"diff":"2M_linear_Mono_diff.bin"},
+
 			{ "base": "12M_wdr_Outdoor.bin", 	"origin": "12M_wdr_Indoor.bin",  		"diff":"12M_wdr_Indoor_diff.bin"},
 			{ "base": "12M_wdr_Indoor.bin",  	"origin": "12M_wdr_Aisp.bin",    		"diff":"12M_wdr_Aisp_diff.bin"},	
 			{ "base": "12M_wdr_Aisp.bin",    	"origin": "12M_wdr_Aisp_Ligth.bin",   	"diff":"12M_wdr_Aisp_Ligth_diff.bin"},

run.sh

@@ -45,8 +45,9 @@ rootfs_copy_file() {
     rm system_temp/lib/modules/vpss.ko
     rm system_temp/lib/modules/sa6920-i2c.dtbo
     cp common/modules/sa6920-i2c.dtbo system_temp/lib/modules/
-    cp common/bin* system_temp/ -rf
-    cp common/conf/* system_temp/ -rf
+    mkdir -p system_temp/bin
+    cp common/bin/* system_temp/bin -rf
+    cp common/conf system_temp/ -rf
     cp common/bin/lite_imx681* system_temp/bin/
     cp common/script/load_glasses_all.sh system_temp/scripts/
     cp sdk/lib/modules/isp_all.ko   system_temp/lib/modules/

sdk/bin/ipc_imx681j_normal.json

@@ -44,9 +44,9 @@
                         "file": "/acme/bin/logo256x128.2bpp"
                     },
                     { 
-                        "enable": 0, "osd": "time", "style": 1,
+                        "enable": 0, "osd": "time", 
                         "rect": { "x": 3200, "y": 2928, "width": 800, "height": 64 }, 
-                        "color": [ 16777215, 2236962, 16745541 ]
+                        "color": [ 16777215, 6171602, 16745541 ]
                     }
                 ]
             },

sdk/bin/ipc_imx681v_normal.json

@@ -44,9 +44,9 @@
                         "file": "/acme/bin/logo256x128.2bpp"
                     },
                     { 
-                        "enable": 0, "osd": "time", "style": 1,
+                        "enable": 0, "osd": "time", 
                         "rect": { "x": 1088, "y": 984, "width": 800, "height": 64 }, 
-                        "color": [ 16777215, 2236962, 16745541 ]
+                        "color": [ 16777215, 6171602, 16745541 ]
                     }
                 ]
             },

sdk/bin/ipc_os04d10_aor.json

@@ -44,9 +44,9 @@
                         "file": "/acme/bin/logo256x128.2bpp"
                     },
                     { 
-                        "enable": 1, "osd": "time", "style": 1,
+                        "enable": 1, "osd": "time", 
                         "rect": { "x": 1728, "y": 1344, "width": 800, "height": 64 }, 
-                        "color": [ 16777215, 2236962, 16745541 ]
+                        "color": [ 16777215, 6171602, 16745541 ]
                     }
                 ]
             }

sdk/bin/ipc_os04d10_deepsleep.json

@@ -44,9 +44,9 @@
                         "file": "/acme/bin/logo256x128.2bpp"
                     },
                     { 
-                        "enable": 1, "osd": "time", "style": 1,
+                        "enable": 1, "osd": "time", 
                         "rect": { "x": 1728, "y": 1344, "width": 800, "height": 64 }, 
-                        "color": [ 16777215, 2236962, 16745541 ]
+                        "color": [ 16777215, 6171602, 16745541 ]
                     }
                 ]
             }

sdk/bin/ipc_os04d10_normal.json

@@ -44,9 +44,9 @@
                         "file": "/acme/bin/logo256x128.2bpp"
                     },
                     { 
-                        "enable": 1, "osd": "time", "style": 1,
+                        "enable": 1, "osd": "time", 
                         "rect": { "x": 1728, "y": 1344, "width": 800, "height": 64 }, 
-                        "color": [ 16777215, 2236962, 16745541 ]
+                        "color": [ 16777215, 6171602, 16745541 ]
                     }
                 ]
             },

sdk/bin/ipc_os04d10_normal_rotation.json

@@ -44,9 +44,9 @@
                         "file": "/acme/bin/logo256x128.2bpp"
                     },
                     { 
-                        "enable": 1, "osd": "time", "style": 1,
+                        "enable": 1, "osd": "time", 
                         "rect": { "x": 608, "y": 2464, "width": 800, "height": 64 }, 
-                        "color": [ 16777215, 2236962, 16745541 ]
+                        "color": [ 16777215, 6171602, 16745541 ]
                     }
                 ]
             }

sdk/bin/ipc_os04j10_normal.json

@@ -44,9 +44,9 @@
                         "file": "/acme/bin/logo256x128.2bpp"
                     },
                     { 
-                        "enable": 1, "osd": "time", "style": 1,
+                        "enable": 1, "osd": "time", 
                         "rect": { "x": 1728, "y": 1344, "width": 800, "height": 64 }, 
-                        "color": [ 16777215, 2236962, 16745541 ]
+                        "color": [ 16777215, 6171602, 16745541 ]
                     }
                 ]
             },

sdk/bin/ipc_os04l10_normal.json

@@ -44,9 +44,9 @@
                         "file": "/acme/bin/logo256x128.2bpp"
                     },
                     { 
-                        "enable": 1, "osd": "time", "style": 1,
+                        "enable": 1, "osd": "time", 
                         "rect": { "x": 1728, "y": 1344, "width": 800, "height": 64 }, 
-                        "color": [ 16777215, 2236962, 16745541 ]
+                        "color": [ 16777215, 6171602, 16745541 ]
                     }
                 ]
             },

sdk/bin/ipc_os05l10_normal.json

@@ -44,9 +44,9 @@
                         "file": "/acme/bin/logo256x128.2bpp"
                     },
                     { 
-                        "enable": 1, "osd": "time", "style": 1,
+                        "enable": 1, "osd": "time", 
                         "rect": { "x": 1728, "y": 1344, "width": 800, "height": 64 }, 
-                        "color": [ 16777215, 2236962, 16745541 ]
+                        "color": [ 16777215, 6171602, 16745541 ]
                     }
                 ]
             }