Changeset 25a76ab8 in mainline for boot/arch/mips32/include/arch.h

Timestamp:

2010-05-08T07:53:23Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

051bc69a

Parents:

6c39a907 (diff), 1317380 (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/mips32/include/arch.h (moved) (moved from boot/arch/sparc64/loader/asm.h ) (2 diffs)

boot/arch/mips32/include/arch.h

@@ -1 +1 @@
 /*
  * Copyright (c) 2006 Martin Decky
- * Copyright (c) 2006 Jakub Jermar 
  * All rights reserved.
  *
@@ -28 +27 @@
  */
 
-#ifndef BOOT_sparc64_ASM_H_
-#define BOOT_sparc64_ASM_H_
-
-#include "types.h"
-#include "main.h"
+#ifndef BOOT_mips32_ARCH_H_
+#define BOOT_mips32_ARCH_H_
 
 #define PAGE_WIDTH  14
 #define PAGE_SIZE   (1 << PAGE_WIDTH)
 
-#define BALLOC_MAX_SIZE  (128 * 1024)
+#define CPUMAP_OFFSET    0x00001000
+#define STACK_OFFSET     0x00002000
+#define BOOTINFO_OFFSET  0x00003000
+#define BOOT_OFFSET      0x00100000
+#define LOADER_OFFSET    0x1fc00000
 
-extern void halt(void);
-extern void jump_to_kernel(void *entry, uint64_t cfg, bootinfo_t *bootinfo,
-    unsigned int bootinfo_size, uint8_t subarchitecture) __attribute__((noreturn));
+#define MSIM_VIDEORAM_ADDRESS  0xb0000000
+#define MSIM_DORDER_ADDRESS    0xb0000004
+
+#ifndef __ASM__
+        #define PA2KA(addr)    (((uintptr_t) (addr)) + 0x80000000)
+        #define KSEG2PA(addr)  (((uintptr_t) (addr)) - 0xa0000000)
+#else
+        #define PA2KA(addr)    ((addr) + 0x80000000)
+        #define KSEG2PA(addr)  ((addr) - 0xa0000000)
+#endif
 
 #endif