Changeset c09ff7b in mainline for boot/arch

Timestamp:

2017-06-07T16:39:00Z (8 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

23c8acd9

Parents:

239e32b8

Message:

riscv64: fix compilation

Location:

boot/arch/riscv64

Files:

• Makefile.inc (modified) (2 diffs)
• _link.ld.in (modified) (1 diff)
• src/main.c (modified) (3 diffs)

boot/arch/riscv64/Makefile.inc

@@ -40 +40 @@
         arch/$(BARCH)/src/ucb.c \
         arch/$(BARCH)/src/putchar.c \
-        $(COMPS_C) \
+        $(COMPS).s \
+        $(COMPS)_desc.c \
         generic/src/memstr.c \
         generic/src/printf_core.c \
@@ -48 +49 @@
         generic/src/version.c \
         generic/src/inflate.c
+
+PRE_DEPEND = $(COMPS).s $(COMPS).h $(COMPS)_desc.c

boot/arch/riscv64/_link.ld.in

@@ -17 +17 @@
                 *(.bss);        /* uninitialized static variables */
                 *(COMMON);      /* global variables */
+                *(.components);
         }
         

boot/arch/riscv64/src/main.c

@@ -39 +39 @@
 #include <halt.h>
 #include <inflate.h>
-#include <arch/_components.h>
+#include "../../components.h"
 
 #define KA2PA(x)  (((uintptr_t) (x)) - UINT64_C(0xffff800000000000))
@@ -60 +60 @@
         
         for (size_t i = 0; i < COMPONENTS; i++) {
-                printf(" %p: %s image (%zu/%zu bytes)\n", components[i].start,
+                printf(" %p: %s image (%zu/%zu bytes)\n", components[i].addr,
                     components[i].name, components[i].inflated,
                     components[i].size);
                 
-                uintptr_t tail = (uintptr_t) components[i].start +
+                uintptr_t tail = (uintptr_t) components[i].addr +
                     components[i].size;
                 if (tail > top)
@@ -112 +112 @@
                 printf("%s ", components[i - 1].name);
                 
-                int err = inflate(components[i - 1].start, components[i - 1].size,
+                int err = inflate(components[i - 1].addr, components[i - 1].size,
                     dest[i - 1], components[i - 1].inflated);