OpenSystemsDevelopment / usbboot

Commit d3760e119385a179765f43a50a8e051a44127c25

Authored by tim
Committed by Phil Elwell
1 parent ff86c6de

Don't load bootcode from the overlay directory 

Also add extra logging to indicate where the file was loaded
from to make it more obvious where a file is loaded from.

Update Windows installer
Inline Side-by-side
Showing 2 changed files with 9 additions and 1 deletions
@@ -470,7 +470,9 @@ FILE * check_file(const char * dir, const char *fname, int use_fmem) @@ -470,7 +470,9 @@ FILE * check_file(const char * dir, const char *fname, int use_fmem)
470 470
471 if(dir) 471 if(dir)
472 { 472 {
473 - if(overlay&&(pathname[0] != 0)) 473 + if(overlay && (pathname[0] != 0) &&
  474 + (strcmp(fname, "bootcode4.bin") != 0) &&
  475 + (strcmp(fname, "bootcode.bin") != 0))
474 { 476 {
475 strcpy(path, dir); 477 strcpy(path, dir);
476 strcat(path, "/"); 478 strcat(path, "/");
@@ -478,6 +480,8 @@ FILE * check_file(const char * dir, const char *fname, int use_fmem) @@ -478,6 +480,8 @@ FILE * check_file(const char * dir, const char *fname, int use_fmem)
478 strcat(path, "/"); 480 strcat(path, "/");
479 strcat(path, fname); 481 strcat(path, fname);
480 fp = fopen(path, "rb"); 482 fp = fopen(path, "rb");
  483 + if (fp)
  484 + printf("Loading: %s\n", path);
481 memset(path, 0, sizeof(path)); 485 memset(path, 0, sizeof(path));
482 } 486 }
483 487
@@ -487,6 +491,8 @@ FILE * check_file(const char * dir, const char *fname, int use_fmem) @@ -487,6 +491,8 @@ FILE * check_file(const char * dir, const char *fname, int use_fmem)
487 strcat(path, "/"); 491 strcat(path, "/");
488 strcat(path, fname); 492 strcat(path, fname);
489 fp = fopen(path, "rb"); 493 fp = fopen(path, "rb");
  494 + if (fp)
  495 + printf("Loading: %s\n", path);
490 } 496 }
491 } 497 }
492 498
@@ -508,6 +514,8 @@ FILE * check_file(const char * dir, const char *fname, int use_fmem) @@ -508,6 +514,8 @@ FILE * check_file(const char * dir, const char *fname, int use_fmem)
508 else if(strcmp(fname, "start.elf") == 0) 514 else if(strcmp(fname, "start.elf") == 0)
509 fp = fmemopen(msd_start_elf, msd_start_elf_len, "rb"); 515 fp = fmemopen(msd_start_elf, msd_start_elf_len, "rb");
510 } 516 }
  517 + if (fp)
  518 + printf("Loading embedded: %s\n", fname);
511 } 519 }
512 520
513 return fp; 521 return fp;
win32/rpiboot_setup.exe
View file @d3760e1
No preview for this file type