Changeset 4646710 in mainline for boot/arch/arm32

Timestamp:

2017-06-07T15:39:23Z (9 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/arm32

Files:

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

boot/arch/arm32/Makefile.inc

@@ -96 +96 @@
         arch/$(BARCH)/src/mm.c \
         arch/$(BARCH)/src/putchar.c \
-        $(COMPS_C) \
+        $(COMPS).s \
+        $(COMPS)_desc.c \
         genarch/src/division.c \
         generic/src/memstr.c \
@@ -105 +106 @@
         generic/src/version.c \
         generic/src/inflate.c
+
+PRE_DEPEND = $(COMPS).s $(COMPS).h $(COMPS)_desc.c

boot/arch/arm32/_link.ld.in

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

boot/arch/arm32/src/main.c

@@ -37 +37 @@
 #include <arch/asm.h>
 #include <arch/mm.h>
-#include <arch/_components.h>
 #include <halt.h>
 #include <printf.h>
@@ -49 +48 @@
 #include <inflate.h>
 #include <arch/cp15.h>
+#include "../../components.h"
 
 #define TOP2ADDR(top)  (((void *) PA2KA(BOOT_OFFSET)) + (top))
@@ -99 +99 @@
         
         for (size_t i = 0; i < COMPONENTS; i++) {
-                printf(" %p|%p: %s image (%u/%u bytes)\n", components[i].start,
-                    components[i].start, components[i].name, components[i].inflated,
+                printf(" %p|%p: %s image (%u/%u bytes)\n", components[i].addr,
+                    components[i].addr, components[i].name, components[i].inflated,
                     components[i].size);
         }
@@ -129 +129 @@
         
         for (size_t i = cnt; i > 0; i--) {
-                void *tail = components[i - 1].start + components[i - 1].size;
+                void *tail = components[i - 1].addr + components[i - 1].size;
                 if (tail >= dest[i - 1]) {
                         printf("\n%s: Image too large to fit (%p >= %p), halting.\n",
@@ -138 +138 @@
                 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);
                 if (err != EOK) {