HFR 진행사항

Bank 의 이미지파일이 CRC가 안맞으면 File을 부팅시키지 않는다.

STM32F103_ATTEN_PLL_Zig.elf.launch

@@ -57,5 +57,5 @@
 </listAttribute>
 <stringAttribute key="org.eclipse.dsf.launch.MEMORY_BLOCKS" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;memoryBlockExpressionList context=&quot;reserved-for-future-use&quot;&gt;&#13;&#10;&lt;gdbmemoryBlockExpression address=&quot;536873172&quot; label=&quot;data&quot;/&gt;&#13;&#10;&lt;gdbmemoryBlockExpression address=&quot;536873172&quot; label=&quot;data&quot;/&gt;&#13;&#10;&lt;/memoryBlockExpressionList&gt;&#13;&#10;"/>
 <stringAttribute key="process_factory_id" value="org.eclipse.cdt.dsf.gdb.GdbProcessFactory"/>
-<stringAttribute key="saved_expressions&lt;seperator&gt;Unknown" value="update_data_buf,data"/>
+<stringAttribute key="saved_expressions&lt;seperator&gt;Unknown" value="update_data_buf,data,Bank1data,Bank2data,MBIC_BOOT_VERSION"/>
 </launchConfiguration>

Src/MBIC_Bootloader.c

@@ -275,6 +275,9 @@ void MBIC_Bootloader_FirmwareUpdate(uint8_t* data){
 //            printf("ccc\r\n");
         break;
         case MBIC_Download_DATA_REQ:
+       /*     bluecell_Currdatastatus.CPUVERSION1 = 0xFF;
+            bluecell_Currdatastatus.CPUVERSION2 = 0xFF;
+            bluecell_Currdatastatus.CPUVERSION3 = 0xFF;  */
             TotalFrame = data[MBIC_PAYLOADSTART + 0] << 24
                         |data[MBIC_PAYLOADSTART + 1] << 16
                         |data[MBIC_PAYLOADSTART + 2] << 8

Src/eeprom.c

@@ -69,13 +69,13 @@ void EEPROM_M24C08_Init(void){
     bluecell_Currdatastatus.CPU_Bank1_Image_Version2 = Bank1data[MBIC_BOOT_VERSION + 1];
     bluecell_Currdatastatus.CPU_Bank1_Image_Version3 = Bank1data[MBIC_BOOT_VERSION + 2];
 
-    pdata = &bluecell_Currdatastatus.CPU_Bank1_Image_Name;
-    printf("BANK1 IMAGE NAME : ");
-    for(int i = 0 ; i< 32; i++){
-       pdata[i] = Bank1data[MBIC_BOOT_FILENAME + i];
-       printf("%c",pdata[i]);
-    }
-    printf("\r\n");
+//    pdata = &bluecell_Currdatastatus.CPU_Bank1_Image_Name;
+//    printf("BANK1 IMAGE NAME : ");
+//    for(int i = 0 ; i< 32; i++){
+//       pdata[i] = Bank1data[MBIC_BOOT_FILENAME + i];
+//       printf("%c",pdata[i]);
+//    }
+//    printf("\r\n");
 
 
     bluecell_Currdatastatus.CPU_Bank2_Image_BuildTime1 = Bank2data[MBIC_BOOT_CREATION_TIME + 0];
@@ -89,13 +89,13 @@ void EEPROM_M24C08_Init(void){
     bluecell_Currdatastatus.CPU_Bank2_Image_Version2 = Bank2data[MBIC_BOOT_VERSION + 1];
     bluecell_Currdatastatus.CPU_Bank2_Image_Version3 = Bank2data[MBIC_BOOT_VERSION + 2];
 
-    pdata = & bluecell_Currdatastatus.CPU_Bank2_Image_Name;
-    printf("BANK2 IMAGE NAME : ");
-    for(int i = 0 ; i< 32; i++){
-       pdata[i] = Bank2data[MBIC_BOOT_FILENAME + i];  
-       printf("%c",pdata[i]);
-    }
-    printf("\r\n");
+//    pdata = & bluecell_Currdatastatus.CPU_Bank2_Image_Name;
+//    printf("BANK2 IMAGE NAME : ");
+//    for(int i = 0 ; i< 32; i++){
+//       pdata[i] = Bank2data[MBIC_BOOT_FILENAME + i];  
+//       printf("%c",pdata[i]);
+//    }
+//    printf("\r\n");
 
 
    printf("20%d Y / %d M / %d D / %d H / %d M / %d S  \r\n",
@@ -107,6 +107,7 @@ void EEPROM_M24C08_Init(void){
    Currdata[MBIC_BOOT_CREATION_TIME + 5]        
 );
 
+#if 0 // PYJ.2020.06.29_BEGIN -- 
     if(Currdata[MBIC_BOOT_VERSION + 0] == Bank1data[MBIC_BOOT_VERSION + 0]
      &&Currdata[MBIC_BOOT_VERSION + 1] == Bank1data[MBIC_BOOT_VERSION + 1]
      &&Currdata[MBIC_BOOT_VERSION + 2] == Bank1data[MBIC_BOOT_VERSION + 2]){
@@ -119,11 +120,12 @@ void EEPROM_M24C08_Init(void){
     }else{
       ret = 0;
     }
+#endif // PYJ.2020.06.29_END -- 
 
     bluecell_Currdatastatus.CPU_Current_Bank = ret;
     printf("MBIC BANK %d Booting \r\n",bluecell_Currdatastatus.CPU_Current_Bank);    
     printf("bluecell_Currdatastatus.CPU_Bank_Select : %d \r\n",bluecell_Currdatastatus.CPU_Bank_Select);
-
+    
     if(bluecell_Currdatastatus.CPU_Bank_Select == HFR_BANK2_SEL)
     {
        ret = HFR_BANK2_SEL;
@@ -187,6 +189,7 @@ void EEPROM_M24C08_Init(void){
         }
         crcret = crc32(&Bank2data[MBIC_BOOT_DATA], CrcLength);
     }
+#if 1 // PYJ.2020.06.29_BEGIN -- 
     printf("CRC LENGTH : %d,CRC LENGTH : %X \r\n",CrcLength,CrcLength);
     if(crcret != FileCrc){
         printf("CRC ERROR : %x , File CRC : %x \r\n",crcret,FileCrc);
@@ -194,8 +197,34 @@ void EEPROM_M24C08_Init(void){
     }
     else
         printf("CRC SUCCESS  : %x , File CRC : %x \r\n",crcret,FileCrc);      
+#endif // PYJ.2020.06.29_END -- 
+#if 0 // PYJ.2020.06.30_BEGIN -- 
+        uint32_t  CurrApiAddress = 0,Bank1Address=0,Bank2Address = 0;
+        int32_t CrcLength = 0;
+        CurrApiAddress = FLASH_MBICUSER_START_ADDR;
+        Bank1Address = FLASH_USER_BANK1_START_ADDR;
+        Bank2Address = FLASH_USER_BANK2_START_ADDR;
+
+        uint8_t* Currdata = (uint8_t*)CurrApiAddress;
+        uint8_t* Bank1data = (uint8_t*)Bank1Address;
+        uint8_t* Bank2data = (uint8_t*)Bank2Address;
+
+        uint16_t crcret = 0;
+
+        CrcLength=
+        ((Bank1data[MBIC_BOOT_LENGTH] << 24 ) 
+        | Bank1data[MBIC_BOOT_LENGTH + 1]<<16 
+        | Bank1data[MBIC_BOOT_LENGTH + 2]<<8   
+        | Bank1data[MBIC_BOOT_LENGTH + 3]);    
 
+        if(CrcLength > 0)
+            crcret = CRC16_Generate(Bank1data, CrcLength + 128);
+        CrcLength += 128;
+        
+        printf("Bank 1 Crc ret : %x  Length : %x :  %d \r\n",crcret ,CrcLength,CrcLength);
 
+        if()
+#endif // PYJ.2020.06.30_END -- 
     
     if(bluecell_Currdatastatus.CPU_Bank_Select == HFR_BANK1_SEL && bluecell_Currdatastatus.CPU_Current_Bank != HFR_BANK1_SEL){
         printf("Write Start BANK 1 Down Start\r\n");

Src/flash.c

@@ -17,7 +17,7 @@ fptr jump_to_app;
 uint32_t jump_addr;
 void Jump_App(void){
     __HAL_RCC_TIM6_CLK_DISABLE(); // 留ㅼ씤???占쏙옙癒몌옙?? ?占쏙옙占�??占쏙옙?占쏙옙?占쏙옙
-    printf("boot loader start\n");               //硫붿꽭占�? 異쒕젰
+    //printf("boot loader start\n");               //硫붿꽭占�? 異쒕젰
     jump_addr = *(__IO uint32_t*) (APPLICATION_ADDRESS + 4);
     jump_to_app = (fptr) jump_addr;
     

Src/main.c

@@ -166,7 +166,7 @@ int main(void)
   MX_NVIC_Init();
   /* USER CODE BEGIN 2 */
   HAL_TIM_Base_Start_IT(&htim6);
-  InitUartQueue(&TerminalQueue);
+  //InitUartQueue(&TerminalQueue);
   setbuf(stdout, NULL);
   /*printf("Uart Start \r\n");
   printf("Crc generate %x \r\n",CRC16_Generate(tempdata,11));*/
@@ -197,11 +197,11 @@ int main(void)
 //  while(1);
 #endif // PYJ.2020.06.28_END -- 
 
-  printf("BootLoader Start ---\r\n");
+  printf("BootStart ---\r\n");
   EEPROM_M24C08_Init();
 
 //  BootingBankSelect();
-  printf("BootLoader END\r\n");
+  printf("Boot END\r\n");
   Jump_App();
   while(1);