valentineus/0xFFFF
1
Fork 0
Code Releases Activity

main: In load mode, do not set kernel or initfs image more times

Browse Source
This commit is contained in:
Pali Rohár committed 2013-01-11 21:56:33 +01:00
1 parent 1bcaf8f79c
commit 7dd8fdb560
1 file changed
+22 -8
Download Patch File Download Diff File Expand all files Collapse all files
src/main.c
+22 -8
View File
@@ -394,8 +394,8 @@ int main(int argc, char **argv) {
int have_initfs = 0; int have_initfs = 0;
struct image * image_2nd = NULL; struct image * image_2nd = NULL;
struct image * image_secondary = NULL; struct image * image_secondary = NULL;
struct image * image_kernel = NULL; struct image_list * image_kernel = NULL;
struct image * image_initfs = NULL; struct image_list * image_initfs = NULL;
struct fiasco * fiasco_in = NULL; struct fiasco * fiasco_in = NULL;
struct fiasco * fiasco_out = NULL; struct fiasco * fiasco_out = NULL;
@@ -991,9 +991,9 @@ int main(int argc, char **argv) {
struct image_list * next = image_ptr->next; struct image_list * next = image_ptr->next;
if ( image_ptr->image->type == IMAGE_KERNEL ) { if ( image_ptr->image->type == IMAGE_KERNEL ) {
if ( have_kernel == 0 ) { if ( have_kernel == 0 ) {
image_kernel = image_ptr->image; image_kernel = image_ptr;
have_kernel = 1; have_kernel = 1;
} else if ( have_kernel == 1 && image_kernel != image_ptr->image ) { } else if ( have_kernel == 1 && image_kernel != image_ptr ) {
image_kernel = NULL; image_kernel = NULL;
have_kernel = 2; have_kernel = 2;
} }
@@ -1006,9 +1006,9 @@ int main(int argc, char **argv) {
struct image_list * next = image_ptr->next; struct image_list * next = image_ptr->next;
if ( image_ptr->image->type == IMAGE_INITFS ) { if ( image_ptr->image->type == IMAGE_INITFS ) {
if ( have_initfs == 0 ) { if ( have_initfs == 0 ) {
image_initfs = image_ptr->image; image_initfs = image_ptr;
have_initfs = 1; have_initfs = 1;
} else if ( have_initfs == 1 && image_initfs != image_ptr->image ) { } else if ( have_initfs == 1 && image_initfs != image_ptr ) {
image_initfs = NULL; image_initfs = NULL;
have_initfs = 2; have_initfs = 2;
} }
@@ -1038,14 +1038,28 @@ int main(int argc, char **argv) {
/* load */ /* load */
if ( dev_load ) { if ( dev_load ) {
ret = 0; ret = 0;
if ( image_kernel ) if ( image_kernel )
ret = dev_load_image(dev, image_kernel); ret = dev_load_image(dev, image_kernel->image);
if ( ret < 0 ) if ( ret < 0 )
goto again; goto again;
if ( image_kernel == image_first )
image_first = image_first->next;
image_list_unlink(image_kernel);
free(image_kernel);
image_kernel = NULL;
if ( image_initfs ) if ( image_initfs )
ret = dev_load_image(dev, image_initfs); ret = dev_load_image(dev, image_initfs->image);
if ( ret < 0 ) if ( ret < 0 )
goto again; goto again;
if ( image_initfs == image_first )
image_first = image_first->next;
image_list_unlink(image_initfs);
free(image_initfs);
image_initfs = NULL;
} }
/* flash */ /* flash */