HFR 작업 내용

BOOT DATA Index 추가
Flash init 시 image Build  version 초기화 작업
MBIC bootloader   동작시 data 0xFF 로 초기화

Bluecell_Inc/Bluecell_operate.h

@@ -748,6 +748,7 @@ typedef enum{
     MBIC_BOOT_LENGTH = 61,
     MBIC_BOOT_CRC     =65,
     MBIC_BOOT_RESERVED =       69,
+    MBIC_BOOT_DATA = 128,
 
 }HFR_BootLoader_Index_;
 typedef enum{

Bluecell_Src/MBIC_Bootloader.c

@@ -228,6 +228,7 @@ void MBIC_Bootloader_FirmwareUpdate(uint8_t* data){
     uint8_t* Currdata = (uint8_t*)CurrApiAddress;
     uint8_t* Bank1data = (uint8_t*)Bank1Address;
     uint8_t* Bank2data = (uint8_t*)Bank2Address;    
+    uint8_t* pdata;
 #if 0 // PYJ.2020.06.04_BEGIN -- 
     uint8_t dataTest[1024] = {
       0x4A,0x54,0x2D,0x4E,0x52,0x44,0x41,0x53,0x20,0x20,0x00,0x00,
@@ -275,14 +276,22 @@ void MBIC_Bootloader_FirmwareUpdate(uint8_t* data){
             data[MBIC_PAYLOADSTART + index++] = 0;
               if(bluecell_Currdatastatus.CPU_Current_Bank == HFR_BANK1){
                 BankNum = HFR_BANK2;
+                pdata = & bluecell_Currdatastatus.CPU_Bank2_Image_Version1;
+                for(int i = 0; i < 41; i++)
+                    pdata[i] = 0xFF;  
+
               }else{
                 BankNum = HFR_BANK1;
+                pdata = & bluecell_Currdatastatus.CPU_Bank1_Image_Version1;
+                for(int i = 0; i < 41; i++)
+                    pdata[i] = 0xFF;  
               }           
 //            MBIC_DataBankWrite(1);
             //if()
 //            MBIC_DataErase_Func(bluecell_Currdatastatus.CPU_Bank_Select);
 //            HAL_Delay(10);
 //            printf("ccc\r\n");
+
         break;
         case MBIC_Download_DATA_REQ:
             TotalFrame = data[MBIC_PAYLOADSTART + 0] << 24
@@ -467,6 +476,16 @@ void MBIC_Bootloader_FirmwareUpdate(uint8_t* data){
                 data[MBIC_PAYLOADSTART + index++] = 0;  
             }
                 data[MBIC_PAYLOADSTART + index++] = 1;    
+            
+            bluecell_Currdatastatus.CPU_Bank2_Image_BuildTime1 = Bank2data[MBIC_BOOT_CREATION_TIME + 0];
+            bluecell_Currdatastatus.CPU_Bank2_Image_BuildTime2 = Bank2data[MBIC_BOOT_CREATION_TIME + 1];
+            bluecell_Currdatastatus.CPU_Bank2_Image_BuildTime3 = Bank2data[MBIC_BOOT_CREATION_TIME + 2];
+            bluecell_Currdatastatus.CPU_Bank2_Image_BuildTime4 = Bank2data[MBIC_BOOT_CREATION_TIME + 3];
+            bluecell_Currdatastatus.CPU_Bank2_Image_BuildTime5 = Bank2data[MBIC_BOOT_CREATION_TIME + 4];
+            bluecell_Currdatastatus.CPU_Bank2_Image_BuildTime6 = Bank2data[MBIC_BOOT_CREATION_TIME + 5];
+            bluecell_Currdatastatus.CPU_Bank2_Image_Version1 = Bank2data[MBIC_BOOT_VERSION + 0];
+            bluecell_Currdatastatus.CPU_Bank2_Image_Version2 = Bank2data[MBIC_BOOT_VERSION + 1];
+            bluecell_Currdatastatus.CPU_Bank2_Image_Version3 = Bank2data[MBIC_BOOT_VERSION + 2];
 
 
 //          if(BankNum == HFR_BANK1){
@@ -485,6 +504,7 @@ void MBIC_Bootloader_FirmwareUpdate(uint8_t* data){
             printf("Bank1data Version : %02x.%02x.%02x \r\n", Bank1data[MBIC_BOOT_VERSION + 0], Bank1data[MBIC_BOOT_VERSION + 1], Bank1data[MBIC_BOOT_VERSION + 2]);
             printf("Bank2data Version : %02x.%02x.%02x \r\n", Bank2data[MBIC_BOOT_VERSION + 0], Bank2data[MBIC_BOOT_VERSION + 1], Bank2data[MBIC_BOOT_VERSION + 2]);
             break;
+#if 0 // PYJ.2020.06.30_BEGIN -- 
         case MBIC_Reboot_Notice_REQ:
             printf("MBIC_Reboot_Notice_REQ\r\n");
             cmd = MBIC_Reboot_Notice_RSP;
@@ -496,6 +516,7 @@ void MBIC_Bootloader_FirmwareUpdate(uint8_t* data){
             data[MBIC_PAYLOADSTART + index++] = data[MBIC_PAYLOADSTART + 3];            
             data[MBIC_PAYLOADSTART + index++] = data[MBIC_PAYLOADSTART + 4];
             break;
+#endif // PYJ.2020.06.30_END -- 
         default:
             return;
     }

Bluecell_Src/flash.c

@@ -7,6 +7,7 @@
 #include "flash.h"
 #include "MBIC_Bootloader.h"
 #include "bluecell_operate.h"
+#include "eeprom.h"
 uint8_t flashinit = 0;
 uint32_t Address = FLASH_USER_START_ADDR;
 volatile static uint32_t UserAddress;
@@ -159,6 +160,162 @@ void Flash_InitRead() // ?占쏙옙湲고븿?占쏙옙
         Address++;
     }
 #endif // PYJ.2019.03.27_END -- 
+    uint32_t crcret = 0,FileCrc = 0;
+    int32_t CrcLength = 0;
+ 
+
+
+
+    
+    FileCrc = 
+    ((Bank1data[MBIC_BOOT_CRC] << 24 ) 
+    | Bank1data[MBIC_BOOT_CRC + 1]<<16 
+    | Bank1data[MBIC_BOOT_CRC + 2]<<8   
+    | Bank1data[MBIC_BOOT_CRC + 3]);
+    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 = crc32(&Bank1data[MBIC_BOOT_DATA], CrcLength);
+    if(crcret != FileCrc){
+        bluecell_Currdatastatus.CPU_Bank1_Image_Version1 = 0xFF;
+        bluecell_Currdatastatus.CPU_Bank1_Image_Version2 = 0xFF;
+        bluecell_Currdatastatus.CPU_Bank1_Image_Version3 = 0xFF;
+
+        bluecell_Currdatastatus.CPU_Bank1_Image_BuildTime1 = 0xFF;
+        bluecell_Currdatastatus.CPU_Bank1_Image_BuildTime2 = 0xFF;
+        bluecell_Currdatastatus.CPU_Bank1_Image_BuildTime3 = 0xFF;     
+        bluecell_Currdatastatus.CPU_Bank1_Image_BuildTime4 = 0xFF;
+        bluecell_Currdatastatus.CPU_Bank1_Image_BuildTime5 = 0xFF;
+        bluecell_Currdatastatus.CPU_Bank1_Image_BuildTime6 = 0xFF; 
+
+        if(bluecell_Currdatastatus.CPU_Current_Bank ==HFR_BANK1_SEL){
+                bluecell_Currdatastatus.CPU_Bank1_Image_Version1 = bluecell_Currdatastatus.CPUVERSION1 ;
+                bluecell_Currdatastatus.CPU_Bank1_Image_Version2 = bluecell_Currdatastatus.CPUVERSION2 ;
+                bluecell_Currdatastatus.CPU_Bank1_Image_Version3 = bluecell_Currdatastatus.CPUVERSION3 ;
+                bluecell_Currdatastatus.CPU_Bank1_Image_BuildTime1 = Currdata[MBIC_BOOT_CREATION_TIME + 0];
+                bluecell_Currdatastatus.CPU_Bank1_Image_BuildTime2 = Currdata[MBIC_BOOT_CREATION_TIME + 1];
+                bluecell_Currdatastatus.CPU_Bank1_Image_BuildTime3 = Currdata[MBIC_BOOT_CREATION_TIME + 2];
+                bluecell_Currdatastatus.CPU_Bank1_Image_BuildTime4 = Currdata[MBIC_BOOT_CREATION_TIME + 3];
+                bluecell_Currdatastatus.CPU_Bank1_Image_BuildTime5 = Currdata[MBIC_BOOT_CREATION_TIME + 4];
+                bluecell_Currdatastatus.CPU_Bank1_Image_BuildTime6 = Currdata[MBIC_BOOT_CREATION_TIME + 5];
+
+                pdata = & bluecell_Currdatastatus.CPU_Bank1_Image_Name;
+                for(int i = 0 ; i< 41; i++){
+                    if(i < 32){
+                         pdata[i] = Currdata[MBIC_BOOT_FILENAME + i] ;
+                    }
+                    else{
+                     pdata[i] = 0x20;
+                    }
+                }                
+        
+            }
+
+        
+        printf("CRC ERROR : %x , File CRC : %x \r\n",crcret,FileCrc);
+    }
+    else{
+        printf("CRC SUCCESS  : %x , File CRC : %x \r\n",crcret,FileCrc);  
+        bluecell_Currdatastatus.CPU_Bank1_Image_BuildTime1 = Bank1data[MBIC_BOOT_CREATION_TIME + 0];
+        bluecell_Currdatastatus.CPU_Bank1_Image_BuildTime2 = Bank1data[MBIC_BOOT_CREATION_TIME + 1];
+        bluecell_Currdatastatus.CPU_Bank1_Image_BuildTime3 = Bank1data[MBIC_BOOT_CREATION_TIME + 2];
+        bluecell_Currdatastatus.CPU_Bank1_Image_BuildTime4 = Bank1data[MBIC_BOOT_CREATION_TIME + 3];
+        bluecell_Currdatastatus.CPU_Bank1_Image_BuildTime5 = Bank1data[MBIC_BOOT_CREATION_TIME + 4];
+        bluecell_Currdatastatus.CPU_Bank1_Image_BuildTime6 = Bank1data[MBIC_BOOT_CREATION_TIME + 5];
+        
+        bluecell_Currdatastatus.CPU_Bank1_Image_Version1 = Bank1data[MBIC_BOOT_VERSION + 0];
+        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;
+        for(int i = 0 ; i< 41; i++){
+            if(i < 32){
+                pdata[i] = Bank1data[MBIC_BOOT_FILENAME + i] ;
+            }
+            else{
+             pdata[i] = 0x20;
+            }
+        }         
+
+    }
+
+
+
+   FileCrc = 
+    ((Bank2data[MBIC_BOOT_CRC] << 24 ) 
+    | Bank2data[MBIC_BOOT_CRC + 1]<<16 
+    | Bank2data[MBIC_BOOT_CRC + 2]<<8   
+    | Bank2data[MBIC_BOOT_CRC + 3]);
+    CrcLength=
+    ((Bank2data[MBIC_BOOT_LENGTH] << 24 ) 
+    | Bank2data[MBIC_BOOT_LENGTH + 1]<<16 
+    | Bank2data[MBIC_BOOT_LENGTH + 2]<<8   
+    | Bank2data[MBIC_BOOT_LENGTH + 3]);       
+     if(CrcLength > 0 )
+        crcret = crc32(&Bank2data[MBIC_BOOT_DATA], CrcLength);
+    if(crcret != FileCrc){
+   
+   
+        if(bluecell_Currdatastatus.CPU_Current_Bank ==HFR_BANK2_SEL){
+                bluecell_Currdatastatus.CPU_Bank2_Image_Version1 = Currdata[MBIC_BOOT_VERSION ] ;
+                bluecell_Currdatastatus.CPU_Bank2_Image_Version2 = Currdata[MBIC_BOOT_VERSION + 1] ;
+                bluecell_Currdatastatus.CPU_Bank2_Image_Version3 = Currdata[MBIC_BOOT_VERSION + 2] ;
+                bluecell_Currdatastatus.CPU_Bank2_Image_BuildTime1 = Currdata[MBIC_BOOT_CREATION_TIME + 0];
+                bluecell_Currdatastatus.CPU_Bank2_Image_BuildTime2 = Currdata[MBIC_BOOT_CREATION_TIME + 1];
+                bluecell_Currdatastatus.CPU_Bank2_Image_BuildTime3 = Currdata[MBIC_BOOT_CREATION_TIME + 2];
+                bluecell_Currdatastatus.CPU_Bank2_Image_BuildTime4 = Currdata[MBIC_BOOT_CREATION_TIME + 3];
+                bluecell_Currdatastatus.CPU_Bank2_Image_BuildTime5 = Currdata[MBIC_BOOT_CREATION_TIME + 4];
+                bluecell_Currdatastatus.CPU_Bank2_Image_BuildTime6 = Currdata[MBIC_BOOT_CREATION_TIME + 5];
+   
+                pdata = & bluecell_Currdatastatus.CPU_Bank1_Image_Name;
+                for(int i = 0 ; i< 41; i++){
+                    if(i < 32){
+                         pdata[i] = Bank2data[MBIC_BOOT_FILENAME + i];
+                    }
+                    else{
+                     pdata[i] = 0x20;
+                    }
+                }                
+        
+        }       
+        else{
+            pdata = & bluecell_Currdatastatus.CPU_Bank2_Image_Version1;
+            for(int i = 0; i < 41; i++)
+                pdata[i] = 0xFF;
+        }
+        printf("CRC ERROR : %x , File CRC : %x \r\n",crcret,FileCrc);
+    }
+    else{
+        printf("CRC SUCCESS  : %x , File CRC : %x \r\n",crcret,FileCrc);  
+        bluecell_Currdatastatus.CPU_Bank2_Image_BuildTime1 = Bank2data[MBIC_BOOT_CREATION_TIME + 0];
+        bluecell_Currdatastatus.CPU_Bank2_Image_BuildTime2 = Bank2data[MBIC_BOOT_CREATION_TIME + 1];
+        bluecell_Currdatastatus.CPU_Bank2_Image_BuildTime3 = Bank2data[MBIC_BOOT_CREATION_TIME + 2];
+        bluecell_Currdatastatus.CPU_Bank2_Image_BuildTime4 = Bank2data[MBIC_BOOT_CREATION_TIME + 3];
+        bluecell_Currdatastatus.CPU_Bank2_Image_BuildTime5 = Bank2data[MBIC_BOOT_CREATION_TIME + 4];
+        bluecell_Currdatastatus.CPU_Bank2_Image_BuildTime6 = Bank2data[MBIC_BOOT_CREATION_TIME + 5];
+        bluecell_Currdatastatus.CPU_Bank2_Image_Version1 = Bank2data[MBIC_BOOT_VERSION + 0];
+        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;
+        for(int i = 0 ; i< 41; i++){
+            if(i < 32){
+                 pdata[i] = Currdata[MBIC_BOOT_FILENAME + i];
+            }
+            else{
+             pdata[i] = 0x20;
+            }
+        }  
+   
+   
+    }
+    
+           pdata = & bluecell_Currdatastatus.CPU_Bank2_Image_Version1;
+            for(int i = 0; i < 41; i++)
+                printf("pdata : %x ",pdata[i]);
 
 }
 
@@ -427,12 +584,14 @@ void MBIC_DataBankWrite(uint8_t BankNum){
     HAL_FLASH_Lock();
 
 }
-
+uint8_t DownloadPrevdata[sizeof(BLUESTATUS_st)];
 void MBIC_DataErase_Func(uint8_t bank_num){
     static FLASH_EraseInitTypeDef EraseInitStruct;
     static uint32_t PAGEError = 0;
 
     if(EraseInit == false){
+          Bluecell_StructCpy(&DownloadPrevdata[0],&bluecell_Currdatastatus.bluecell_header,sizeof(BLUESTATUS_st));
+          EEPROM_M24C08_write(EEPROM_M24C08_ID ,(EEPROM_WINDOW_STATUS_ADDRESDS),&DownloadPrevdata[0],sizeof(BLUESTATUS_st));        
         HAL_FLASH_Unlock();
 #if 0 // PYJ.2020.06.24_BEGIN -- 
         EraseInitStruct.TypeErase   = FLASH_TYPEERASE_PAGES;

Bluecell_Src/uart.c

@@ -153,9 +153,9 @@ void Uart1_Data_Send(uint8_t* data,uint16_t size){
   //HAL_UART_Transmit_IT(&hTerminal, &data[0],size);
 //    printf("data[278] : %x \r\n",data[278]);
 ////    HAL_Delay(1);   
-    printf("\r\n [TX] : ");
-    for(int i = 0; i< size; i++)
-        printf("%02x ",data[i]);
+//    printf("\r\n [TX] : ");
+//    for(int i = 0; i< size; i++)
+//        printf("%02x ",data[i]);
 //    printf("};\r\n\tCOUNT : %d \r\n",size);
 //    printf("\r\n");
 //    printf("\r\n [TX] : {");
@@ -164,7 +164,7 @@ void Uart1_Data_Send(uint8_t* data,uint16_t size){
 //        data[i] = 0;
 //    }
 //    printf("};\r\n\tCOUNT : %d \r\n",size);
-    printf("\r\n");
+//    printf("\r\n");
     
 }
 

Src/main.c

@@ -236,7 +236,8 @@ uint8_t MBICTest_Firmdata[8]  = {1,2,3,4,5,6,7,8};
   */
 extern const uint16_t crc16_tab[256];
 
- main(void)  {
+
+main(void)  {
   /* USER CODE BEGIN 1 */
 
   /* USER CODE END 1 */