Changeset 14febed9 in mainline for boot/arch/mips32/include/arch.h

Timestamp:

2012-12-13T21:13:08Z (12 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

a4f959b

Parents:

cf538e7

Message:

Do not damage the YAMON image in SDRAM.

• Change loader and kernel link addresses so that we do not overwrite the YAMON image in SDRAM.
• Ban the YAMON SDRAM range of physical memory from allocations.

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
 #define BOOTINFO_OFFSET  0x00003000
 #define BOOT_OFFSET      0x00100000
+#define LOADER_OFFSET    0x1fc00000
 
-#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
@@ -50 +45 @@
 
 #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 MALTA_SERIAL     0xb80003f8
 #endif