diff options
| author | emaste <emaste@FreeBSD.org> | 2017-01-17 01:29:03 +0000 |
|---|---|---|
| committer | emaste <emaste@FreeBSD.org> | 2017-01-17 01:29:03 +0000 |
| commit | b69201eba34572f77331ed6af97315972970ebed (patch) | |
| tree | 6ce33395e9ad85fff23415120246397780a7cf35 /sys/boot/mips | |
| parent | 38075eeb11e9ee267d86ea90a4d3d59090cf9ba5 (diff) | |
| download | FreeBSD-src-b69201eba34572f77331ed6af97315972970ebed.zip FreeBSD-src-b69201eba34572f77331ed6af97315972970ebed.tar.gz | |
MFC r310225: Reduce boot loader version string duplication
Instead of repeating "%s, Revision %s" "(%s %s)" in each loader, just
create the full version string in vers.c
Diffstat (limited to 'sys/boot/mips')
| -rw-r--r-- | sys/boot/mips/beri/loader/loader.h | 3 | ||||
| -rw-r--r-- | sys/boot/mips/beri/loader/main.c | 4 |
2 files changed, 2 insertions, 5 deletions
diff --git a/sys/boot/mips/beri/loader/loader.h b/sys/boot/mips/beri/loader/loader.h index 31a4215..e4152e7 100644 --- a/sys/boot/mips/beri/loader/loader.h +++ b/sys/boot/mips/beri/loader/loader.h @@ -58,7 +58,6 @@ extern struct bootinfo boot2_bootinfo; int md_load64(char *args, vm_offset_t *modulep); /* vers.c */ -extern char bootprog_name[], bootprog_rev[]; -extern char bootprog_date[], bootprog_maker[]; +extern char bootprog_info[]; #endif /* !_BOOT_LOADER_H_ */ diff --git a/sys/boot/mips/beri/loader/main.c b/sys/boot/mips/beri/loader/main.c index 8253fb2..2d201d8 100644 --- a/sys/boot/mips/beri/loader/main.c +++ b/sys/boot/mips/beri/loader/main.c @@ -144,9 +144,7 @@ main(int argc, char *argv[], char *envv[], struct bootinfo *bootinfop) } extract_currdev(bootinfop); - printf("\n"); - printf("%s, Revision %s\n", bootprog_name, bootprog_rev); - printf("(%s, %s)\n", bootprog_maker, bootprog_date); + printf("\n%s", bootprog_info); #if 0 printf("bootpath=\"%s\"\n", bootpath); #endif |
