Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove static functions that are provably never called. #33

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Remove static functions that are provably never called. #33

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
204 changes: 9 additions & 195 deletions customer_app/bl602_boot2_mini/bl602_boot2_mini/blsp_boot2.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,13 @@ static void BLSP_Boot2_On_Error(void *log)
}
}

#if 0

// This code is provenly unreachable (static, no callers in this translation
// unit) but it may be inspirational for a GDB macro. OTOH, it's not much
// more complicated than ' p ptEntry', though a convenience wrapper to print
// the active index might be nice.

/****************************************************************************//**
* @brief Boot2 Dump partition entry
*
Expand All @@ -186,192 +193,8 @@ static void BLSP_Dump_PtEntry(PtTable_Entry_Config *ptEntry)
MSG("active Index=%d\r\n",(unsigned int)ptEntry->activeIndex);
MSG("active Address=%08x\r\n",(unsigned int)ptEntry->Address[ptEntry->activeIndex]);
}

/****************************************************************************//**
* @brief Boot2 check XZ FW and do decompression
*
* @param activeID: Active partition table ID
* @param ptStuff: Pointer of partition table stuff
* @param ptEntry: Pointer of active entry
*
* @return 1 for find XZ FW and decompress success, 0 for other cases
*
*******************************************************************************/
static int BLSP_Boot2_Check_XZ_FW(PtTable_ID_Type activeID,PtTable_Stuff_Config *ptStuff,PtTable_Entry_Config *ptEntry)
{
uint8_t buf[6];

if(BFLB_BOOT2_SUCCESS!=BLSP_MediaBoot_Read(ptEntry->Address[ptEntry->activeIndex],buf,sizeof(buf))){
MSG_ERR("Read fw fail\r\n");
return 0;
}
if(BLSP_Boot2_Dump_Critical_Flag()){
BLSP_Dump_Data(buf,sizeof(buf));
}
if(BLSP_Boot2_Verify_XZ_Header(buf)==1){
MSG_DBG("XZ image\r\n");
if(BFLB_BOOT2_SUCCESS==BLSP_Boot2_Update_Fw(activeID,ptStuff,ptEntry)){
return 1;
}else{
MSG_ERR("Img decompress fail\r\n");
/* Set flag to make it not boot */
ptEntry->activeIndex=0;
ptEntry->Address[0]=0;
return 0;
}
}
return 0;
}

/****************************************************************************//**
* @brief Boot2 copy firmware from OTA region to normal region
*
* @param activeID: Active partition table ID
* @param ptStuff: Pointer of partition table stuff
* @param ptEntry: Pointer of active entry
*
* @return BL_Err_Type
*
*******************************************************************************/
static int BLSP_Boot2_Do_FW_Copy(PtTable_ID_Type activeID,PtTable_Stuff_Config *ptStuff,PtTable_Entry_Config *ptEntry)
{
uint8_t activeIndex=ptEntry->activeIndex;
uint32_t srcAddress=ptEntry->Address[activeIndex&0x01];
uint32_t destAddress=ptEntry->Address[!(activeIndex&0x01)];
uint32_t destMaxSize= ptEntry->maxLen[!(activeIndex&0x01)];
uint32_t totalLen=ptEntry->len;
uint32_t dealLen=0;
uint32_t curLen=0;

if(SUCCESS!=XIP_SFlash_Erase_Need_Lock(&flashCfg,destAddress,destAddress+destMaxSize-1)){
MSG_ERR("Erase flash fail");
return BFLB_BOOT2_FLASH_ERASE_ERROR;
}

while(dealLen<totalLen){
curLen=totalLen-dealLen;
if(curLen>sizeof(boot2ReadBuf)){
curLen=sizeof(boot2ReadBuf);
}
if(BFLB_BOOT2_SUCCESS!=BLSP_MediaBoot_Read(srcAddress,boot2ReadBuf,curLen)){
MSG_ERR("Read FW fail when copy\r\n");
return BFLB_BOOT2_FLASH_READ_ERROR;
}
if(SUCCESS!=XIP_SFlash_Write_Need_Lock(&flashCfg,destAddress,boot2ReadBuf,curLen)){
MSG_ERR("Write flash fail");
return BFLB_BOOT2_FLASH_WRITE_ERROR;
}
srcAddress+=curLen;
destAddress+=curLen;
dealLen+=curLen;
}
return BFLB_BOOT2_SUCCESS;
}

/****************************************************************************//**
* @brief Boot2 deal with one firmware
*
* @param activeID: Active partition table ID
* @param ptStuff: Pointer of partition table stuff
* @param ptEntry: Pointer of active entry
* @param fwName: Firmware name pointer
* @param type: Firmware name ID
*
* @return 0 for partition table changed,need re-parse,1 for partition table or entry parsed successfully
*
*******************************************************************************/
static int BLSP_Boot2_Deal_One_FW(PtTable_ID_Type activeID,PtTable_Stuff_Config *ptStuff,
PtTable_Entry_Config *ptEntry,uint8_t *fwName,
PtTable_Entry_Type type)
{
uint32_t ret;

if(fwName!=NULL){
MSG_DBG("Get FW:%s\r\n",fwName);
ret=PtTable_Get_Active_Entries_By_Name(ptStuff,fwName,ptEntry);
}else{
MSG_DBG("Get FW ID:%d\r\n",type);
ret=PtTable_Get_Active_Entries_By_ID(ptStuff,type,ptEntry);
}

if(PT_ERROR_SUCCESS!=ret){
MSG_ERR("Entry not found\r\n");
}else{
BLSP_Dump_PtEntry(ptEntry);
MSG_DBG("Check Img\r\n");
if(BLSP_Boot2_Check_XZ_FW(activeID,ptStuff,ptEntry)==1){
return 0;
}
/* Check if this partition need copy */
if(ptEntry->activeIndex>=2){
if(BFLB_BOOT2_SUCCESS==BLSP_Boot2_Do_FW_Copy(activeID,ptStuff,ptEntry)){
return 0;
}
}
}
return 1;
}

/****************************************************************************//**
* @brief Boot2 Roll back pt entry
*
* @param activeID: Active partition table ID
* @param ptStuff: Pointer of partition table stuff
* @param ptEntry: Pointer of active entry
*
* @return Boot_Error_Code
*
*******************************************************************************/
#ifdef BLSP_BOOT2_ROLLBACK
static int32_t BLSP_Boot2_Rollback_PtEntry(PtTable_ID_Type activeID,PtTable_Stuff_Config *ptStuff,PtTable_Entry_Config *ptEntry)
{
int32_t ret;

ptEntry->activeIndex=!(ptEntry->activeIndex&0x01);
ptEntry->age++;
ret=PtTable_Update_Entry((PtTable_ID_Type)(!activeID),ptStuff,ptEntry);
if(ret!=PT_ERROR_SUCCESS){
MSG_ERR("Update PT entry fail\r\n");
return BFLB_BOOT2_FAIL;
}
return BFLB_BOOT2_SUCCESS;
}
#endif

/****************************************************************************//**
* @brief Boot2 get mfg start up request
*
* @param activeID: Active partition table ID
* @param ptStuff: Pointer of partition table stuff
* @param ptEntry: Pointer of active entry
*
* @return 0 for partition table changed,need re-parse,1 for partition table or entry parsed successfully
*
*******************************************************************************/
static void BLSP_Boot2_Get_MFG_StartReq(PtTable_ID_Type activeID,PtTable_Stuff_Config *ptStuff,PtTable_Entry_Config *ptEntry,uint8_t *userFwName)
{
uint32_t ret;
uint32_t len=0;
uint8_t tmp[16+1]={0};

ret=PtTable_Get_Active_Entries_By_Name(ptStuff,(uint8_t*)"mfg",ptEntry);

if(PT_ERROR_SUCCESS==ret){
MSG_DBG("XIP_SFlash_Read_Need_Lock");
XIP_SFlash_Read_Need_Lock(&flashCfg,ptEntry->Address[0]+MFG_START_REQUEST_OFFSET,tmp,sizeof(tmp)-1);
MSG_DBG("%s",tmp);
if(tmp[0]=='0'||tmp[0]=='1'){
len=strlen((char*)tmp);
if(len<9){
ARCH_MemCpy_Fast(userFwName,tmp,len);
MSG_DBG("%s",tmp);
}
}
}else{
MSG_DBG("MFG not found");
}
}

/****************************************************************************//**
* @brief Boot2 get mfg start up request and return startup address
*
Expand All @@ -385,7 +208,6 @@ static void BLSP_Boot2_Get_MFG_StartReq(PtTable_ID_Type activeID,PtTable_Stuff_C
static void BLSP_Boot2_Get_MFG_StartReq_By_Addr(PtTable_ID_Type activeID,PtTable_Stuff_Config *ptStuff,PtTable_Entry_Config *ptEntry,uint32_t *startAddr)
{
uint32_t ret;
uint32_t len=0;
uint8_t tmp[16+1]={0};

ret=PtTable_Get_Active_Entries_By_Name(ptStuff,(uint8_t*)"mfg",ptEntry);
Expand Down Expand Up @@ -418,19 +240,11 @@ static void BLSP_Boot2_Get_MFG_StartReq_By_Addr(PtTable_ID_Type activeID,PtTable
*******************************************************************************/
int main(void)
{
uint32_t ret=0,i=0;
uint32_t ret=0;
PtTable_Stuff_Config ptTableStuff[2];
PtTable_ID_Type activeID;
/* Init to zero incase only one cpu boot up*/
PtTable_Entry_Config ptEntry[BFLB_BOOT2_CPU_MAX]={0};
uint32_t bootHeaderAddr[BFLB_BOOT2_CPU_MAX]={0};
uint8_t bootRollback[BFLB_BOOT2_CPU_MAX]={0};
uint8_t ptParsed=1;
uint8_t userFwName[9]={0};
#ifdef BLSP_BOOT2_ROLLBACK
uint8_t rollBacked=0;
#endif
uint8_t tempMode=0;
Boot_Clk_Config clkCfg;
uint8_t flashCfgBuf[4+sizeof(SPI_Flash_Cfg_Type)+4]={0};

Expand Down Expand Up @@ -498,7 +312,7 @@ int main(void)
MSG("jump entry:%08x\r\n",(unsigned int)entry);
BLSP_Boot2_Jump_Entry(entry);

return ;
return 0;
}

void bfl_main()
Expand Down