diff options
author | Tom Rini <trini@konsulko.com> | 2023-01-20 22:21:38 +0300 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2023-01-20 22:21:38 +0300 |
commit | 0b9b01517f0b1398ec27dbb47faf3645b719e02c (patch) | |
tree | fac11441ba4056e75d3b59811da3b0a91d1cfcf5 /lib | |
parent | 8bd3c0a7e17ee17c771cabc0e548a1a436ac021d (diff) | |
parent | 6333acb961b6fcaa60c6e5b623d676b332481cfa (diff) | |
download | u-boot-0b9b01517f0b1398ec27dbb47faf3645b719e02c.tar.xz |
Merge branch '2023-01-20-finish-CONFIG-migration-work'
- Merge in the final batch of CONFIG to Kconfig/CFG migration work. This
includes a fix for a number of ns16550 or similar UARTs due to a
migration bug. We also pull in a revert for enabling CONFIG_VIDEO on
tools-only_defconfig.
Diffstat (limited to 'lib')
-rw-r--r-- | lib/gzip.c | 14 | ||||
-rw-r--r-- | lib/time.c | 6 |
2 files changed, 10 insertions, 10 deletions
diff --git a/lib/gzip.c b/lib/gzip.c index c6c0ec880c..2595b2d04b 100644 --- a/lib/gzip.c +++ b/lib/gzip.c @@ -14,8 +14,8 @@ #include <u-boot/zlib.h> #include "zlib/zutil.h" -#ifndef CONFIG_GZIP_COMPRESS_DEF_SZ -#define CONFIG_GZIP_COMPRESS_DEF_SZ 0x200 +#ifndef CFG_GZIP_COMPRESS_DEF_SZ +#define CFG_GZIP_COMPRESS_DEF_SZ 0x200 #endif #define ZALLOC_ALIGNMENT 16 @@ -75,17 +75,17 @@ int zzip(void *dst, unsigned long *lenp, unsigned char *src, } while (srclen > 0) { - comp_len = (srclen > CONFIG_GZIP_COMPRESS_DEF_SZ) ? - CONFIG_GZIP_COMPRESS_DEF_SZ : srclen; + comp_len = (srclen > CFG_GZIP_COMPRESS_DEF_SZ) ? + CFG_GZIP_COMPRESS_DEF_SZ : srclen; s.next_in = src; s.avail_in = comp_len; - flush = (srclen > CONFIG_GZIP_COMPRESS_DEF_SZ)? + flush = (srclen > CFG_GZIP_COMPRESS_DEF_SZ)? Z_NO_FLUSH : Z_FINISH; do { - left_len = (*lenp > CONFIG_GZIP_COMPRESS_DEF_SZ) ? - CONFIG_GZIP_COMPRESS_DEF_SZ : *lenp; + left_len = (*lenp > CFG_GZIP_COMPRESS_DEF_SZ) ? + CFG_GZIP_COMPRESS_DEF_SZ : *lenp; s.next_out = dst; s.avail_out = left_len; r = deflate(&s, flush); diff --git a/lib/time.c b/lib/time.c index 0c95d12f61..5252190af5 100644 --- a/lib/time.c +++ b/lib/time.c @@ -19,8 +19,8 @@ #include <asm/io.h> #include <linux/delay.h> -#ifndef CONFIG_WD_PERIOD -# define CONFIG_WD_PERIOD (10 * 1000 * 1000) /* 10 seconds default */ +#ifndef CFG_WD_PERIOD +# define CFG_WD_PERIOD (10 * 1000 * 1000) /* 10 seconds default */ #endif DECLARE_GLOBAL_DATA_PTR; @@ -199,7 +199,7 @@ void udelay(unsigned long usec) do { schedule(); - kv = usec > CONFIG_WD_PERIOD ? CONFIG_WD_PERIOD : usec; + kv = usec > CFG_WD_PERIOD ? CFG_WD_PERIOD : usec; __udelay(kv); usec -= kv; } while(usec); |