diff options
| author | Tom Rini <trini@konsulko.com> | 2022-08-10 17:49:20 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2022-08-10 17:49:20 -0400 |
| commit | cdebee1fd9fa04cc4c972f826bae19b28c253eb0 (patch) | |
| tree | 97a13d6a54ea8cb825d19cd65d4c9480ffd327dc /lib | |
| parent | 3dd4e916324efc825a7ee8e412f5cf1ded839021 (diff) | |
| parent | 468091a4602f78aaa11d41190ae66d8b240e144a (diff) | |
Merge branch '2022-08-10-assorted-updates'
- An assortment of bugfixes and minor updates
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/aes.c | 1 | ||||
| -rw-r--r-- | lib/display_options.c | 1 | ||||
| -rw-r--r-- | lib/fdtdec.c | 1 | ||||
| -rw-r--r-- | lib/lmb.c | 2 | ||||
| -rw-r--r-- | lib/lz4_wrapper.c | 2 |
5 files changed, 5 insertions, 2 deletions
diff --git a/lib/aes.c b/lib/aes.c index 05ec2357024..4fca85ebee2 100644 --- a/lib/aes.c +++ b/lib/aes.c @@ -23,6 +23,7 @@ #ifndef USE_HOSTCC #include <common.h> +#include <display_options.h> #include <log.h> #else #include <string.h> diff --git a/lib/display_options.c b/lib/display_options.c index 360b01bcf5f..7feb446a559 100644 --- a/lib/display_options.c +++ b/lib/display_options.c @@ -7,6 +7,7 @@ #include <common.h> #include <compiler.h> #include <console.h> +#include <display_options.h> #include <div64.h> #include <version_string.h> #include <linux/ctype.h> diff --git a/lib/fdtdec.c b/lib/fdtdec.c index ffa78f97ca0..96b6b71a606 100644 --- a/lib/fdtdec.c +++ b/lib/fdtdec.c @@ -6,6 +6,7 @@ #ifndef USE_HOSTCC #include <common.h> #include <boot_fit.h> +#include <display_options.h> #include <dm.h> #include <hang.h> #include <init.h> diff --git a/lib/lmb.c b/lib/lmb.c index f21fe672ae9..c599608fa38 100644 --- a/lib/lmb.c +++ b/lib/lmb.c @@ -108,7 +108,7 @@ void lmb_init(struct lmb *lmb) #if IS_ENABLED(CONFIG_LMB_USE_MAX_REGIONS) lmb->memory.max = CONFIG_LMB_MAX_REGIONS; lmb->reserved.max = CONFIG_LMB_MAX_REGIONS; -#elif IS_ENABLED(CONFIG_LMB_MEMORY_REGIONS) +#elif defined(CONFIG_LMB_MEMORY_REGIONS) lmb->memory.max = CONFIG_LMB_MEMORY_REGIONS; lmb->reserved.max = CONFIG_LMB_RESERVED_REGIONS; lmb->memory.region = lmb->memory_regions; diff --git a/lib/lz4_wrapper.c b/lib/lz4_wrapper.c index 0d2a3655a8a..67dea2ff390 100644 --- a/lib/lz4_wrapper.c +++ b/lib/lz4_wrapper.c @@ -80,7 +80,7 @@ int ulz4fn(const void *src, size_t srcn, void *dst, size_t *dstn) } if (block_header & LZ4F_BLOCKUNCOMPRESSED_FLAG) { - size_t size = min((ptrdiff_t)block_size, end - out); + size_t size = min((ptrdiff_t)block_size, (ptrdiff_t)(end - out)); memcpy(out, in, size); out += size; if (size < block_size) { |