Fixed EDKT111

[mirror_edk2.git] / Tools / Source / GenBuild / org / tianocore / build / global / SurfaceAreaQuery.java

diff --git a/Tools/Source/GenBuild/org/tianocore/build/global/SurfaceAreaQuery.java b/Tools/Source/GenBuild/org/tianocore/build/global/SurfaceAreaQuery.java
index 321a87a827a7dfd3219c220edf4e0c9cbc231e96..c2918b7b3b87a956251c305aac2dacbd6e4df372 100644 (file)
--- a/Tools/Source/GenBuild/org/tianocore/build/global/SurfaceAreaQuery.java
+++ b/Tools/Source/GenBuild/org/tianocore/build/global/SurfaceAreaQuery.java
@@ -397,7 +397,6 @@ public class SurfaceAreaQuery {
         String toolchainFamily = null;\r
         List<String> archList = null;\r
         String cmd = null;\r
-        String targetName = null;\r
         String optionName = null;\r
 \r
         Object[] returns = get(from, xPath);\r
@@ -1385,8 +1384,20 @@ public class SurfaceAreaQuery {
         return result;\r
     }\r
     \r
-    public static Node getFpdUserExtension() {\r
-        String[] xPath = new String[] { "/UserExtensions[@UserID='TianoCore']" }; \r
+    public static Node getFpdUserExtensionPreBuild() {\r
+        String[] xPath = new String[] { "/UserExtensions[@UserID='TianoCore' and @Identifier='0']" }; \r
+\r
+        Object[] queryResult = get("PlatformSurfaceArea", xPath);\r
+        if (queryResult == null || queryResult.length == 0) {\r
+            return null;\r
+        }\r
+        UserExtensionsDocument.UserExtensions a =  (UserExtensionsDocument.UserExtensions)queryResult[0];\r
+        \r
+        return a.getDomNode();\r
+    }\r
+    \r
+    public static Node getFpdUserExtensionPostBuild() {\r
+        String[] xPath = new String[] { "/UserExtensions[@UserID='TianoCore' and @Identifier='1']" }; \r
 \r
         Object[] queryResult = get("PlatformSurfaceArea", xPath);\r
         if (queryResult == null || queryResult.length == 0) {\r
@@ -1758,7 +1769,7 @@ public class SurfaceAreaQuery {
             String[] guidPair = new String[2];\r
             guidPair[0] = entry.getCName();\r
             guidPair[1] = entry.getGuidValue();\r
-            guidDeclMap.put(entry.getName(), guidPair);\r
+            guidDeclMap.put(entry.getCName(), guidPair);\r
             EdkLog.log(EdkLog.EDK_VERBOSE, entry.getName());\r
             EdkLog.log(EdkLog.EDK_VERBOSE, guidPair[0]);\r
             EdkLog.log(EdkLog.EDK_VERBOSE, guidPair[1]);\r
@@ -1789,7 +1800,7 @@ public class SurfaceAreaQuery {
 \r
             protocolPair[0] = entry.getCName();\r
             protocolPair[1] = entry.getGuidValue();\r
-            protoclMap.put(entry.getName(), protocolPair);\r
+            protoclMap.put(entry.getCName(), protocolPair);\r
             EdkLog.log(EdkLog.EDK_VERBOSE, entry.getName());\r
             EdkLog.log(EdkLog.EDK_VERBOSE, protocolPair[0]);\r
             EdkLog.log(EdkLog.EDK_VERBOSE, protocolPair[1]);\r
@@ -1824,7 +1835,7 @@ public class SurfaceAreaQuery {
             String[] ppiPair = new String[2];\r
             ppiPair[0] = entry.getCName();\r
             ppiPair[1] = entry.getGuidValue();\r
-            ppiMap.put(entry.getName(), ppiPair);\r
+            ppiMap.put(entry.getCName(), ppiPair);\r
         }\r
         return ppiMap;\r
     }\r
@@ -1905,4 +1916,24 @@ public class SurfaceAreaQuery {
 \r
         return false;\r
     }\r
+\r
+       public static boolean isHaveTianoR8FlashMap(){\r
+        PcdCodedDocument.PcdCoded.PcdEntry[] pcdEntries  = null;\r
+        String[]            results;\r
+        int                 index;\r
+        String[]            xPath       = new String[] {"/"};\r
+        Object[]         returns     = get ("Externs", xPath);\r
+\r
+        if (returns == null) {\r
+            return false;\r
+        }\r
+\r
+               ExternsDocument.Externs ext = (ExternsDocument.Externs)returns[0];\r
+               \r
+               if (ext.getTianoR8FlashMapH()){\r
+                       return true;\r
+           }else {\r
+                       return false;\r
+               }\r
+       }\r
 }\r