diff options
| author | Tom Rini <trini@konsulko.com> | 2019-05-03 07:30:55 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-05-03 07:30:55 -0400 |
| commit | b362fe0848df60569bdb867b7627151747eb6e23 (patch) | |
| tree | 0c520eed4b77f93e2f1ad872db8445ca0e859ead /lib | |
| parent | 6e25cfe9a475e8177bad7d9f97cffead6aab6b0d (diff) | |
| parent | cd22e34c11e7211c54d31f854672fa26185990a5 (diff) | |
| download | u-boot-b362fe0848df60569bdb867b7627151747eb6e23.tar.gz u-boot-b362fe0848df60569bdb867b7627151747eb6e23.tar.xz u-boot-b362fe0848df60569bdb867b7627151747eb6e23.zip | |
Merge branch '2019-05-03-master-imports'
- Various btrfs fixes
- Various TI platform fixes
- Other fixes (cross build, taurus update, Kconfig help text)
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Kconfig | 2 | ||||
| -rw-r--r-- | lib/vsprintf.c | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/lib/Kconfig b/lib/Kconfig index 05f82d4a50..38012506d2 100644 --- a/lib/Kconfig +++ b/lib/Kconfig @@ -359,7 +359,7 @@ config LZO This enables support for LZO compression algorithm.r config GZIP - bool "Enable gzip decompression support for SPL build" + bool "Enable gzip decompression support" select ZLIB default y help diff --git a/lib/vsprintf.c b/lib/vsprintf.c index 2403825dc9..3502b8088f 100644 --- a/lib/vsprintf.c +++ b/lib/vsprintf.c @@ -16,7 +16,6 @@ #include <efi_loader.h> #include <div64.h> #include <hexdump.h> -#include <uuid.h> #include <stdarg.h> #include <linux/ctype.h> #include <linux/err.h> |