The previous commit ("add a new command to show .config contents") improves the basic infrastructure of "embed a compressed file into the U-Boot image, and print it by a command". The same pattern for the "license" command. This commit reworks the command to improve the following: [1] Improve log style Kbuild style log GZIP cmd/license_data.gz CHK cmd/license_data_gz.h UPD cmd/license_data_gz.h CHK cmd/license_data_size.h UPD cmd/license_data_size.h instead of the bare Make log: cat ./Licenses/gpl-2.0.txt | gzip -9 -c | \ tools/bin2header license_gzip > ./include/license.h [2] Collect related code into the "cmd" directory Prior to this commit, the license.h was created by tools/Makefile, placed under the "include" directory, included from cmd/license.c, and deleted by the top-level Makefile. It is not a good idea to scatter related code. [3] Drop the fixed-malloc size LICENSE_MAX Just allocate the minimum required size of buffer because we know the size of the original gpl-2.0.txt. [4] Fix more issues Terminate the buffer with zero to prevent puts() from over-running. Add "static" to do_license. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> Reviewed-by: Simon Glass <sjg@chromium.org>master
parent
61304dbec3
commit
d726f225f5
@ -1,3 +1,6 @@ |
|||||||
config_data.gz |
config_data.gz |
||||||
config_data_gz.h |
config_data_gz.h |
||||||
config_data_size.h |
config_data_size.h |
||||||
|
license_data.gz |
||||||
|
license_data_gz.h |
||||||
|
license_data_size.h |
||||||
|
@ -1,41 +0,0 @@ |
|||||||
/* bin2header.c - program to convert binary file into a C structure
|
|
||||||
* definition to be included in a header file. |
|
||||||
* |
|
||||||
* (C) Copyright 2008 by Harald Welte <laforge@openmoko.org> |
|
||||||
* |
|
||||||
* SPDX-License-Identifier: GPL-2.0+ |
|
||||||
*/ |
|
||||||
|
|
||||||
#include <stdlib.h> |
|
||||||
#include <stdio.h> |
|
||||||
#include <unistd.h> |
|
||||||
|
|
||||||
int main(int argc, char **argv) |
|
||||||
{ |
|
||||||
if (argc < 2) { |
|
||||||
fprintf(stderr, "%s needs one argument: the structure name\n", |
|
||||||
argv[0]); |
|
||||||
exit(1); |
|
||||||
} |
|
||||||
|
|
||||||
printf("/* bin2header output - automatically generated */\n"); |
|
||||||
printf("unsigned char %s[] = {\n", argv[1]); |
|
||||||
|
|
||||||
while (1) { |
|
||||||
int i, nread; |
|
||||||
unsigned char buf[10]; |
|
||||||
nread = read(0, buf, sizeof(buf)); |
|
||||||
if (nread <= 0) |
|
||||||
break; |
|
||||||
|
|
||||||
printf("\t"); |
|
||||||
for (i = 0; i < nread - 1; i++) |
|
||||||
printf("0x%02x, ", buf[i]); |
|
||||||
|
|
||||||
printf("0x%02x,\n", buf[nread-1]); |
|
||||||
} |
|
||||||
|
|
||||||
printf("};\n"); |
|
||||||
|
|
||||||
exit(0); |
|
||||||
} |
|
Loading…
Reference in new issue