Changeset 05b3640 in mainline

Timestamp:

2017-08-21T18:40:26Z (7 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

5f2926a

Parents:

fcfe416

Message:

riscv64: update boot interface

Location:

kernel/arch/riscv64

Files:

• include/arch/boot/boot.h (modified) (3 diffs)
• src/boot/boot.S (added)

kernel/arch/riscv64/include/arch/boot/boot.h

@@ -36 +36 @@
 #define KERN_riscv64_BOOT_H_
 
-#define BOOT_OFFSET  0x200000
+#define BOOT_OFFSET  0x48000000
 
 #define TASKMAP_MAX_RECORDS        32
 #define MEMMAP_MAX_RECORDS         32
 #define BOOTINFO_TASK_NAME_BUFLEN  32
+
+/* Temporary stack size for boot process */
+#define TEMP_STACK_SIZE  0x1000
 
 #ifndef __ASM__
@@ -47 +50 @@
 #include <stdint.h>
 #include <config.h>
+
+typedef struct {
+        volatile uint64_t *tohost;
+        volatile uint64_t *fromhost;
+} ucbinfo_t;
+
+typedef struct {
+        void *start;
+        size_t size;
+} memzone_t;
+
+typedef struct {
+        uint64_t total;
+        size_t cnt;
+        memzone_t zones[MEMMAP_MAX_RECORDS];
+} memmap_t;
 
 typedef struct {
@@ -60 +79 @@
 
 typedef struct {
-        void *start;
-        size_t size;
-} memzone_t;
-
-typedef struct {
-        uint64_t total;
-        size_t cnt;
-        memzone_t zones[MEMMAP_MAX_RECORDS];
-} memmap_t;
-
-typedef struct {
+        ucbinfo_t ucbinfo;
+        uintptr_t physmem_start;
+        uintptr_t htif_frame;
+        uintptr_t pt_frame;
         memmap_t memmap;
         taskmap_t taskmap;
-        ballocs_t ballocs;
 } bootinfo_t;
-
-extern memmap_t memmap;
 
 #endif