From ee004de9691ff52eeebb492273bd5ac1d85c7006 Mon Sep 17 00:00:00 2001 From: Felix Held Date: Fri, 28 Jul 2023 18:01:40 +0200 Subject: [PATCH] util/sconfig: rework help text printing MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Drop the program name and split the printf call with multiple lines of text into separate printk calls. Signed-off-by: Arthur Heymans Signed-off-by: Felix Held Change-Id: I43df1fd02ce0fdbb6b22e1d4eda45017811c48d8 Reviewed-on: https://review.coreboot.org/c/coreboot/+/76774 Reviewed-by: Kyösti Mälkki Reviewed-by: Martin Roth Tested-by: build bot (Jenkins) --- util/sconfig/main.c | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/util/sconfig/main.c b/util/sconfig/main.c index fb598282da..dd26e07de8 100644 --- a/util/sconfig/main.c +++ b/util/sconfig/main.c @@ -1986,17 +1986,16 @@ static void generate_outputf(FILE *f) fprintf(f, "\n#endif /* __STATIC_FW_CONFIG_H */\n"); } -static void usage(const char *name) +static void usage(void) { - printf("Usage: %s \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"); + printf("Usage: sconfig \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); } @@ -2049,12 +2048,12 @@ int main(int argc, char **argv) break; case 'h': default: - usage(argv[0]); + usage(); } } if (!base_devtree || !outputc || !outputh || !outputd || !outputf) - usage(argv[0]); + usage(); if (chipset_devtree) { /* Use the chipset devicetree as the base, then override