Changeset 25eec4e in mainline for boot/arch/mips32/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/mips32/include/arch.h (modified) (2 diffs)

boot/arch/mips32/include/arch.h

@@ -33 +33 @@
 #define PAGE_SIZE   (1 << PAGE_WIDTH)
 
+#if defined(MACHINE_msim)
 #define CPUMAP_OFFSET    0x00001000
 #define STACK_OFFSET     0x00002000
@@ -41 +42 @@
 #define MSIM_VIDEORAM_ADDRESS  0xb0000000
 #define MSIM_DORDER_ADDRESS    0xb0000100
+#endif
+
+#if defined(MACHINE_lmalta) || defined(MACHINE_bmalta)
+#define CPUMAP_OFFSET    0x00100000
+#define STACK_OFFSET     0x00101000
+#define BOOTINFO_OFFSET  0x00102000
+#define BOOT_OFFSET      0x00200000
+#define LOADER_OFFSET    0x00103000
+
+#define YAMON_SUBR_BASE         PA2KA(0x1fc00500)
+#define YAMON_SUBR_PRINT_COUNT  (YAMON_SUBR_BASE + 0x4)
+#endif
 
 #ifndef __ASM__
         #define PA2KA(addr)    (((uintptr_t) (addr)) + 0x80000000)
+        #define PA2KSEG(addr)  (((uintptr_t) (addr)) + 0xa0000000)
+        #define KA2PA(addr)    (((uintptr_t) (addr)) - 0x80000000)
         #define KSEG2PA(addr)  (((uintptr_t) (addr)) - 0xa0000000)
 #else