Initrd concatenation now working
This commit is contained in:
parent
c5d9114064
commit
24f32a1945
|
@ -186,10 +186,11 @@ static int bzimage_load_initrd ( struct image *image,
|
||||||
for_each_image ( initrd ) {
|
for_each_image ( initrd ) {
|
||||||
if ( initrd->type != &initrd_image_type )
|
if ( initrd->type != &initrd_image_type )
|
||||||
continue;
|
continue;
|
||||||
initrd_len = ( ( image->len + 0x0f ) & ~0x0f );
|
initrd_len = ( ( initrd->len + 0x0f ) & ~0x0f );
|
||||||
total_len += initrd_len;
|
total_len += initrd_len;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* Give up if no initrd images found */
|
||||||
if ( ! total_len )
|
if ( ! total_len )
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
|
@ -225,7 +226,7 @@ static int bzimage_load_initrd ( struct image *image,
|
||||||
for_each_image ( initrd ) {
|
for_each_image ( initrd ) {
|
||||||
if ( initrd->type != &initrd_image_type )
|
if ( initrd->type != &initrd_image_type )
|
||||||
continue;
|
continue;
|
||||||
initrd_len = ( ( image->len + 0x0f ) & ~0x0f );
|
initrd_len = ( ( initrd->len + 0x0f ) & ~0x0f );
|
||||||
DBGC ( image, "bzImage %p has initrd %p at [%lx,%lx)\n",
|
DBGC ( image, "bzImage %p has initrd %p at [%lx,%lx)\n",
|
||||||
image, initrd, ( start + offset ),
|
image, initrd, ( start + offset ),
|
||||||
( start + offset + initrd->len ) );
|
( start + offset + initrd->len ) );
|
||||||
|
|
Reference in New Issue