cmd: add "config" command, rework "license" command
v2 cover cmd: add "config" command, rework "license" command
Changes in v2:
- Fix a typo in git-log. bin2header -> bin2c
Masahiro Yamada (3):
scripts: import bin2c.c from Linux 4.10-rc6
cmd: add a new command "config" to show .config contents
cmd: rework "license" command
Kconfig | 2 ++ Makefile | 14 ++++++++------ cmd/.gitignore | 6 ++++++ cmd/Kconfig | 13 +++++++++++++ cmd/Makefile | 37 +++++++++++++++++++++++++++++++++++++ cmd/config.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ cmd/license.c | 31 ++++++++++++++++++------------- include/.gitignore | 1 - scripts/.gitignore | 1 + scripts/Kconfig | 2 ++ scripts/Makefile | 4 ++++ scripts/bin2c.c | 36 ++++++++++++++++++++++++++++++++++++ tools/Makefile | 11 +---------- tools/bin2header.c | 41 ----------------------------------------- 14 files changed, 172 insertions(+), 71 deletions(-) create mode 100644 cmd/.gitignore create mode 100644 cmd/config.c create mode 100644 scripts/Kconfig create mode 100644 scripts/bin2c.c delete mode 100644 tools/bin2header.c
Signature · 1 line
2.7.4
PATCH v2 1/3 scripts: import bin2c.c from Linux 4.10-rc6
Import scripts/basic/bin2c.c of Linux.
In Linux Kernel, this file was moved to scripts/basic directory by commit 8370edea81e3 ("bin2c: move bin2c in scripts/basic").
In U-boot, we do not need to follow that commit. Just put it in the original directory "scripts".
---
Changes in v2:
- Fix a typo in git-log. bin2header -> bin2c
scripts/bin2c.c | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 scripts/bin2c.c
scripts/bin2c.c new file +36 -0
@@ -0,0 +1,36 @@ +/* +* Unloved program to convert a binary on stdin to a C include on stdout +* +* Jan 1999 Matt Mackall <[email protected]> +* +* This software may be used and distributed according to the terms +* of the GNU General Public License, incorporated herein by reference. +*/ + +#include <stdio.h> + +int main (int argc,char *argv[]) +{ +int ch, total =0 ; + +if (argc >1 ) +printf ("const char %s[] %s=\n" , + argv[1 ], argc >2 ? argv[2 ] :"" ); + +do { +printf ("\t\"" ); +while ((ch =getchar ()) !=EOF ) { + total++; +printf ("\\x%02x" , ch); +if (total %16 ==0 ) +break ; + } +printf ("\"\n" ); + }while (ch !=EOF ); + +if (argc >1 ) +printf ("\t;\n\n#include <linux/types.h>\n\nconst size_t %s_size = %d;\n" , + argv[1 ], total); + +return 0 ; +}
Signature · 1 line
2.7.4
PATCH v2 1/3 scripts: import bin2c.c from Linux 4.10-rc6
Quoted 9 lines · Masahiro Yamada
Import
scripts/basic/bin2c.cof Linux.In Linux Kernel, this file was moved to
scripts/basicdirectory by commit8370edea81e3("bin2c: move bin2c inscripts/basic").In U-boot, we do not need to follow that commit. Just put it in the original directory "scripts".
Signed-off-by Masahiro Yamada <[email protected]>
Quoted 8 lines
---
Changes in v2:
- Fix a typo in git-log. bin2header -> bin2cscripts/bin2c.c | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 scripts/bin2c.c
PATCH v2 1/3 scripts: import bin2c.c from Linux 4.10-rc6
In reply to Masahiro YamadaQuoted 6 lines · Masahiro Yamada
Import
scripts/basic/bin2c.cof Linux.In Linux Kernel, this file was moved to
scripts/basicdirectory by commit8370edea81e3("bin2c: move bin2c inscripts/basic").In U-boot, we do not need to follow that commit. Just put it in the
Sorry for jumping out late, but one nits:
U-boot -> U-Boot
Quoted 12 lines
original directory "scripts".
Signed-off-by Masahiro Yamada <[email protected]>---
Changes in v2:
- Fix a typo in git-log. bin2header -> bin2cscripts/bin2c.c | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 scripts/bin2c.c
[snip]
Regards,
Bin
PATCH v2 1/3 scripts: import bin2c.c from Linux 4.10-rc6
Hi Bin,
2017-02-07 11:38 GMT+09:00 Bin Meng <[email protected]>:
Quoted 4 lines
Quoted 2 lines · Masahiro Yamada
Import
scripts/basic/bin2c.cof Linux.
Quoted 8 lines
Quoted 4 lines
In Linux Kernel, this file was moved to
scripts/basicdirectory by commit8370edea81e3("bin2c: move bin2c inscripts/basic").In U-boot, we do not need to follow that commit. Just put it in the
Sorry for jumping out late, but one nits:
U-boot -> U-Boot
Thanks for pointing this out.
Tom,
Could you fix s/U-boot/U-Boot/ when this patch is applied, please?
Signature · 2 lines
Best Regards Masahiro Yamada
PATCH v2 1/3 scripts: import bin2c.c from Linux 4.10-rc6
Quoted 14 lines · Masahiro Yamada
Hi Bin,
2017-02-07 11:38 GMT+09:00 Bin Meng <[email protected]>:
Quoted 11 lines
Quoted 6 lines · Masahiro Yamada
Import
scripts/basic/bin2c.cof Linux.In Linux Kernel, this file was moved to
scripts/basicdirectory by commit8370edea81e3("bin2c: move bin2c inscripts/basic").In U-boot, we do not need to follow that commit. Just put it in the
Sorry for jumping out late, but one nits:
Quoted 7 lines
Quoted 1 line
U-boot -> U-Boot
Thanks for pointing this out.
Tom,
Could you fix s/U-boot/U-Boot/ when this patch is applied, please?
I'll endeavor to remember :)
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 819 bytes Desc: Digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20170207/a5ebb5cf/attachment.sig>
PATCH v2 1/3 scripts: import bin2c.c from Linux 4.10-rc6
In reply to Masahiro YamadaQuoted 10 lines · Masahiro Yamada
Import
scripts/basic/bin2c.cof Linux.In Linux Kernel, this file was moved to
scripts/basicdirectory by commit8370edea81e3("bin2c: move bin2c inscripts/basic").In U-Boot, we do not need to follow that commit. Just put it in the original directory "scripts".
Signed-off-by Masahiro Yamada <[email protected]>Reviewed-by Simon Glass <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 819 bytes Desc: Digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20170208/070b5040/attachment.sig>
PATCH v2 2/3 cmd: add a new command "config" to show .config contents
In reply to Masahiro YamadaThis feature is inspired by /proc/config.gz of Linux. In Linux, if CONFIG_IKCONFIG is enabled, the ".config" file contents are embedded in the kernel image. If CONFIG_IKCONFIG_PROC is also enabled, the ".config" contents are exposed to /proc/config.gz. Users can do "zcat /proc/config.gz" to check which config options are enabled on the running kernel image.
The idea is almost the same here; if CONFIG_CMD_CONFIG is enabled, the ".config" contents are compressed and saved in the U-Boot image, then printed by the new command "config".
The usage is quite simple. Enable CONFIG_CMD_CONFIG, then run
Quoted 1 line
config
from the command line interface. The ".config" contents will be printed on the console.
This feature increases the U-Boot image size by about 4KB (this is mostly due to the gzip-compressed .config file). By default, it is enabled only for Sandbox because we do not care about the memory footprint on it. Of course, this feature is architecture agnostic, so you can enable it on any board if the image size increase is acceptable for you.
---
Changes in v2: None
Kconfig | 2 ++ Makefile | 12 +++++++----- cmd/.gitignore | 3 +++ cmd/Kconfig | 12 ++++++++++++ cmd/Makefile | 22 ++++++++++++++++++++++ cmd/config.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ scripts/.gitignore | 1 + scripts/Kconfig | 2 ++ scripts/Makefile | 4 ++++ 9 files changed, 97 insertions(+), 5 deletions(-) create mode 100644 cmd/.gitignore create mode 100644 cmd/config.c create mode 100644 scripts/Kconfig
Kconfig +2 -0
@@ -325,3 +325,5 @@ source "fs/Kconfig" source "lib/Kconfig" source "test/Kconfig" + +source "scripts/Kconfig"
Makefile +7 -5
@@ -482,6 +482,13 @@ else # Build targets only - this includes vmlinux, arch specific targets, clean # targets and others. In general all targets except *config targets. +# Additional helpers built in scripts/ +# Carefully list dependencies so we do not try to build scripts twice +# in parallel +PHONY += scripts +scripts: scripts_basic include/config/auto.conf + $(Q)$(MAKE) $(build)=$(@) + ifeq ($(dot-config),1) # Read in config -include include/config/auto.conf
@@ -1537,11 +1544,6 @@ tests: $(Q)$(MAKE) $(build)=scripts build_docproc $(Q)$(MAKE) $(build)=doc/DocBook $@ -# Dummies... -PHONY += prepare scripts -prepare: ; -scripts: ; - endif #ifeq ($(config-targets),1) endif #ifeq ($(mixed-targets),1)
cmd/.gitignore new file +3 -0
@@ -0,0 +1,3 @@ +config_data.gz +config_data_gz.h +config_data_size.h
cmd/Kconfig +12 -0
@@ -126,6 +126,18 @@ config CMD_BDI help Print board info +config CMD_CONFIG + bool "config" + select BUILD_BIN2C + default SANDBOX + help + Print ".config" contents. + + If this option is enabled, the ".config" file contents are embedded + in the U-Boot image and can be printed on the console by the "config" + command. This provides information of which options are enabled on + the running U-Boot. + config CMD_CONSOLE bool "coninfo" default y
cmd/Makefile +22 -0
@@ -31,6 +31,7 @@ obj-$(CONFIG_CMD_BOOTI) += booti.o obj-$(CONFIG_CMD_CACHE) += cache.o obj-$(CONFIG_CMD_CBFS) += cbfs.o obj-$(CONFIG_CMD_CLK) += clk.o +obj-$(CONFIG_CMD_CONFIG) += config.o obj-$(CONFIG_CMD_CONSOLE) += console.o obj-$(CONFIG_CMD_CPLBINFO) += cplbinfo.o obj-$(CONFIG_CMD_CPU) += cpu.o
@@ -165,3 +166,24 @@ obj-$(CONFIG_CMD_BLOB) += blob.o obj-y += nvedit.o obj-$(CONFIG_ARCH_MVEBU) += mvebu/ + +filechk_data_gz = (echo "static const char data_gz[] ="; cat $< | scripts/bin2c; echo ";") + +filechk_data_size = \ + (echo "static const size_t data_size = "; \ + cat $< | wc -c; echo ";") + +# "config" command +$(obj)/config.o: $(obj)/config_data_gz.h $(obj)/config_data_size.h + +targets += config_data.gz +$(obj)/config_data.gz: $(KCONFIG_CONFIG) FORCE + $(call if_changed,gzip) + +targets += config_data_gz.h +$(obj)/config_data_gz.h: $(obj)/config_data.gz FORCE + $(call filechk,data_gz) + +targets += config_data_size.h +$(obj)/config_data_size.h: $(KCONFIG_CONFIG) FORCE + $(call filechk,data_size)
cmd/config.c new file +44 -0
44 lines not on this page · raw message
scripts/.gitignore +1 -0
@@ -1,4 +1,5 @@ # # Generated files # +bin2c docproc
scripts/Kconfig new file +2 -0
@@ -0,0 +1,2 @@ +config BUILD_BIN2C + bool
scripts/Makefile +4 -0
@@ -7,6 +7,10 @@ # SPDX-License-Identifier: GPL-2.0 # +hostprogs-$(CONFIG_BUILD_BIN2C) += bin2c + +always := $(hostprogs-y) + # The following hostprogs-y programs are only build on demand hostprogs-y += docproc
Signature · 1 line
2.7.4
PATCH v2 2/3 cmd: add a new command "config" to show .config contents
Hi Masahiro,
Quoted 28 lines · Masahiro Yamada
This feature is inspired by
/proc/config.gzof Linux. In Linux, ifCONFIG_IKCONFIGis enabled, the ".config" file contents are embedded in the kernel image. IfCONFIG_IKCONFIG_PROCis also enabled, the ".config" contents are exposed to/proc/config.gz. Users can do "zcat/proc/config.gz" to check which config options are enabled on the running kernel image.The idea is almost the same here; if
CONFIG_CMD_CONFIGis enabled, the ".config" contents are compressed and saved in the U-Boot image, then printed by the new command "config".The usage is quite simple. Enable
CONFIG_CMD_CONFIG, then runQuoted 1 line
config
from the command line interface. The ".config" contents will be printed on the console.
This feature increases the U-Boot image size by about 4KB (this is mostly due to the gzip-compressed .config file). By default, it is enabled only for Sandbox because we do not care about the memory footprint on it. Of course, this feature is architecture agnostic, so you can enable it on any board if the image size increase is acceptable for you.
Signed-off-by Masahiro Yamada <[email protected]>---
Changes in v2: None
Quoted 13 lines
Kconfig | 2 ++ Makefile | 12 +++++++----- cmd/.gitignore | 3 +++ cmd/Kconfig | 12 ++++++++++++ cmd/Makefile | 22 ++++++++++++++++++++++ cmd/config.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ scripts/.gitignore | 1 + scripts/Kconfig | 2 ++ scripts/Makefile | 4 ++++ 9 files changed, 97 insertions(+), 5 deletions(-) create mode 100644 cmd/.gitignore create mode 100644 cmd/config.c create mode 100644 scripts/Kconfig
But I wonder why we shouldn't use a mechanism like cmd_dt_S_dtb in Makefile.lib to embed the file?
Regards,
Simon
PATCH v2 2/3 cmd: add a new command "config" to show .config contents
Hi Simon,
2017-02-07 0:33 GMT+09:00 Simon Glass <[email protected]>:
Quoted 46 lines
Hi Masahiro,
Quoted 28 lines · Masahiro Yamada
This feature is inspired by
/proc/config.gzof Linux. In Linux, ifCONFIG_IKCONFIGis enabled, the ".config" file contents are embedded in the kernel image. IfCONFIG_IKCONFIG_PROCis also enabled, the ".config" contents are exposed to/proc/config.gz. Users can do "zcat/proc/config.gz" to check which config options are enabled on the running kernel image.The idea is almost the same here; if
CONFIG_CMD_CONFIGis enabled, the ".config" contents are compressed and saved in the U-Boot image, then printed by the new command "config".The usage is quite simple. Enable
CONFIG_CMD_CONFIG, then runQuoted 1 line
config
from the command line interface. The ".config" contents will be printed on the console.
This feature increases the U-Boot image size by about 4KB (this is mostly due to the gzip-compressed .config file). By default, it is enabled only for Sandbox because we do not care about the memory footprint on it. Of course, this feature is architecture agnostic, so you can enable it on any board if the image size increase is acceptable for you.
Signed-off-by Masahiro Yamada <[email protected]>---
Changes in v2: None
Quoted 13 lines
Kconfig | 2 ++ Makefile | 12 +++++++----- cmd/.gitignore | 3 +++ cmd/Kconfig | 12 ++++++++++++ cmd/Makefile | 22 ++++++++++++++++++++++ cmd/config.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ scripts/.gitignore | 1 + scripts/Kconfig | 2 ++ scripts/Makefile | 4 ++++ 9 files changed, 97 insertions(+), 5 deletions(-) create mode 100644 cmd/.gitignore create mode 100644 cmd/config.c create mode 100644 scripts/Kconfig
Quoted 4 lines
Reviewed-by Simon Glass <[email protected]>But I wonder why we shouldn't use a mechanism like
cmd_dt_S_dtbin Makefile.lib to embed the file?
I thought of this when I saw the implementation of kernel/configs.c of Linux.
My first guess was, they wanted to implement it in an arch-independent way.
The cmd_dt_S_dtb mechanism also seems (mostly) arch-independent, but I am not 100% sure.
For example, underscore must the added/stripped
for conversion between C and assembly for Blackfin architecture.
One more reason is, I think, kernel/configs.c was added in older days than the Device Tree.
Signature · 2 lines
Best Regards Masahiro Yamada
PATCH v2 2/3 cmd: add a new command "config" to show .config contents
In reply to Masahiro YamadaQuoted 23 lines · Masahiro Yamada
This feature is inspired by
/proc/config.gzof Linux. In Linux, ifCONFIG_IKCONFIGis enabled, the ".config" file contents are embedded in the kernel image. IfCONFIG_IKCONFIG_PROCis also enabled, the ".config" contents are exposed to/proc/config.gz. Users can do "zcat/proc/config.gz" to check which config options are enabled on the running kernel image.The idea is almost the same here; if
CONFIG_CMD_CONFIGis enabled, the ".config" contents are compressed and saved in the U-Boot image, then printed by the new command "config".The usage is quite simple. Enable
CONFIG_CMD_CONFIG, then runQuoted 1 line
config
from the command line interface. The ".config" contents will be printed on the console.
This feature increases the U-Boot image size by about 4KB (this is mostly due to the gzip-compressed .config file). By default, it is enabled only for Sandbox because we do not care about the memory footprint on it. Of course, this feature is architecture agnostic, so you can enable it on any board if the image size increase is acceptable for you.
Quoted 2 lines
Signed-off-by Masahiro Yamada <[email protected]>Reviewed-by Simon Glass <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 819 bytes Desc: Digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20170208/9084c70c/attachment.sig>
PATCH v2 3/3 cmd: rework "license" command
In reply to Masahiro YamadaThe 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.
---
Changes in v2: None
Makefile | 2 +- cmd/.gitignore | 3 +++ cmd/Kconfig | 1 + cmd/Makefile | 15 +++++++++++++++ cmd/license.c | 31 ++++++++++++++++++------------- include/.gitignore | 1 - tools/Makefile | 11 +---------- tools/bin2header.c | 41 ----------------------------------------- 8 files changed, 39 insertions(+), 66 deletions(-) delete mode 100644 tools/bin2header.c
Makefile +1 -1
@@ -1423,7 +1423,7 @@ CLEAN_DIRS += $(MODVERDIR) \ $(foreach d, spl tpl, $(patsubst %,$d/%, \ $(filter-out include, $(shell ls -1 $d 2>/dev/null)))) -CLEAN_FILES += include/bmp_logo.h include/bmp_logo_data.h include/license.h \ +CLEAN_FILES += include/bmp_logo.h include/bmp_logo_data.h \ boot* u-boot* MLO* SPL System.map # Directories & files removed with 'make mrproper'
cmd/.gitignore +3 -0
@@ -1,3 +1,6 @@ config_data.gz config_data_gz.h config_data_size.h +license_data.gz +license_data_gz.h +license_data_size.h
cmd/Kconfig +1 -0
@@ -154,6 +154,7 @@ config CMD_CPU config CMD_LICENSE bool "license" + select BUILD_BIN2C help Print GPL license text
cmd/Makefile +15 -0
@@ -187,3 +187,18 @@ $(obj)/config_data_gz.h: $(obj)/config_data.gz FORCE targets += config_data_size.h $(obj)/config_data_size.h: $(KCONFIG_CONFIG) FORCE $(call filechk,data_size) + +# "license" command +$(obj)/license.o: $(obj)/license_data_gz.h $(obj)/license_data_size.h + +targets += license_data.gz +$(obj)/license_data.gz: $(srctree)/Licenses/gpl-2.0.txt FORCE + $(call if_changed,gzip) + +targets += license_data_gz.h +$(obj)/license_data_gz.h: $(obj)/license_data.gz FORCE + $(call filechk,data_gz) + +targets += license_data_size.h +$(obj)/license_data_size.h: $(srctree)/Licenses/gpl-2.0.txt FORCE + $(call filechk,data_size)
cmd/license.c +18 -13
@@ -6,31 +6,36 @@*/ #include <common.h> - -/* Licenses/gpl-2.0.txt is currently 18092 bytes in size */ -#define LICENSE_MAX 20480 -#include <command.h> #include <malloc.h> -#include <license.h> -int do_license (cmd_tbl_t *cmdtp,int flag,int argc,char *const argv[]) +#include "license_data_gz.h" +#include "license_data_size.h" + +static int do_license (cmd_tbl_t *cmdtp,int flag,int argc,char *const argv[]) { -char *dst =malloc (LICENSE_MAX ); -unsigned long len =LICENSE_MAX ; +char *dst; +unsigned long len = data_size; +int ret =CMD_RET_SUCCESS ; + dst =malloc (data_size +1 );if (!dst) -return -1 ; +return CMD_RET_FAILURE ; -if (gunzip (dst,LICENSE_MAX , license_gzip, &len) !=0 ) { + ret =gunzip (dst, data_size, (unsigned char *)data_gz, &len); +if (ret) {printf ("Error uncompressing license text\n" ); -free (dst); -return -1 ; + ret =CMD_RET_FAILURE ; + goto free; } + + dst[data_size] =0 ;puts (dst); + +free:free (dst); -return 0 ; +return ret; } U_BOOT_CMD(
include/.gitignore +0 -1
@@ -2,4 +2,3 @@ /bmp_logo.h /bmp_logo_data.h /config.h -/license.h
tools/Makefile +1 -10
@@ -32,7 +32,6 @@ CONFIG_BUILD_ENVCRC ?= $(ENVCRC-y) hostprogs-$(CONFIG_SPL_GENERATE_ATMEL_PMECC_HEADER) += atmel_pmecc_params -hostprogs-$(CONFIG_CMD_LICENSE) += bin2header hostprogs-$(CONFIG_LCD_LOGO) += bmp_logo hostprogs-$(CONFIG_VIDEO_LOGO) += bmp_logo HOSTCFLAGS_bmp_logo.o := -pedantic
@@ -229,10 +228,6 @@ endif endif # !LOGO_BMP -# Generated gziped GPL-2.0 license text -LICENSE_H = $(objtree)/include/license.h -LICENSE-$(CONFIG_CMD_LICENSE) += $(LICENSE_H) - # # Use native tools and options # Define __KERNEL_STRICT_NAMES to prevent typedef overlaps
@@ -247,7 +242,7 @@ HOST_EXTRACFLAGS += -include $(srctree)/include/libfdt_env.h \ -D__KERNEL_STRICT_NAMES \ -D_GNU_SOURCE -__build: $(LOGO-y) $(LICENSE-y) +__build: $(LOGO-y) $(LOGO_H): $(obj)/bmp_logo $(LOGO_BMP) $(obj)/bmp_logo --gen-info $(LOGO_BMP) > $@
@@ -255,10 +250,6 @@ $(LOGO_H): $(obj)/bmp_logo $(LOGO_BMP) $(LOGO_DATA_H): $(obj)/bmp_logo $(LOGO_BMP) $(obj)/bmp_logo --gen-data $(LOGO_BMP) > $@ -$(LICENSE_H): $(obj)/bin2header $(srctree)/Licenses/gpl-2.0.txt - cat $(srctree)/Licenses/gpl-2.0.txt | gzip -9 -c | \ - $(obj)/bin2header license_gzip > $(LICENSE_H) - # Let clean descend into subdirs subdir- += env
tools/bin2header.c deleted +0 -41
41 lines not on this page · raw message
Signature · 1 line
2.7.4
PATCH v2 3/3 cmd: rework "license" command
Quoted 44 lines · Masahiro Yamada
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
Kbuildstyle logGZIP 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.hinstead of the bare Make log:
cat
./Licenses/gpl-2.0.txt| gzip -9 -c | \
tools/bin2headerlicense_gzip>./include/license.h[2] Collect related code into the "cmd" directory
Prior to this commit, the
license.hwas created bytools/Makefile, placed under the "include" directory, included fromcmd/license.c, and deleted by the top-levelMakefile. It is not a good idea to scatter related code.[3] Drop the fixed-malloc size
LICENSE_MAXJust 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" todo_license.Signed-off-by Masahiro Yamada <[email protected]>---
Changes in v2: None
Quoted 10 lines
Makefile | 2 +- cmd/.gitignore | 3 +++ cmd/Kconfig | 1 + cmd/Makefile | 15 +++++++++++++++ cmd/license.c | 31 ++++++++++++++++++------------- include/.gitignore | 1 - tools/Makefile | 11 +---------- tools/bin2header.c | 41 ----------------------------------------- 8 files changed, 39 insertions(+), 66 deletions(-) delete mode 100644 tools/bin2header.c
It also drops bin2header.c
PATCH v2 3/3 cmd: rework "license" command
In reply to Masahiro YamadaQuoted 34 lines · Masahiro Yamada
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
Kbuildstyle logGZIP 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.hinstead of the bare Make log:
cat
./Licenses/gpl-2.0.txt| gzip -9 -c | \
tools/bin2headerlicense_gzip>./include/license.h[2] Collect related code into the "cmd" directory
Prior to this commit, the
license.hwas created bytools/Makefile, placed under the "include" directory, included fromcmd/license.c, and deleted by the top-levelMakefile. It is not a good idea to scatter related code.[3] Drop the fixed-malloc size
LICENSE_MAXJust allocate the minimum required size of buffer because we know the size of the original gpl-2.0.txt.
Quoted 7 lines
[4] Fix more issues
Terminate the buffer with zero to prevent
puts()from over-running. Add "static" todo_license.Signed-off-by Masahiro Yamada <[email protected]>Reviewed-by Simon Glass <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 819 bytes Desc: Digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20170208/1aea0f64/attachment-0001.sig>