diff options
author | Tom Rini <trini@konsulko.com> | 2020-04-24 13:04:38 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2020-04-24 13:04:38 -0400 |
commit | 18b9c98024ec89e00a57707f07ff6ada06089d26 (patch) | |
tree | 60b4659a673d7a9dff309ee0d0b324c242a53cfc /common/dlmalloc.c | |
parent | b897306341024695d17296efc1f9d83d06368209 (diff) | |
parent | 08140dba0f539842d4836afb56fe43a33d8ba045 (diff) |
Merge branch '2020-04-24-master-imports'
- Assorted minor bugfixes.
- Resync fixdep with Linux v5.7-rc1
- Numerous changes to reduce SPL in various cases including when we have
read-only env support.
- Allow mkimage to align the header on FIT images to a specific size.
Diffstat (limited to 'common/dlmalloc.c')
-rw-r--r-- | common/dlmalloc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/common/dlmalloc.c b/common/dlmalloc.c index dade68faf74..db5ab55ed33 100644 --- a/common/dlmalloc.c +++ b/common/dlmalloc.c @@ -1,6 +1,6 @@ #include <common.h> -#if defined(CONFIG_UNIT_TEST) +#if CONFIG_IS_ENABLED(UNIT_TEST) #define DEBUG #endif |