Changeset 4646710 in mainline for boot/arch/mips32

Timestamp:

2017-06-07T15:39:23Z (8 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

239e32b8

Parents:

22299ed

Message:

replace objcopy with mkarray.py
(objcopy is notoriously problematic due to the uncontrolable way how it generates the object files, with what flags, etc.)

Location:

boot/arch/mips32

Files:

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

boot/arch/mips32/Makefile.inc

@@ -30 +30 @@
 BITS = 32
 EXTRA_CFLAGS = -msoft-float -mno-abicalls -G 0 -fno-zero-initialized-in-bss -mabi=32
+AS_PROLOG = .module softfloat;
 
 ifeq ($(MACHINE),msim)
@@ -74 +75 @@
         arch/$(BARCH)/src/main.c \
         arch/$(BARCH)/src/putchar.c \
-        $(COMPS_C) \
+        $(COMPS).s \
+        $(COMPS)_desc.c \
         genarch/src/division.c \
         genarch/src/multiplication.c \
@@ -84 +86 @@
         generic/src/version.c \
         generic/src/inflate.c
+
+PRE_DEPEND = $(COMPS).s $(COMPS).h $(COMPS)_desc.c

boot/arch/mips32/_link.ld.in

@@ -21 +21 @@
                 *(.bss);        /* uninitialized static variables */
                 *(COMMON);      /* global variables */
-[[COMPONENTS]]
+                *(.components);
         }
         

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);