Changeset 4646710 in mainline for boot/arch/sparc64

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/sparc64

Files:

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

boot/arch/sparc64/Makefile.inc

@@ -57 +57 @@
         arch/$(BARCH)/src/main.c \
         arch/$(BARCH)/src/ofw.c \
-        $(COMPS_C) \
+        $(COMPS).s \
+        $(COMPS)_desc.c \
         genarch/src/ofw.c \
         genarch/src/ofw_tree.c \
@@ -68 +69 @@
         generic/src/version.c \
         generic/src/inflate.c
+
+PRE_DEPEND = $(COMPS).s $(COMPS).h $(COMPS)_desc.c

boot/arch/sparc64/_link.ld.in

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

boot/arch/sparc64/src/main.c

@@ -32 +32 @@
 #include <arch/asm.h>
 #include <arch/ofw.h>
-#include <arch/_components.h>
 #include <genarch/ofw.h>
 #include <genarch/ofw_tree.h>
@@ -44 +43 @@
 #include <errno.h>
 #include <inflate.h>
+#include "../../components.h"
 
 /* The lowest ID (read from the VER register) of some US3 CPU model */
@@ -220 +220 @@
         size_t i;
         for (i = 0; i < COMPONENTS; i++)
-                printf(" %p|%p: %s image (%zu/%zu bytes)\n", components[i].start,
-                    ofw_translate(components[i].start), components[i].name,
+                printf(" %p|%p: %s image (%zu/%zu bytes)\n", components[i].addr,
+                    ofw_translate(components[i].addr), components[i].name,
                     components[i].inflated, components[i].size);
         
@@ -267 +267 @@
                     ALIGN_UP(components[i - 1].inflated, PAGE_SIZE), -1);
                 
-                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);