diff options
| author | Tom Rini <[email protected]> | 2020-05-25 11:56:57 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2020-05-25 11:56:57 -0400 |
| commit | 71f70cfcf4a79a58682596e6b7769fe6f8f0c4d1 (patch) | |
| tree | 19a90e91b62dec0f1098a8585e795e9480792898 /cmd | |
| parent | 9c5fef577494769e3ff07952a85f9b7125ef765b (diff) | |
| parent | efc0644802a2c9c1747539e017562aabde1f54ec (diff) | |
Merge branch '2020-05-25-misc-fixes'
- A few minor Kconfig migrations / corrections
- DFU doc fixes/improvements
- Bugfix for ARMv8, env userspace building, more NULL checks in generic
PHY code
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/Kconfig | 2 | ||||
| -rw-r--r-- | cmd/zip.c | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/cmd/Kconfig b/cmd/Kconfig index f9be1988f65..153864c5876 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -810,11 +810,13 @@ config CMD_UNLZ4 config CMD_UNZIP bool "unzip" default y if CMD_BOOTI + select GZIP help Uncompress a zip-compressed memory region. config CMD_ZIP bool "zip" + select GZIP_COMPRESSED help Compress a memory region with zlib deflate method. diff --git a/cmd/zip.c b/cmd/zip.c index b433f1889f9..8ad37684647 100644 --- a/cmd/zip.c +++ b/cmd/zip.c @@ -7,6 +7,7 @@ #include <common.h> #include <command.h> #include <env.h> +#include <gzip.h> static int do_zip(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) { |