Merge branch 'Branch_S550_Fast_Emmc' of 192.168.6.216:linux-em-group/s530-ntk into Branch_S550_Emmc

BSP/u-boot/drivers/video/novatek/drv_videoout/nvt-na51089/ide/ide_platform.c

@@ -259,16 +259,30 @@ UINT32 pll_get_pll_freq(PLL_ID id)
 */
 UINT32 pll_get_clock_rate(PLL_CLKSEL clk_sel)
 {
-	UINT32      ui_mask, ui_reg_offset;
+    UINT32      ui_mask, ui_reg_offset;
-	REGVALUE    reg_data;
+    REGVALUE    reg_data;
 
-	ui_reg_offset = 0x20;
+//    ui_reg_offset = 0x20;
-	ui_mask = (0x7<<PLL_CLKSEL_IDE_CLKSRC_OFS);
+//    ui_mask = (0x7<<PLL_CLKSEL_IDE_CLKSRC_OFS);
+    if (clk_sel == PLL_CLKSEL_IDE_CLKSRC) {
+        ui_reg_offset = 0x20;
+        ui_mask = (0x7<<PLL_CLKSEL_IDE_CLKSRC_OFS);
+    } else if (clk_sel == PLL_CLKSEL_IDE_CLKDIV) {
+        ui_reg_offset = 0x34;
+        ui_mask = (0xFF);
+    } else if (clk_sel == PLL_CLKSEL_IDE_OUTIF_CLKDIV) {
+        ui_reg_offset = 0x34;
+        ui_mask = (0xFF << 8);
+    } else {
+        DBG_WRN("pll_get_clock_rate fail, return 0\r\n");
+        return 0;
+    }
 
-	reg_data = INREG32(IOADDR_CG_REG_BASE + ui_reg_offset);
-	reg_data &= ui_mask;
 
-	return (UINT32)reg_data;
+    reg_data = INREG32(IOADDR_CG_REG_BASE + ui_reg_offset);
+    reg_data &= ui_mask;
+
+    return (UINT32)reg_data;
 }
 
 void pll_set_clock_rate(PLL_CLKSEL clk_sel, UINT32 ui_value)

BSP/u-boot/drivers/video/novatek/nvt_panel/disp_if8b_lcd1_psd200_st7789v/panel.c

@@ -224,7 +224,9 @@ const T_PANEL_CMD t_cmd_mode_rgb320[] = {
 const T_LCD_PARAM t_mode[] = {
     /***********       RGB Serial MODE         *************/
 	{
+
 		// T_PANEL_PARAM
+#if 0
 		{
 			/* Old prototype */
             PINMUX_LCDMODE_RGB_SERIAL,      //!< LCDMode
@@ -264,6 +266,48 @@ const T_LCD_PARAM t_mode[] = {
             0x0A,                           //!< uiHSyncSYNCwidth
             0x04,                           //!< uiVSyncSYNCwidth
         },
+#else
+		{
+			/* Old prototype */
+			PINMUX_LCDMODE_RGB_THROUGH,      //!< LCDMode
+//			18000000 / 3 , //24.0f,                 //!< fDCLK
+			5000000,
+#if 1
+            1024 / 3,//PANELWIDTH + 69*2,                           //!< uiHSyncTotalPeriod
+			720 / 3,//PANELWIDTH,                            //!< uiHSyncActivePeriod
+            69 / 3,                             //!< uiHSyncBackPorch
+            384,//PANELHEIGHT + 40,                            //!< uiVSyncTotalPeriod
+            344,                            //!< uiVSyncActivePeriod
+            2,                              //!< uiVSyncBackPorchOdd
+            2,                              //!< uiVSyncBackPorchEven
+            720 / 3,//320,//PANELWIDTH,                            //!< uiBufferWidth
+            320,//720,//PANELHEIGHT,                            //!< uiBufferHeight
+            720 / 3,//320,//PANELWIDTH,                            //!< uiWindowWidth
+            320,//720,//PANELHEIGHT,                            //!< uiWindowHeight
+#endif
+
+#if 0
+			PANELWIDTH + 200,							//!< uiHSyncTotalPeriod
+			PANELWIDTH,							 //!< uiHSyncActivePeriod
+			10, 							//!< uiHSyncBackPorch
+			PANELHEIGHT + 140, 						   //!< uiVSyncTotalPeriod
+			PANELHEIGHT,							//!< uiVSyncActivePeriod
+			4,								//!< uiVSyncBackPorchOdd
+			4,								//!< uiVSyncBackPorchEven
+			PANELWIDTH,							 //!< uiBufferWidth
+			PANELHEIGHT,							  //!< uiBufferHeight
+			PANELWIDTH,							 //!< uiWindowWidth
+			PANELHEIGHT,							  //!< uiWindowHeight
+#endif
+
+
+			FALSE,                          //!< bYCbCrFormat
+
+            /* New added parameters */
+            0x0A,                           //!< uiHSyncSYNCwidth
+            0x04,                           //!< uiVSyncSYNCwidth
+        },
+#endif
 
         // tIDE_PARAM
         {
@@ -273,8 +317,8 @@ const T_LCD_PARAM t_mode[] = {
             {FALSE,FALSE},                  //!< dithering[2];
             DISPLAY_DEVICE_TOPPOLY,         //!< **DONT-CARE**
             IDE_PDIR_RBG,                   //!< pdir;
-            IDE_LCD_G,                      //!< odd;
+			IDE_LCD_B,                      //!< odd;
-            IDE_LCD_G,                      //!< even;
+			IDE_LCD_B,                      //!< even;
             TRUE,                           //!< hsinv;
             TRUE,                           //!< vsinv;
             FALSE,                          //!< hvldinv;

code/application/source/cardv/SrcCode/System/SysMain_Exe.c

@@ -227,15 +227,15 @@ INT32 System_OnBoot(VControl *pCtrl, UINT32 paramNum, UINT32 *paramArray)
 		Load_MenuInfo();
 #endif
 #else
-#if (BOOT_RESET_MENU_INFO == ENABLE)
+// #if (BOOT_RESET_MENU_INFO == ENABLE)
-		//EMMC_AS_PSTORE
+// 		//EMMC_AS_PSTORE
-        #if (defined(_CPU2_LINUX_) && defined(_EMBMEM_EMMC_))
+//         #if (defined(_CPU2_LINUX_) && defined(_EMBMEM_EMMC_))
-		System_OnStrgInit_PS(); //because ps uses filesys in this case, so ps init was moved here.
+// 		System_OnStrgInit_PS(); //because ps uses filesys in this case, so ps init was moved here.
-		Load_MenuInfo();
+// 		Load_MenuInfo();
-		#else
+// 		#else
-        Load_MenuInfo(); //reset value cause the FL_FSStatus as '0', we do so before NVTEVT_STRG_ATTACH finish
+//         Load_MenuInfo(); //reset value cause the FL_FSStatus as '0', we do so before NVTEVT_STRG_ATTACH finish
-        #endif
+//         #endif
-#endif
+// #endif
 #endif
 		//#NT#2016/12/14#Niven Cho -end
 #if (BOOT_RESET_MENU_INFO == ENABLE)

code/application/source/cardv/SrcCode/System/SysMain_cmd.c

@@ -281,6 +281,7 @@ SXCMD_ITEM("uiprint %", sf_cmd_para_printf, "uiprint")
 SXCMD_ITEM("blusw %", cmd_blu_switch, "blusw 0/1")
 SXCMD_ITEM("wifisw %", cmd_wifi_switch, "wifisw 0/1")
 SXCMD_ITEM("lcdbk %", sf_set_backlight_status, "lcdbk 0/1")
+SXCMD_ITEM("sfdump %", sf_vos_perf_list_dump, "sfdump")
 #endif
 
 #if FS_MULTI_STRG_FUNC /* test cmd */

code/application/source/cardv/SrcCode/System/main.c

@@ -388,6 +388,7 @@ int NvtMain(void)
 {
     #if HUNTING_CAMERA_MCU == ENABLE
     sf_cardv_check_power_on_mode();
+    sf_cardv_load_menu_info_start();
     #endif
 	System_InstallID();
 #if (USB_MODE==ENABLE)

code/hdal/ext_devices/panel/display_panel/disp_if8b_lcd1_psd200_st7789v/panel.c

@@ -237,7 +237,9 @@ const T_PANEL_CMD t_cmd_mode_rgb320[] = {
 const T_LCD_PARAM t_mode[] = {
     /***********       RGB Serial MODE         *************/
 	{
+
 		// T_PANEL_PARAM
+#if 0
 		{
 			/* Old prototype */
             PINMUX_LCDMODE_RGB_SERIAL,      //!< LCDMode
@@ -277,6 +279,48 @@ const T_LCD_PARAM t_mode[] = {
             0x0A,                           //!< uiHSyncSYNCwidth
             0x04,                           //!< uiVSyncSYNCwidth
         },
+#else
+		{
+			/* Old prototype */
+			PINMUX_LCDMODE_RGB_THROUGH,      //!< LCDMode
+//			18000000 / 3 , //24.0f,                 //!< fDCLK
+			5000000,
+#if 1
+            1024 / 3,//PANELWIDTH + 69*2,                           //!< uiHSyncTotalPeriod
+			720 / 3,//PANELWIDTH,                            //!< uiHSyncActivePeriod
+            69 / 3,                             //!< uiHSyncBackPorch
+            384,//PANELHEIGHT + 40,                            //!< uiVSyncTotalPeriod
+            344,                            //!< uiVSyncActivePeriod
+            2,                              //!< uiVSyncBackPorchOdd
+            2,                              //!< uiVSyncBackPorchEven
+            720 / 3,//320,//PANELWIDTH,                            //!< uiBufferWidth
+            320,//720,//PANELHEIGHT,                            //!< uiBufferHeight
+            720 / 3,//320,//PANELWIDTH,                            //!< uiWindowWidth
+            320,//720,//PANELHEIGHT,                            //!< uiWindowHeight
+#endif
+
+#if 0
+			PANELWIDTH + 200,							//!< uiHSyncTotalPeriod
+			PANELWIDTH,							 //!< uiHSyncActivePeriod
+			10, 							//!< uiHSyncBackPorch
+			PANELHEIGHT + 140, 						   //!< uiVSyncTotalPeriod
+			PANELHEIGHT,							//!< uiVSyncActivePeriod
+			4,								//!< uiVSyncBackPorchOdd
+			4,								//!< uiVSyncBackPorchEven
+			PANELWIDTH,							 //!< uiBufferWidth
+			PANELHEIGHT,							  //!< uiBufferHeight
+			PANELWIDTH,							 //!< uiWindowWidth
+			PANELHEIGHT,							  //!< uiWindowHeight
+#endif
+
+
+			FALSE,                          //!< bYCbCrFormat
+
+            /* New added parameters */
+            0x0A,                           //!< uiHSyncSYNCwidth
+            0x04,                           //!< uiVSyncSYNCwidth
+        },
+#endif
 
         // tIDE_PARAM
         {
@@ -286,8 +330,8 @@ const T_LCD_PARAM t_mode[] = {
             {FALSE,FALSE},                  //!< dithering[2];
             DISPLAY_DEVICE_TOPPOLY,         //!< **DONT-CARE**
             IDE_PDIR_RBG,                   //!< pdir;
-            IDE_LCD_G,                      //!< odd;
+			IDE_LCD_B,                      //!< odd;
-            IDE_LCD_G,                      //!< even;
+			IDE_LCD_B,                      //!< even;
             TRUE,                           //!< hsinv;
             TRUE,                           //!< vsinv;
             FALSE,                          //!< hvldinv;

code/lib/source/sifar/code/include/sf_common.h

@@ -202,4 +202,6 @@ void sf_set_cammode_statu(char is);
 BOOL sf_set_backlight_status(unsigned char argc, char **argv);
 UINT8 sf_get_net_generation(void);
 void sf_set_net_generation(UINT8 value);
+UINT32 sf_cardv_load_menu_info_start(void);
+BOOL sf_vos_perf_list_dump(unsigned char argc, char **argv);
 #endif

code/lib/source/sifar/code/source/common/sf_common.c

@@ -134,6 +134,12 @@ static SF_THREAD_S WaiParaTskCfg =
 	.IsRun = 0,
 	.TskId = -1,
 };
+
+static SF_THREAD_S LoadParaTskCfg =
+{
+	.IsRun = 0,
+	.TskId = -1,
+};
 int sf_pir_statu_read(void)
 {
 	static UINT8 state = 0;
@@ -3454,4 +3460,42 @@ void sf_set_net_generation(UINT8 value)
 	{
 		printf("[%s:%d]value(%d) invalid,no set.\n", __FUNCTION__, __LINE__, value);		
 	}
+}
+
+void* sf_cardv_load_menu_info_thread(void *arg)
+{
+    vos_perf_list_mark(__func__, __LINE__, 0);
+    SLOGI("thread run\n");
+   	LoadParaTskCfg.IsRun = 1;
+    Load_MenuInfo();
+    SLOGI("thread end\n");
+
+	LoadParaTskCfg.IsRun = 0;
+    vos_perf_list_mark(__func__, __LINE__, 0);
+	return NULL;
+}
+UINT32 sf_cardv_load_menu_info_start(void)
+{
+    SINT32 ret = 1;
+	if(LoadParaTskCfg.IsRun)
+	{	
+		SLOGE("thread has already run !!!\n");
+		return 1;
+	}
+	ret = pthread_create(&LoadParaTskCfg.TskId, NULL, sf_cardv_load_menu_info_thread, NULL);
+	if(ret != SF_SUCCESS)
+	{	
+        MLOGD("thread  creat fail!\n");
+		return ret;
+	}
+	return SF_SUCCESS;
+
+}
+
+BOOL sf_vos_perf_list_dump(unsigned char argc, char **argv)
+{
+	vos_perf_list_dump();
+    sleep(1);
+    system("dmesg");
+	return TRUE;
 }

configs/Linux/cfg_565_HUNTING_EVB_LINUX_4G_S550/nvt-top.dtsi

@@ -17,7 +17,7 @@
 	pwm2{pinmux = <0x0000000>;};
 	ccnt{pinmux = <0x0>;};
 	audio{pinmux = <0x0>;};
-	lcd{pinmux = <0x10000000>;};
+	lcd{pinmux = <0x10000006>;};/* rgb through */
 	tv{pinmux = <0x0>;};
 	eth{pinmux = <0x0>;};
 	misc{pinmux = <0x0>;};

rtos/code/application/source/cardv/SrcCode/FastFlow/flow_boot_logo.c

@@ -405,20 +405,20 @@ static THREAD_RETTYPE thread_videoout(void *ptr)
 			pxlfmt) != HD_OK){
 		goto exit;
 	}
-	HD_URECT rect = (HD_URECT){0, 0, 720, 320};
+//    HD_URECT rect = (HD_URECT){0, 0, 720, 320};
 
-	//HD_URECT rect = (HD_URECT){0, 0, videoout_syscaps.output_dim.w, videoout_syscaps.output_dim.h};
+    HD_URECT rect = (HD_URECT){0, 0, videoout_syscaps.output_dim.w, videoout_syscaps.output_dim.h};
-	if(flow_boot_logo_videoout_set_param_in_win(path_id, rect) != HD_OK){
+    if(flow_boot_logo_videoout_set_param_in_win(path_id, rect) != HD_OK){
-		goto exit;
+        goto exit;
-	}
+    }
 
-	hd_videoout_start(path_id);
+    hd_videoout_start(path_id);
 
 exit:
-	vos_flag_set(task_param->flag, FLAG_VIDEOOUT_TASK_EXIT);
+    vos_flag_set(task_param->flag, FLAG_VIDEOOUT_TASK_EXIT);
 
-	LINUX_BOOT_MSG("%s exit\n", __func__);
+    LINUX_BOOT_MSG("%s exit\n", __func__);
-	THREAD_RETURN(0);
+    THREAD_RETURN(0);
 }
 
 static THREAD_RETTYPE thread_videodec(void *ptr)

rtos/code/application/source/cardv/SrcCode/System/SysMain_cmd.c

@@ -12,7 +12,9 @@
 #endif
 #include <gsensor.h>
 #include "UIApp/AppDisp_PipView.h"
-
+#if HUNTING_CAMERA_MCU == ENABLE
+#include "sys_fastboot.h"
+#endif
 #define THIS_DBGLVL         2 // 0=FATAL, 1=ERR, 2=WRN, 3=UNIT, 4=FUNC, 5=IND, 6=MSG, 7=VALUE, 8=USER
 ///////////////////////////////////////////////////////////////////////////////
 #define __MODULE__          SysMainCmd
@@ -201,6 +203,15 @@ static BOOL Cmd_PowerOff_Test(unsigned char argc, char **argv)
 	return TRUE;
 }
 
+#if HUNTING_CAMERA_MCU == ENABLE
+static BOOL sf_log_fastboot_msg_en(unsigned char argc, char **argv)
+{
+     fastboot_msg_en(ENABLE);
+     DBG_DUMP("log ENABLE\r\n");
+     return TRUE;
+}
+#endif
+
 SXCMD_BEGIN(sys_cmd_tbl, "system command")
 SXCMD_ITEM("mem %", cmd_sys_mem, "system memory layout")
 SXCMD_ITEM("pip %", Cmd_user_pip, "pip view style")
@@ -214,7 +225,9 @@ SXCMD_ITEM("curl", Cmd_user_CurlTest, "curl command test")
 #endif
 
 SXCMD_ITEM("power_off %", Cmd_PowerOff_Test, "flowpreview power off test")
-
+#if HUNTING_CAMERA_MCU == ENABLE
+SXCMD_ITEM("log %", sf_log_fastboot_msg_en, "log on")
+#endif
 SXCMD_END()
 
 

rtos/code/hdal/ext_devices/panel/display_panel/disp_if8b_lcd1_psd200_st7789v/panel.c

@@ -237,7 +237,9 @@ const T_PANEL_CMD t_cmd_mode_rgb320[] = {
 const T_LCD_PARAM t_mode[] = {
     /***********       RGB Serial MODE         *************/
 	{
+
 		// T_PANEL_PARAM
+#if 0
 		{
 			/* Old prototype */
             PINMUX_LCDMODE_RGB_SERIAL,      //!< LCDMode
@@ -277,6 +279,48 @@ const T_LCD_PARAM t_mode[] = {
             0x0A,                           //!< uiHSyncSYNCwidth
             0x04,                           //!< uiVSyncSYNCwidth
         },
+#else
+		{
+			/* Old prototype */
+			PINMUX_LCDMODE_RGB_THROUGH,      //!< LCDMode
+//			18000000 / 3 , //24.0f,                 //!< fDCLK
+			5000000,
+#if 1
+            1024 / 3,//PANELWIDTH + 69*2,                           //!< uiHSyncTotalPeriod
+			720 / 3,//PANELWIDTH,                            //!< uiHSyncActivePeriod
+            69 / 3,                             //!< uiHSyncBackPorch
+            384,//PANELHEIGHT + 40,                            //!< uiVSyncTotalPeriod
+            344,                            //!< uiVSyncActivePeriod
+            2,                              //!< uiVSyncBackPorchOdd
+            2,                              //!< uiVSyncBackPorchEven
+            720 / 3,//320,//PANELWIDTH,                            //!< uiBufferWidth
+            320,//720,//PANELHEIGHT,                            //!< uiBufferHeight
+            720 / 3,//320,//PANELWIDTH,                            //!< uiWindowWidth
+            320,//720,//PANELHEIGHT,                            //!< uiWindowHeight
+#endif
+
+#if 0
+			PANELWIDTH + 200,							//!< uiHSyncTotalPeriod
+			PANELWIDTH,							 //!< uiHSyncActivePeriod
+			10, 							//!< uiHSyncBackPorch
+			PANELHEIGHT + 140, 						   //!< uiVSyncTotalPeriod
+			PANELHEIGHT,							//!< uiVSyncActivePeriod
+			4,								//!< uiVSyncBackPorchOdd
+			4,								//!< uiVSyncBackPorchEven
+			PANELWIDTH,							 //!< uiBufferWidth
+			PANELHEIGHT,							  //!< uiBufferHeight
+			PANELWIDTH,							 //!< uiWindowWidth
+			PANELHEIGHT,							  //!< uiWindowHeight
+#endif
+
+
+			FALSE,                          //!< bYCbCrFormat
+
+            /* New added parameters */
+            0x0A,                           //!< uiHSyncSYNCwidth
+            0x04,                           //!< uiVSyncSYNCwidth
+        },
+#endif
 
         // tIDE_PARAM
         {
@@ -286,8 +330,8 @@ const T_LCD_PARAM t_mode[] = {
             {FALSE,FALSE},                  //!< dithering[2];
             DISPLAY_DEVICE_TOPPOLY,         //!< **DONT-CARE**
             IDE_PDIR_RBG,                   //!< pdir;
-            IDE_LCD_G,                      //!< odd;
+			IDE_LCD_B,                      //!< odd;
-            IDE_LCD_G,                      //!< even;
+			IDE_LCD_B,                      //!< even;
             TRUE,                           //!< hsinv;
             TRUE,                           //!< vsinv;
             FALSE,                          //!< hvldinv;