[haiku-commits] haiku: hrev46080 - src/system/boot/platform/u-boot

  • From: ithamar@xxxxxxxxxxxxxxxxxxx
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Tue, 17 Sep 2013 02:44:39 +0200 (CEST)

hrev46080 adds 1 changeset to branch 'master'
old head: c21a3b20c9d716c2614171d49b274303fca4285d
new head: 7418443d1246959a5d89dad67d56b749a6708c6a
overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=7418443+%5Ec21a3b2

----------------------------------------------------------------------------

7418443: loader/u-boot: fix alignment of uimage components.
  
  The "blobs" in a U-Boot uimage are aligned at 4 bytes, which we
  did not take into account. Found this when adding a 3rd blob
  containing the Flattened Device Tree for ARM.

                          [ Ithamar R. Adema <ithamar@xxxxxxxxxxxxxxxxxxx> ]

----------------------------------------------------------------------------

Revision:    hrev46080
Commit:      7418443d1246959a5d89dad67d56b749a6708c6a
URL:         http://cgit.haiku-os.org/haiku/commit/?id=7418443
Author:      Ithamar R. Adema <ithamar@xxxxxxxxxxxxxxxxxxx>
Date:        Tue Sep 17 00:42:58 2013 UTC

----------------------------------------------------------------------------

1 file changed, 1 insertion(+), 1 deletion(-)
src/system/boot/platform/u-boot/uimage.cpp | 2 +-

----------------------------------------------------------------------------

diff --git a/src/system/boot/platform/u-boot/uimage.cpp 
b/src/system/boot/platform/u-boot/uimage.cpp
index dfe85a4..0e2edd5 100644
--- a/src/system/boot/platform/u-boot/uimage.cpp
+++ b/src/system/boot/platform/u-boot/uimage.cpp
@@ -55,7 +55,7 @@ image_multi_getimg(struct image_header *image, uint32 idx, 
uint32 *data, uint32
                        *size = ntohl(sizes[i]);
                        return true;
                }
-               base += ntohl(sizes[i]);
+               base += (ntohl(sizes[i]) + 3) & ~3;
        }
        return false;
 }


Other related posts:

  • » [haiku-commits] haiku: hrev46080 - src/system/boot/platform/u-boot - ithamar