Changes in boot/arch/ppc32/loader/asm.h [e731b0d:df4ed85] in mainline

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_WIDTH  12
-#define PAGE_SIZE   (1 << PAGE_WIDTH)
+#define PAGE_SIZE 4096
+#define PAGE_WIDTH 12
 
-#define TRANS_SIZE   1024
-#define BOOT_OFFSET  0x8000
+#define TRANS_SIZE 1024
+#define TRANS_ITEM_SIZE 4
 
-#define BALLOC_MAX_SIZE  (128 * 1024)
+#define KERNEL_START_ADDR 0x80008000
 
 #ifndef __ASM__
 
-#include "types.h"
-#include "main.h"
-#include "ofwarch.h"
+#define memcpy(dst, src, cnt)  __builtin_memcpy((dst), (src), (cnt))
 
-#define PA2KA(x)  (((uintptr_t) (x)) + 0x80000000)
-
-extern uint8_t balloc_base[BALLOC_MAX_SIZE];
-extern uintptr_t trans[TRANS_SIZE];
+extern void *trans[TRANS_SIZE];
 
 extern void halt();
-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 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 real_mode();
-
-#else
-
-#define PA2KA(x)  ((x) + 0x80000000)
 
 #endif