diff options
| author | Tom Rini <trini@konsulko.com> | 2020-05-19 10:51:43 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-05-19 10:51:43 -0400 |
| commit | c2279d784e35fa25ee3a9fa28a74a1ba545f8c1e (patch) | |
| tree | 158fd30f3d06142f6a99cbae6ed8ccb0f3be567b /common/board_f.c | |
| parent | ed9a3aa6452f57af65eb74f73bd2a54c3a2f4b03 (diff) | |
| parent | cd93d625fd751d55c729c78b10f82109d56a5f1d (diff) | |
Merge branch '2020-05-18-reduce-size-of-common.h'
Bring in the latest round of Simon's changes to reduce what's in
<common.h> overall.
Diffstat (limited to 'common/board_f.c')
| -rw-r--r-- | common/board_f.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/common/board_f.c b/common/board_f.c index a5ead31ca7..01194eaa0e 100644 --- a/common/board_f.c +++ b/common/board_f.c @@ -11,6 +11,7 @@ #include <common.h> #include <bloblist.h> +#include <bootstage.h> #include <clock_legacy.h> #include <console.h> #include <cpu.h> @@ -25,6 +26,7 @@ #include <init.h> #include <initcall.h> #include <lcd.h> +#include <log.h> #include <malloc.h> #include <mapmem.h> #include <os.h> @@ -40,6 +42,7 @@ #include <trace.h> #include <video.h> #include <watchdog.h> +#include <asm/cache.h> #ifdef CONFIG_MACH_TYPE #include <asm/mach-types.h> #endif @@ -822,9 +825,9 @@ static int initf_dm(void) #if defined(CONFIG_DM) && CONFIG_VAL(SYS_MALLOC_F_LEN) int ret; - bootstage_start(BOOTSTATE_ID_ACCUM_DM_F, "dm_f"); + bootstage_start(BOOTSTAGE_ID_ACCUM_DM_F, "dm_f"); ret = dm_init_and_scan(true); - bootstage_accum(BOOTSTATE_ID_ACCUM_DM_F); + bootstage_accum(BOOTSTAGE_ID_ACCUM_DM_F); if (ret) return ret; #endif |