GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

util/sconfig: Improve usage and long options 

Move usage function closer to main(), remove excessive printf() calls,
use descriptive argument flags.

Signed-off-by: Jakub Czapiga <jacz@semihalf.com>
Change-Id: If5252de63692c5e43bfbde4d7d93e1d7a84e8dff
Reviewed-on: https://review.coreboot.org/c/coreboot/+/70524
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Elyes Haouas <ehaouas@noos.fr>
This commit is contained in:
Jakub Czapiga 2022-12-08 14:33:02 +01:00 committed by Felix Held
parent e01742bf3d
commit 00d71ffca8
1 changed files with 25 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
util/sconfig/main.c
View File

@ -1493,20 +1493,6 @@ static void inherit_subsystem_ids(FILE *file, FILE *head, struct device *dev,
} }
} }
static void usage(void)
{
printf("usage: sconfig <options>\n");
printf(" -c | --output_c : Path to output static.c file (required)\n");
printf(" -r | --output_h : Path to header static.h file (required)\n");
printf(" -d | --output_d : Path to header static_devices.h file (required)\n");
printf(" -f | --output_f : Path to header static_fw_config.h file (required)\n");
printf(" -m | --mainboard_devtree : Path to mainboard devicetree file (required)\n");
printf(" -o | --override_devtree : Path to override devicetree file (optional)\n");
printf(" -p | --chipset_devtree : Path to chipset/SOC devicetree file (optional)\n");
exit(1);
}
static void parse_devicetree(const char *file, struct bus *parent) static void parse_devicetree(const char *file, struct bus *parent)
{ {
FILE *filec = fopen(file, "r"); FILE *filec = fopen(file, "r");
@ -1999,17 +1985,32 @@ static void generate_outputf(FILE *f)
fprintf(f, "\n#endif /* __STATIC_FW_CONFIG_H */\n"); fprintf(f, "\n#endif /* __STATIC_FW_CONFIG_H */\n");
} }
static void usage(const char *name)
{
printf("Usage: %s <options>\n", name);
printf("Options:\n"
" -c | --output_c : Path to output static.c file (required)\n"
" -r | --output_h : Path to header static.h file (required)\n"
" -d | --output_d : Path to header static_devices.h file (required)\n"
" -f | --output_f : Path to header static_fw_config.h file (required)\n"
" -m | --mainboard_devtree : Path to mainboard devicetree file (required)\n"
" -o | --override_devtree : Path to override devicetree file (optional)\n"
" -p | --chipset_devtree : Path to chipset/SOC devicetree file (optional)\n");
exit(1);
}
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
static const struct option long_options[] = { static const struct option long_options[] = {
{ "mainboard_devtree", 1, NULL, 'm' }, { "mainboard_devtree", required_argument, NULL, 'm' },
{ "override_devtree", 1, NULL, 'o' }, { "override_devtree", required_argument, NULL, 'o' },
{ "chipset_devtree", 1, NULL, 'p' }, { "chipset_devtree", required_argument, NULL, 'p' },
{ "output_c", 1, NULL, 'c' }, { "output_c", required_argument, NULL, 'c' },
{ "output_h", 1, NULL, 'r' }, { "output_h", required_argument, NULL, 'r' },
{ "output_d", 1, NULL, 'd' }, { "output_d", required_argument, NULL, 'd' },
{ "output_f", 1, NULL, 'f' }, { "output_f", required_argument, NULL, 'f' },
{ "help", 1, NULL, 'h' }, { "help", no_argument, NULL, 'h' },
{ } { }
}; };
const char *override_devtree = NULL; const char *override_devtree = NULL;
@ -2047,12 +2048,12 @@ int main(int argc, char **argv)
break; break;
case 'h': case 'h':
default: default:
usage(); usage(argv[0]);
} }
} }
if (!base_devtree || !outputc || !outputh || !outputd || !outputf) if (!base_devtree || !outputc || !outputh || !outputd || !outputf)
usage(); usage(argv[0]);
if (chipset_devtree) { if (chipset_devtree) {
/* Use the chipset devicetree as the base, then override /* Use the chipset devicetree as the base, then override