Mercurial > ecos

changeset 1319:94e373b3fc8d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix ELF load when -b option used.
author gthomas
date Fri, 17 Oct 2003 21:45:24 +0000
parents e7283a4a428c
children cfe81e17269a
files packages/redboot/current/ChangeLog packages/redboot/current/src/load.c
diffstat 2 files changed, 7 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/packages/redboot/current/ChangeLog
+++ b/packages/redboot/current/ChangeLog
@@ -1,3 +1,9 @@
+2003-10-17  Gary Thomas  <gary@mlbassoc.com>
+
+	* src/load.c: Only examine loadable segments when scanning to determine
+	lowest loadable address (only used when -b XXX option used).  Otherwise,
+	an offset into space could be chosen.
+
 2003-10-16  Jonathan Larmour  <jifl@eCosCentric.com>
 
 	* doc/redboot_installing.sgml: Fix eb40 flash install instructions.
--- a/packages/redboot/current/src/load.c
+++ b/packages/redboot/current/src/load.c
@@ -340,7 +340,7 @@ load_elf_image(getc_t getc, unsigned lon
         // Set address offset based on lowest address in file.
         addr_offset = 0xFFFFFFFF;
         for (phx = 0;  phx < ehdr.e_phnum;  phx++) {    
-            if (phdr[phx].p_paddr < addr_offset) {
+            if ((phdr[phx].p_type == PT_LOAD) && (phdr[phx].p_paddr < addr_offset)) {
                 addr_offset = phdr[phx].p_paddr;
             }
         }