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 2331f8effc9396f74f3944aa637f9028ed1d66e8..68e120abcd86c23ccacb37da69ba1dcf02252e25 100644 (file)
--- a/ArmPkg/Include/Chipset/ARM1176JZ-S.h
+++ b/ArmPkg/Include/Chipset/ARM1176JZ-S.h
@@ -1,8 +1,8 @@
 /** @file\r
 \r
-  Copyright (c) 2008-2009 Apple Inc. All rights reserved.<BR>\r
+  Copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR>\r
 \r
-  All rights reserved. This program and the accompanying materials\r
+  This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r
   http://opensource.org/licenses/bsd-license.php\r
@@ -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