UefiPayloadPkg: Move bdsdxe.inf from DXEFV to BDSFV

[mirror_edk2.git] / UefiPayloadPkg / UniversalPayloadBuild.py

diff --git a/UefiPayloadPkg/UniversalPayloadBuild.py b/UefiPayloadPkg/UniversalPayloadBuild.py
index 50a5950e7c1385850991431290c54294df3fa693..6d62b8b20f1c1b05a102d066324a9da1842b7a7e 100644 (file)
--- a/UefiPayloadPkg/UniversalPayloadBuild.py
+++ b/UefiPayloadPkg/UniversalPayloadBuild.py
@@ -67,7 +67,8 @@ def BuildUniversalPayload(Args, MacroList):
 \r
     EntryModuleInf = os.path.normpath("UefiPayloadPkg/UefiPayloadEntry/UniversalPayloadEntry.inf")\r
     DscPath = os.path.normpath("UefiPayloadPkg/UefiPayloadPkg.dsc")\r
-    FvOutputDir = os.path.join(BuildDir, "{}_{}".format (BuildTarget, ToolChain), os.path.normpath("FV/DXEFV.Fv"))\r
+    DxeFvOutputDir = os.path.join(BuildDir, "{}_{}".format (BuildTarget, ToolChain), os.path.normpath("FV/DXEFV.Fv"))\r
+    BdsFvOutputDir = os.path.join(BuildDir, "{}_{}".format (BuildTarget, ToolChain), os.path.normpath("FV/BDSFV.Fv"))\r
     PayloadReportPath = os.path.join(BuildDir, "UefiUniversalPayload.txt")\r
     ModuleReportPath = os.path.join(BuildDir, "UefiUniversalPayloadEntry.txt")\r
     UpldInfoFile = os.path.join(BuildDir, "UniversalPayloadInfo.bin")\r
@@ -119,21 +120,22 @@ def BuildUniversalPayload(Args, MacroList):
     #\r
     # Copy the DXEFV as a section in elf format Universal Payload entry.\r
     #\r
-    remove_section = '"{}" -I {} -O {} --remove-section .upld_info --remove-section .upld.uefi_fv {}'.format (\r
+    remove_section = '"{}" -I {} -O {} --remove-section .upld_info --remove-section .upld.uefi_fv --remove-section .upld.bds_fv {}'.format (\r
                        LlvmObjcopyPath,\r
                        ObjCopyFlag,\r
                        ObjCopyFlag,\r
                        EntryOutputDir\r
                        )\r
-    add_section    = '"{}" -I {} -O {} --add-section .upld_info={} --add-section .upld.uefi_fv={} {}'.format (\r
+    add_section    = '"{}" -I {} -O {} --add-section .upld_info={} --add-section .upld.uefi_fv={} --add-section .upld.bds_fv={} {}'.format (\r
                        LlvmObjcopyPath,\r
                        ObjCopyFlag,\r
                        ObjCopyFlag,\r
                        UpldInfoFile,\r
-                       FvOutputDir,\r
+                       DxeFvOutputDir,\r
+                       BdsFvOutputDir,\r
                        EntryOutputDir\r
                        )\r
-    set_section    = '"{}" -I {} -O {} --set-section-alignment .upld_info=4 --set-section-alignment .upld.uefi_fv=16 {}'.format (\r
+    set_section    = '"{}" -I {} -O {} --set-section-alignment .upld_info=16 --set-section-alignment .upld.uefi_fv=16 --set-section-alignment .upld.bds_fv=16 {}'.format (\r
                        LlvmObjcopyPath,\r
                        ObjCopyFlag,\r
                        ObjCopyFlag,\r