Changeset 4872160 in mainline for boot/arch/ppc32/include

Timestamp:

2010-05-04T10:44:55Z (15 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

568db0f

Parents:

bb252ca

Message:

new boot infrastructure

• more code and metadata unification
• import of up-to-date implementations from the kernel
• the boot loaders should behave more similarly on all platforms
• support for deflate compressed (LZ77) boot components
  • this again allows feasible boot images to be created on mips32
• IA64 is still not booting
  • the broken forked GNU EFI library has been removed, a replacement of the functionality is on its way

Location:

boot/arch/ppc32/include

Files:

• arch.h (moved) (moved from boot/arch/ia64/loader/asm.h ) (2 diffs)
• asm.h (moved) (moved from boot/arch/mips32/loader/msim.c ) (1 diff)
• main.h (added)
• ofw.h (moved) (moved from boot/arch/ppc32/loader/ofwarch.h )
• regname.h (moved) (moved from boot/arch/ppc32/loader/regname.h ) (1 diff)
• types.h (moved) (moved from boot/arch/ppc32/loader/types.h ) (1 diff)

boot/arch/ppc32/include/arch.h

@@ -1 +1 @@
 /*
  * Copyright (c) 2006 Martin Decky
- * Copyright (c) 2006 Jakub Jermar 
  * All rights reserved.
  *
@@ -28 +27 @@
  */
 
-#ifndef BOOT_ia64_ASM_H_
-#define BOOT_ia64_ASM_H_
+#ifndef BOOT_ppc32_ARCH_H_
+#define BOOT_ppc32_ARCH_H_
 
-#include "types.h"
-#include "main.h"
-
-#define PAGE_WIDTH  14
+#define PAGE_WIDTH  12
 #define PAGE_SIZE   (1 << PAGE_WIDTH)
 
-#define BALLOC_MAX_SIZE  (128 * 1024)
+#define BOOT_OFFSET  0x8000
 
-extern void halt(void);
-extern void jump_to_kernel(void *) __attribute__((noreturn));
+#define LOADER_ADDRESS  0x01000000
 
+#ifndef __ASM__
+        #define PA2KA(addr)  (((uintptr_t) (addr)) + 0x80000000)
+#else
+        #define PA2KA(addr)  ((addr) + 0x80000000)
+#endif
 
 #endif

boot/arch/ppc32/include/asm.h

@@ -26 +26 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
- 
-#include "msim.h"
-#include <printf.h>
 
-#define MSIM_VIDEORAM            0xB0000000
+#ifndef BOOT_ppc32_ASM_H_
+#define BOOT_ppc32_ASM_H_
 
-void write(const char *str, const int len)
-{
-        int i;
-        
-        for (i = 0; i < len; i++)
-                *((char *) MSIM_VIDEORAM) = str[i];
-}
+#include <typedefs.h>
+#include <arch/main.h>
+
+extern void jump_to_kernel(void *, void *, size_t, void *)
+    __attribute__((noreturn));
+extern void real_mode();
+
+#endif

boot/arch/ppc32/include/regname.h

@@ -27 +27 @@
  */
 
-#ifndef __ppc32_REGNAME_H__
-#define __ppc32_REGNAME_H__
+#ifndef BOOT_ppc32_REGNAME_H_
+#define BOOT_ppc32_REGNAME_H_
 
 /* Condition Register Bit Fields */

boot/arch/ppc32/include/types.h

@@ -30 +30 @@
 #define BOOT_ppc32_TYPES_H_
 
-#include <gentypes.h>
+#define TASKMAP_MAX_RECORDS        32
+#define BOOTINFO_TASK_NAME_BUFLEN  32
 
-typedef signed char int8_t;
-
-typedef unsigned char uint8_t;
-typedef unsigned short uint16_t;
-typedef unsigned int uint32_t;
-typedef unsigned long long uint64_t;
-
+typedef uint32_t size_t;
 typedef uint32_t uintptr_t;
 typedef uint32_t unative_t;
+typedef int32_t native_t;
+
+typedef struct {
+        void *addr;
+        size_t size;
+        char name[BOOTINFO_TASK_NAME_BUFLEN];
+} task_t;
+
+typedef struct {
+        size_t cnt;
+        task_t tasks[TASKMAP_MAX_RECORDS];
+} taskmap_t;
 
 #endif