Changeset 1787e527 in mainline for boot/arch/ppc32/loader/asm.h

Timestamp:

2009-11-16T21:22:54Z (15 years ago)

Author:

Lenka Trochtova <trochtova.lenka@…>

Branches:

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

Children:

5ebdf94

Parents:

fcbd1be (diff), 9c70ed6 (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:

merged with head (unstable)

File:

• boot/arch/ppc32/loader/asm.h (modified) (1 diff)

boot/arch/ppc32/loader/asm.h

@@ -30 +30 @@
 #define BOOT_ppc32_ASM_H_
 
-#define PAGE_SIZE 4096
-#define PAGE_WIDTH 12
+#define PAGE_WIDTH  12
+#define PAGE_SIZE   (1 << PAGE_WIDTH)
 
-#define TRANS_SIZE 1024
-#define TRANS_ITEM_SIZE 4
+#define TRANS_SIZE   1024
+#define BOOT_OFFSET  0x8000
 
-#define KERNEL_START_ADDR 0x80008000
+#define BALLOC_MAX_SIZE  (128 * 1024)
 
 #ifndef __ASM__
 
-#define memcpy(dst, src, cnt)  __builtin_memcpy((dst), (src), (cnt))
+#include "types.h"
+#include "main.h"
+#include "ofwarch.h"
 
-extern void *trans[TRANS_SIZE];
+#define PA2KA(x)  (((uintptr_t) (x)) + 0x80000000)
+
+extern uint8_t balloc_base[BALLOC_MAX_SIZE];
+extern uintptr_t trans[TRANS_SIZE];
 
 extern void halt();
-extern void jump_to_kernel(void *bootinfo, unsigned int bootinfo_size, void *trans, unsigned int kernel_size, void *real_mode, void *fb, unsigned int scanline) __attribute__((noreturn));
+extern void jump_to_kernel(void *bootinfo, unsigned int bootinfo_size,
+    uintptr_t trans[], unsigned int kernel_size, void *real_mode) __attribute__((noreturn));
 extern void real_mode();
+
+#else
+
+#define PA2KA(x)  ((x) + 0x80000000)
 
 #endif