Changeset 25eec4e in mainline for boot/arch/arm32/include/arch.h

Timestamp:

2013-04-19T18:38:18Z (12 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

6d717a4

Parents:

a1e2df13 (diff), 289cb7dd (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 chages.

File:

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

boot/arch/arm32/include/arch.h

@@ -42 +42 @@
 #ifdef MACHINE_gta02
 #define BOOT_BASE       0x30008000
+#elif defined MACHINE_beagleboardxm
+#define BOOT_BASE       0x80000000
+#elif defined MACHINE_beaglebone
+#define BOOT_BASE       0x80000000
 #else
 #define BOOT_BASE       0x00000000
@@ -48 +52 @@
 #define BOOT_OFFSET     (BOOT_BASE + 0xa00000)
 
+#ifdef MACHINE_beagleboardxm
+        #define PA_OFFSET 0
+#elif defined MACHINE_beaglebone
+        #define PA_OFFSET 0
+#else
+        #define PA_OFFSET 0x80000000
+#endif
+
 #ifndef __ASM__
-        #define PA2KA(addr)  (((uintptr_t) (addr)) + 0x80000000)
+        #define PA2KA(addr)  (((uintptr_t) (addr)) + PA_OFFSET)
 #else
-        #define PA2KA(addr)  ((addr) + 0x80000000)
+        #define PA2KA(addr)  ((addr) + PA_OFFSET)
 #endif
+
 
 #endif