Changeset 8ab339e in mainline for boot/arch/arm32/include/mm.h

Timestamp:

2013-02-26T10:58:29Z (11 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

b04ca9c

Parents:

1935591 (diff), 088b334 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes

File:

• boot/arch/arm32/include/mm.h (modified) (2 diffs)

boot/arch/arm32/include/mm.h

@@ -58 +58 @@
 #define GTA02_IOMEM_END  0x60000000
 
+/** Start of ram memory on BBxM */
+#define BBXM_RAM_START   0x80000000
+/** Start of ram memory on BBxM */
+#define BBXM_RAM_END   0xc0000000
+
+/** Start of ram memory on AM335x */
+#define AM335x_RAM_START   0x80000000
+/** End of ram memory on AM335x */
+#define AM335x_RAM_END     0xC0000000
+
+
 /* Page table level 0 entry - "section" format is used
  * (one-level paging, 1 MB sized pages). Used only while booting the kernel.
@@ -70 +81 @@
         unsigned int access_permission_0 : 2;
         unsigned int tex : 3;
-        unsigned int access_permission_1 : 2;
+        unsigned int access_permission_1 : 1;
+        unsigned int shareable : 1;
         unsigned int non_global : 1;
         unsigned int should_be_zero_2 : 1;