2023.2 Updates

 1. Support for replace/append use cases based of include bif
 2. Fix build on machines with modern flex

Signed-off-by: radarapu <[email protected]>

Author: RamyaDarapuneni

bif.yy.cpp

@@ -379,7 +379,7 @@ typedef unsigned char YY_CHAR;
 
 #define yytext_ptr yytext
 
-#include <FlexLexer.h>
+#include "FlexLexer.h"
 
 int yyFlexLexer::yywrap() { return 1; }
 int yyFlexLexer::yylex()

bifoptions.cpp

@@ -180,6 +180,7 @@ PartitionBifOptions::PartitionBifOptions()
     , bifSection("")
     , delayAuth(false)
     , imageStoreId(0xFF)
+    , erasePartition(false)
     , tcmBoot(false)
     , tcmARegionAddr(0)
     , tcmBRegionAddr(0)

bifoptions.h

@@ -213,6 +213,7 @@ class PartitionBifOptions
     bool updateReserveInPh;
     Arch::Type arch;
     bool delayAuth;
+    bool erasePartition;
 
 private:
     bool versalNetSeries;

bootimage.cpp

@@ -88,7 +88,7 @@ void BIF_File::Process(Options& options)
             }
         }
 
-        ReplaceFiles();
+        AppendAndReplaceFilesinBIF();
         options.bifOptionsList = bifOptionList = includeBifOptionList;
     }
 
@@ -779,7 +779,7 @@ void BIF_File::ParseBifFile(Options& options)
 }
 
 /******************************************************************************/
-void BIF_File::ReplaceFiles()
+void BIF_File::AppendAndReplaceFilesinBIF()
 {
     /* If slr number matches between partitions - replace the files */
     for (size_t i = 0; i < includeBifOptionList.size(); i++)
@@ -803,6 +803,7 @@ void BIF_File::ReplaceFiles()
 
                                 (*itr2)->filename = (*itr1)->filename;
                                 (*itr2)->filelist = (*itr1)->filelist;
+                                (*itr1)->erasePartition = true;
                                 break;
                             }
                         }
@@ -826,6 +827,7 @@ void BIF_File::ReplaceFiles()
                                 includeBifOptionList[i]->ClearPmcCdoFileList();
                                 for (size_t listSize = 0; listSize < (*itr1)->filelist.size(); listSize++)
                                     includeBifOptionList[i]->SetPmcCdoFileList((*itr1)->filelist[listSize]);
+                                (*itr1)->erasePartition = true;
                                 break;
                             }
                         }
@@ -844,12 +846,65 @@ void BIF_File::ReplaceFiles()
 
                                 (*itr2)->filename = (*itr1)->filename;
                                 (*itr2)->filelist = (*itr1)->filelist;
+                                (*itr1)->erasePartition = true;
                                 break;
                             }
                         }
                     }
                 }
             }
+            for (std::list<ImageBifOptions*>::iterator itr1 = bifOptionList[j]->imageBifOptionList.begin(); itr1 != bifOptionList[j]->imageBifOptionList.end(); )
+            {
+                bool incremented = false;
+                for (std::list<PartitionBifOptions*>::iterator itr2 = (*itr1)->partitionBifOptionsList.begin(); itr2 != (*itr1)->partitionBifOptionsList.end(); )
+                {
+                    if ((*itr2)->erasePartition)
+                    {
+                        (*itr1)->partitionBifOptionsList.remove(*itr2++);
+                        if ((*itr1)->partitionBifOptionsList.size() == 0)
+                        {
+                            bifOptionList[j]->imageBifOptionList.remove(*itr1++);
+                            incremented = true;
+                            break;
+                        }
+                        //break;
+                    }
+                    else
+                    {
+                        itr2++;
+                    }
+                }
+                if(!incremented)
+                    itr1++;
+            }
+        }
+    }
+
+    for (size_t i = 0; i < includeBifOptionList.size(); i++)
+    {
+        if ((includeBifOptionList[i]->pdiType == PartitionType::SLR_CONFIG) || (includeBifOptionList[i]->slrNum == 0))
+        {
+            for (size_t j = 0; j < bifOptionList.size(); j++)
+            {
+                for (std::list<ImageBifOptions*>::iterator itr1 = bifOptionList[j]->imageBifOptionList.begin(); itr1 != bifOptionList[j]->imageBifOptionList.end(); itr1++)
+                {
+                    std::list<PartitionBifOptions*>::iterator itr2 = (*itr1)->partitionBifOptionsList.begin();
+                    {
+                        if (includeBifOptionList[i]->slrNum == (*itr2)->slrNum)
+                        {
+                            includeBifOptionList[i]->imageBifOptionList.push_back((*itr1));
+                            includeBifOptionList[i]->partitionBifOptionList.insert(includeBifOptionList[i]->partitionBifOptionList.end(), (*itr1)->partitionBifOptionsList.begin(), (*itr1)->partitionBifOptionsList.end());
+                        }
+                    }
+                }
+            }
+        }
+        else if(includeBifOptionList[i]->slrNum == 0xFF)
+        {
+            for (size_t j = 0; j < bifOptionList.size(); j++)
+            {
+                includeBifOptionList[i]->imageBifOptionList.splice(includeBifOptionList[i]->imageBifOptionList.end(), bifOptionList[j]->imageBifOptionList);
+            }
         }
     }
 }

bootimage.h

@@ -74,7 +74,7 @@ class BIF_File
     BIF_File(std::string& filename0) : biffilename(filename0) {} 
     void Process(Options& options);
     void ParseBifFile(Options& options);
-    void ReplaceFiles();
+    void AppendAndReplaceFilesinBIF();
 private:
     std::string biffilename;
     void Output(Options& options, uint8_t index);

cmdoptions.yy.cpp

@@ -379,7 +379,7 @@ typedef unsigned char YY_CHAR;
 
 #define yytext_ptr yytext
 
-#include <FlexLexer.h>
+#include "FlexLexer.h"
 
 int yyFlexLexer::yywrap() { return 1; }
 int yyFlexLexer::yylex()

reginit.yy.cpp

@@ -379,7 +379,7 @@ typedef unsigned char YY_CHAR;
 
 #define yytext_ptr yytext
 
-#include <FlexLexer.h>
+#include "FlexLexer.h"
 
 int yyFlexLexer::yywrap() { return 1; }
 int yyFlexLexer::yylex()

version.h

@@ -16,7 +16,7 @@
 ******************************************************************************/
 
 #ifndef RDI_VERSION
-#define RDI_VERSION "2023.2_ksb"
+#define RDI_VERSION "2023.2"
 #endif
 
 #define PROGRAMNAME     "Bootgen"