Changeset 4872160 in mainline for boot/arch/sparc64/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/sparc64/include

Files:

• arch.h (added)
• asm.h (moved) (moved from boot/arch/sparc64/loader/register.h ) (2 diffs)
• main.h (moved) (moved from boot/arch/mips32/loader/types.h ) (2 diffs)
• ofw.h (moved) (moved from boot/arch/sparc64/loader/ofwarch.h ) (1 diff)
• types.h (moved) (moved from boot/arch/sparc64/loader/types.h ) (1 diff)

boot/arch/sparc64/include/asm.h

@@ -1 +1 @@
 /*
+ * Copyright (c) 2006 Martin Decky
  * Copyright (c) 2006 Jakub Jermar
  * All rights reserved.
@@ -27 +28 @@
  */
 
-#ifndef BOOT_sparc64_REGISTER_H_
-#define BOOT_sparc64_REGISTER_H_
+#ifndef BOOT_sparc64_ASM_H_
+#define BOOT_sparc64_ASM_H_
 
-#define PSTATE_IE_BIT    2
-#define PSTATE_PRIV_BIT  4
-#define PSTATE_AM_BIT    8
+#include <typedefs.h>
 
-#define ASI_ICBUS_CONFIG        0x4a
-#define ICBUS_CONFIG_MID_SHIFT  17
+extern void jump_to_kernel(void *entry, bootinfo_t *bootinfo,
+    uintptr_t physmem_start, uint8_t subarch) __attribute__((noreturn));
 
 #endif

boot/arch/sparc64/include/main.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2006 Martin Decky
+ * Copyright (c) 2005 Martin Decky
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-#ifndef BOOT_mips32_TYPES_H_
-#define BOOT_mips32_TYPES_H_
+#ifndef BOOT_sparc64_MAIN_H_
+#define BOOT_sparc64_MAIN_H_
 
-#include <gentypes.h>
+#include <typedefs.h>
+#include <balloc.h>
+#include <genarch/ofw_tree.h>
 
-typedef signed char int8_t;
+typedef struct {
+        uintptr_t physmem_start;
+        taskmap_t taskmap;
+        memmap_t memmap;
+        ballocs_t ballocs;
+        ofw_tree_node_t *ofw_root;
+} bootinfo_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 uintptr_t;
-typedef uint32_t unative_t;
+extern void bootstrap(void);
 
 #endif

boot/arch/sparc64/include/ofw.h

@@ -27 +27 @@
  */
 
-#ifndef BOOT_sparc64_OFWARCH_H_
-#define BOOT_sparc64_OFWARCH_H_
+#ifndef BOOT_sparc64_OFW_H_
+#define BOOT_sparc64_OFW_H_
 
-#include "main.h"
-#include "types.h"
+#include <typedefs.h>
 
 #define OFW_ADDRESS_CELLS  2
 #define OFW_SIZE_CELLS     2
 
-extern int ofw_cpu(uint16_t mid_mask, uintptr_t physmem_start);
-extern int ofw_get_physmem_start(uintptr_t *start);
+extern uintptr_t ofw_get_physmem_start(void);
+extern void ofw_cpu(uint16_t, uintptr_t);
 
 #endif

boot/arch/sparc64/include/types.h

@@ -30 +30 @@
 #define BOOT_sparc64_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 uint64_t;
-
+typedef uint64_t size_t;
 typedef uint64_t uintptr_t;
 typedef uint64_t unative_t;
+typedef int64_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