Sync up ArmPkg with patch from mailing list. Changed name of BdsLib.h to BdsUnixLib...

[mirror_edk2.git] / ArmPkg / Include / Chipset / ARM1176JZ-S.h

diff --git a/ArmPkg/Include/Chipset/ARM1176JZ-S.h b/ArmPkg/Include/Chipset/ARM1176JZ-S.h
index 5bf679458d65ed123a706bc89fc057257ef4f1fa..68e120abcd86c23ccacb37da69ba1dcf02252e25 100644 (file)
--- a/ArmPkg/Include/Chipset/ARM1176JZ-S.h
+++ b/ArmPkg/Include/Chipset/ARM1176JZ-S.h
@@ -86,22 +86,22 @@
 #define TT_DESCRIPTOR_SECTION_BASE_ADDRESS_MASK                 (0xFFF00000)\r
 #define TT_DESCRIPTOR_SECTION_BASE_ADDRESS(a)                   (a & TT_DESCRIPTOR_SECTION_BASE_ADDRESS_MASK)\r
 \r
-#define TT_DESCRIPTOR_SECTION_WRITE_BACK          (TT_DESCRIPTOR_TYPE_SECTION                              | \\r
-                                                   TT_DESCRIPTOR_SECTION_NS_NON_SECURE                         | \\r
+#define TT_DESCRIPTOR_SECTION_WRITE_BACK(Secure)       (TT_DESCRIPTOR_TYPE_SECTION                                                          | \\r
+                                                        (Secure ? TT_DESCRIPTOR_SECTION_NS_SECURE : TT_DESCRIPTOR_SECTION_NS_NON_SECURE )   | \\r
                                                    TT_DESCRIPTOR_SECTION_NG_GLOBAL                         | \\r
                                                    TT_DESCRIPTOR_SECTION_S_NOT_SHARED                      | \\r
                                                    TT_DESCRIPTOR_SECTION_DOMAIN(0)                         | \\r
                                                    TT_DESCRIPTOR_SECTION_AP_RW_RW                          | \\r
                                                    TT_DESCRIPTOR_SECTION_CACHE_POLICY_WRITE_BACK_ALLOC)\r
-#define TT_DESCRIPTOR_SECTION_WRITE_THROUGH       (TT_DESCRIPTOR_TYPE_SECTION                              | \\r
-                                                   TT_DESCRIPTOR_SECTION_NS_NON_SECURE                         | \\r
+#define TT_DESCRIPTOR_SECTION_WRITE_THROUGH(Secure)    (TT_DESCRIPTOR_TYPE_SECTION                                                          | \\r
+                                                        (Secure ? TT_DESCRIPTOR_SECTION_NS_SECURE : TT_DESCRIPTOR_SECTION_NS_NON_SECURE )   | \\r
                                                    TT_DESCRIPTOR_SECTION_NG_GLOBAL                         | \\r
                                                    TT_DESCRIPTOR_SECTION_S_NOT_SHARED                      | \\r
                                                    TT_DESCRIPTOR_SECTION_DOMAIN(0)                         | \\r
                                                    TT_DESCRIPTOR_SECTION_AP_RW_RW                          | \\r
                                                    TT_DESCRIPTOR_SECTION_CACHE_POLICY_WRITE_THROUGH_NO_ALLOC)\r
-#define TT_DESCRIPTOR_SECTION_UNCACHED            (TT_DESCRIPTOR_TYPE_SECTION                              | \\r
-                                                   TT_DESCRIPTOR_SECTION_NS_NON_SECURE                         | \\r
+#define TT_DESCRIPTOR_SECTION_UNCACHED(Secure)         (TT_DESCRIPTOR_TYPE_SECTION                                                          | \\r
+                                                        (Secure ? TT_DESCRIPTOR_SECTION_NS_SECURE : TT_DESCRIPTOR_SECTION_NS_NON_SECURE )   | \\r
                                                    TT_DESCRIPTOR_SECTION_NG_GLOBAL                         | \\r
                                                    TT_DESCRIPTOR_SECTION_S_NOT_SHARED                      | \\r
                                                    TT_DESCRIPTOR_SECTION_DOMAIN(0)                         | \\r