diff options
| author | Tom Rini <trini@konsulko.com> | 2023-01-10 19:19:45 +0300 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2023-01-20 20:27:24 +0300 |
| commit | 6e7df1d151a7a127caf3b62ff6dfc003fc2aefcd (patch) | |
| tree | ae38e9dcf468b2e4e58293561fae87895d9b549f /lib | |
| parent | ad242344681f6a0076a6bf100aa83ac9ecbea355 (diff) | |
| download | u-boot-6e7df1d151a7a127caf3b62ff6dfc003fc2aefcd.tar.xz | |
global: Finish CONFIG -> CFG migration
At this point, the remaining places where we have a symbol that is
defined as CONFIG_... are in fairly odd locations. While as much dead
code has been removed as possible, some of these locations are simply
less obvious at first. In other cases, this code is used, but was
defined in such a way as to have been missed by earlier checks. Perform
a rename of all such remaining symbols to be CFG_... rather than
CONFIG_...
Signed-off-by: Tom Rini <trini@konsulko.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
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); |