Changeset 4646710 in mainline for boot/arch/ia64

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

Files:

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

boot/arch/ia64/Makefile.inc

@@ -48 +48 @@
         arch/$(BARCH)/src/pal_asm.S \
         arch/$(BARCH)/src/putchar.c \
-        $(COMPS_C) \
+        $(COMPS).s \
+        $(COMPS)_desc.c \
         genarch/src/efi.c \
         genarch/src/division.c \
@@ -88 +89 @@
         bus/isa
 
+PRE_DEPEND = $(COMPS).s $(COMPS).h $(COMPS)_desc.c

boot/arch/ia64/_link.ld.in

@@ -16 +16 @@
                 *(.bss);                /* uninitialized static variables */
                 *(COMMON);
-[[COMPONENTS]]
+                *(.components);
         }
-
+        
         /DISCARD/ : {
                 *(.*);

boot/arch/ia64/src/main.c

@@ -33 +33 @@
 #include <arch/arch.h>
 #include <arch/asm.h>
-#include <arch/_components.h>
 #include <genarch/efi.h>
 #include <arch/sal.h>
@@ -46 +45 @@
 #include <errno.h>
 #include <inflate.h>
+#include "../../components.h"
 
 #define DEFAULT_MEMORY_BASE             0x4000000ULL
@@ -78 +78 @@
                 memmap[items].size = DEFAULT_LEGACY_IO_SIZE;
                 memmap[items].type = MEMMAP_IO_PORTS;
-                items++;                 
+                items++;
         } else {
                 char *cur, *mm_base = (char *) bootpar->efi_memmap;
@@ -159 +159 @@
         size_t i;
         for (i = 0; i < COMPONENTS; i++)
-                printf(" %p|%p: %s image (%zu/%zu bytes)\n", components[i].start,
-                    components[i].start, components[i].name,
+                printf(" %p|%p: %s image (%zu/%zu bytes)\n", components[i].addr,
+                    components[i].addr, components[i].name,
                     components[i].inflated, components[i].size);
         
@@ -202 +202 @@
                  * overlap with the destination for inflate().
                  */
-                memmove((void *) top, components[i - 1].start, components[i - 1].size);
+                memmove((void *) top, components[i - 1].addr, components[i - 1].size);
                 
                 int err = inflate((void *) top, components[i - 1].size,