Changes in boot/arch/mips32/src/main.c [295732b:4646710] in mainline

File:

• boot/arch/mips32/src/main.c (modified) (4 diffs)

boot/arch/mips32/src/main.c

@@ -30 +30 @@
 #include <arch/arch.h>
 #include <arch/asm.h>
-#include <arch/_components.h>
 #include <halt.h>
 #include <printf.h>
@@ -40 +39 @@
 #include <errno.h>
 #include <inflate.h>
+#include "../../components.h"
 
 #define TOP2ADDR(top)  (((void *) PA2KA(BOOT_OFFSET)) + (top))
@@ -64 +64 @@
         size_t i;
         for (i = 0; i < COMPONENTS; i++)
-                printf(" %p|%p: %s image (%zu/%zu bytes)\n", components[i].start,
-                    (uintptr_t) components[i].start >= PA2KSEG(0) ?
-                    (void *) KSEG2PA(components[i].start) :
-                    (void *) KA2PA(components[i].start),
+                printf(" %p|%p: %s image (%zu/%zu bytes)\n", components[i].addr,
+                    (uintptr_t) components[i].addr >= PA2KSEG(0) ?
+                    (void *) KSEG2PA(components[i].addr) :
+                    (void *) KA2PA(components[i].addr),
                     components[i].name, components[i].inflated,
                     components[i].size);
@@ -107 +107 @@
                 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);