Merge mainline into yeeloongfw
This commit is contained in:
commit
b7e79e8a6a
155 changed files with 5949 additions and 2562 deletions
|
@ -1301,7 +1301,7 @@ main (int argc, char *argv[])
|
|||
image_target = &image_targets[i];
|
||||
if (!image_target)
|
||||
{
|
||||
printf ("unknown target %s\n", optarg);
|
||||
printf ("unknown target format %s\n", optarg);
|
||||
usage (1);
|
||||
}
|
||||
break;
|
||||
|
@ -1355,7 +1355,7 @@ main (int argc, char *argv[])
|
|||
break;
|
||||
|
||||
case 'V':
|
||||
printf ("grub-mkimage (%s) %s\n", PACKAGE_NAME, PACKAGE_VERSION);
|
||||
printf ("%s (%s) %s\n", program_name, PACKAGE_NAME, PACKAGE_VERSION);
|
||||
return 0;
|
||||
|
||||
case 'v':
|
||||
|
@ -1370,7 +1370,7 @@ main (int argc, char *argv[])
|
|||
|
||||
if (!image_target)
|
||||
{
|
||||
printf ("Target not specified.\n");
|
||||
printf ("Target format not specified (use the -O option).\n");
|
||||
usage (1);
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue