diff options
| author | Tom Rini <[email protected]> | 2023-10-11 11:53:58 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2023-10-11 13:22:32 -0400 |
| commit | 9598cf43f946fdbc8448db218965c00d64ce3d5e (patch) | |
| tree | 00230631fe97ec3effede778cc229d762c6e8778 /common | |
| parent | 5ae883c7160cf8b0604ec6d03798dd90fc81ee38 (diff) | |
| parent | 1a1d48e36a1b185884e82d72457f7a274e4d1857 (diff) | |
Merge branch '2023-10-11-assorted-fixes-and-updates'
- Assorted TI K3 updates, use ".dtso" for device tree overlays to match
general usage, mkimage fixes/improvements, assorted platform
updates/fixes, other assorted driver/platform fixes.
Diffstat (limited to 'common')
| -rw-r--r-- | common/Kconfig | 4 | ||||
| -rw-r--r-- | common/dlmalloc.c | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/common/Kconfig b/common/Kconfig index 5e79b542217..93c96f23b01 100644 --- a/common/Kconfig +++ b/common/Kconfig @@ -620,7 +620,7 @@ config EVENT_DYNAMIC bool help Enable this to support adding an event spy at runtime, without adding - it to the EVENT_SPY() linker list. This increases code size slightly + it to the EVENT_SPY*() linker list. This increases code size slightly but provides more flexibility for boards and subsystems that need it. config EVENT_DEBUG @@ -648,7 +648,7 @@ config SPL_EVENT_DYNAMIC depends on SPL_EVENT && EVENT_DYNAMIC help Enable this to support adding an event spy at runtime, without adding - it to the EVENT_SPY() linker list. This increases code size slightly + it to the EVENT_SPY*() linker list. This increases code size slightly but provides more flexibility for boards and subsystems that need it. endif # EVENT diff --git a/common/dlmalloc.c b/common/dlmalloc.c index 87a09d38fb3..de3f04225f4 100644 --- a/common/dlmalloc.c +++ b/common/dlmalloc.c @@ -8,14 +8,14 @@ * as file malloc-2.6.6.c. */ -#include <common.h> -#include <log.h> -#include <asm/global_data.h> - #if CONFIG_IS_ENABLED(UNIT_TEST) #define DEBUG #endif +#include <common.h> +#include <log.h> +#include <asm/global_data.h> + #include <malloc.h> #include <asm/io.h> #include <valgrind/memcheck.h> |