Remove the duplicated creation for FD image at one build.
authorlgao4 <lgao4@c2973edb-eda0-4c78-bc6a-9341b269661f>
Mon, 15 Mar 2010 10:01:05 +0000 (10:01 +0000)
committerlgao4 <lgao4@c2973edb-eda0-4c78-bc6a-9341b269661f>
Mon, 15 Mar 2010 10:01:05 +0000 (10:01 +0000)
git-svn-id: https://edk2-buildtools.svn.sourceforge.net/svnroot/edk2-buildtools/trunk/BaseTools@1931 c2973edb-eda0-4c78-bc6a-9341b269661f

Source/Python/build/build.py

index 6129308..9df4c7e 100644 (file)
@@ -1322,11 +1322,12 @@ class Build():
                         # Rebase module to the preferred memory address before GenFds\r
                         #\r
                         self._CollectModuleMapBuffer(MapBuffer, ModuleList)\r
+                        if self.Fdf != '':\r
+                            #\r
+                            # create FDS again for the updated EFI image\r
+                            #\r
+                            self._Build("fds", Wa)\r
                     if self.Fdf != '':\r
-                        #\r
-                        # create FDS again for the updated EFI image\r
-                        #\r
-                        self._Build("fds", Wa)\r
                         #\r
                         # Create MAP file for all platform FVs after GenFds.\r
                         #\r
@@ -1521,13 +1522,11 @@ class Build():
                     if self.LoadFixAddress != 0:\r
                         self._CollectModuleMapBuffer(MapBuffer, ModuleList)\r
 \r
-                # Generate FD image if there's a FDF file found\r
-                if self.Fdf != '' and self.Target in ["", "all", "fds"]:\r
-                    LaunchCommand(Wa.BuildCommand + ["fds"], Wa.MakeFileDir)\r
-\r
-                # Create MAP file for all platform FV after GenFds\r
-                if self.Target in ["", "all", "fds"]:\r
                     if self.Fdf != '':\r
+                        #\r
+                        # Generate FD image if there's a FDF file found\r
+                        #\r
+                        LaunchCommand(Wa.BuildCommand + ["fds"], Wa.MakeFileDir)\r
                         #\r
                         # Create MAP file for all platform FVs after GenFds.\r
                         #\r