libburnia/libisoburn
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Polished and documented MIPS booting option

Browse Source
This commit is contained in:
Thomas Schmitt
2010-10-13 17:07:05 +00:00
parent 97415e3f63
commit 3abcb244c7
8 changed files with 176 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
xorriso/emulators.c
View File

@ -1455,9 +1455,6 @@ problem_handler_2:;
xorriso->patch_isolinux_image= 1;
} else if(strcmp(argv[i], "-b") == 0 ||
strcmp(argv[i], "-eltorito-boot") == 0 ||
#ifndef Xorriso_mips_boot_file_pathS
strcmp(argv[i], "-mips-boot") == 0 ||
#endif
strcmp(argv[i], "--efi-boot") == 0 ||
strcmp(argv[i], "-e") == 0) {
i++;
@ -1472,17 +1469,6 @@ problem_handler_2:;
xorriso->boot_efi_default= 1;
emul_boot= xorriso->boot_image_emul= 0;
#ifndef Xorriso_mips_boot_file_pathS
} else if(strcmp(argv[i - 1], "-mips-boot") == 0) {
boot_path= xorriso->boot_image_bin_path;
option_b= 0;
/* >>> Preliminary : this should be adjustable per boot image */
xorriso->system_area_options= 1 << 2; /* system area type 1 */
#endif /* ! Xorriso_mips_boot_file_pathS */
} else {
boot_path= xorriso->boot_image_bin_path;
if(strcmp(argv[i - 1], "-e") == 0)
@ -1566,8 +1552,6 @@ problem_handler_2:;
if(ret <= 0)
goto problem_handler_boot;
#ifdef Xorriso_mips_boot_file_pathS
} else if(strcmp(argv[i], "-mips-boot")==0) {
if(i+1>=argc)
goto not_enough_args;
@ -1581,8 +1565,6 @@ problem_handler_2:;
if(ret <= 0)
goto problem_handler_boot;
#endif /* Xorriso_mips_boot_file_pathS */
}
continue; /* regular bottom of loop */
problem_handler_boot:;