Add local copy of commit-msg hook

[coreboot.git] / util / cbfstool / cbfs-mkstage.c

diff --git a/util/cbfstool/cbfs-mkstage.c b/util/cbfstool/cbfs-mkstage.c
index 693d7cc0990e9725bb67965e02dc3d4537d0bb96..2f81da07d5e8137a0bacc65a44f95296ba29d420 100644 (file)
--- a/util/cbfstool/cbfs-mkstage.c
+++ b/util/cbfstool/cbfs-mkstage.c
@@ -122,6 +122,15 @@ int parse_elf_to_stage(unsigned char *input, unsigned char **output,
                        mem_end = mend;
        }
 
+       if (data_start < *location) {
+               data_start = *location;
+       }
+
+       if (data_end <= data_start) {
+               fprintf(stderr, "E: data ends before it starts. Make sure the ELF file is correct and resides in ROM space.\n");
+               exit(1);
+       }
+
        /* allocate an intermediate buffer for the data */
        buffer = calloc(data_end - data_start, 1);
 
@@ -133,6 +142,7 @@ int parse_elf_to_stage(unsigned char *input, unsigned char **output,
        /* Copy the file data into the buffer */
 
        for (i = 0; i < headers; i++) {
+               unsigned int l_start, l_offset = 0;
 
                if (elf32_to_native(phdr[i].p_type) != PT_LOAD)
                        continue;
@@ -140,9 +150,15 @@ int parse_elf_to_stage(unsigned char *input, unsigned char **output,
                if (elf32_to_native(phdr[i].p_memsz) == 0)
                        continue;
 
-               memcpy(buffer + (elf32_to_native(phdr[i].p_paddr) - data_start),
-                      &header[elf32_to_native(phdr[i].p_offset)],
-                      elf32_to_native(phdr[i].p_filesz));
+               l_start = elf32_to_native(phdr[i].p_paddr);
+               if (l_start < *location) {
+                       l_offset = *location - l_start;
+                       l_start = *location;
+               }
+
+               memcpy(buffer + (l_start - data_start),
+                      &header[elf32_to_native(phdr[i].p_offset)+l_offset],
+                      elf32_to_native(phdr[i].p_filesz)-l_offset);
        }
 
        /* Now make the output buffer */