Changeset 295732b in mainline for boot/arch/mips32/include/arch.h

Timestamp:

2012-12-06T00:06:29Z (12 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

bcad855

Parents:

232cd4f

Message:

Make the mips32 loader machine-neutral, not preferring msim.

• Allow load address it be in both KSEG0 and KSEG1

File:

• boot/arch/mips32/include/arch.h (modified) (1 diff)

boot/arch/mips32/include/arch.h

@@ -37 +37 @@
 #define BOOTINFO_OFFSET  0x00003000
 #define BOOT_OFFSET      0x00100000
+
+#if defined(MACHINE_msim)
 #define LOADER_OFFSET    0x1fc00000
+#elif defined(MACHINE_lmalta) || defined(MACHINE_bmalta)
+#define LOADER_OFFSET    0x00004000
+#endif
 
+#if defined(MACHINE_msim)
 #define MSIM_VIDEORAM_ADDRESS  0xb0000000
 #define MSIM_DORDER_ADDRESS    0xb0000100
+#endif
+
+#if defined(MACHINE_lmalta) || defined(MACHINE_bmalta)
+#define MALTA_SERIAL     0xb80003f8
+#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