diff options
| author | Tom Rini <trini@konsulko.com> | 2019-10-04 12:22:43 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-10-04 12:22:43 -0400 |
| commit | 62861c70d3128680823fa091dcc2f6fee3bca30c (patch) | |
| tree | 1effa13c5319dcb55f5167d707d1662c0de9503b /include/initcall.h | |
| parent | 2baa731d0076b9aff721a2c737c479f65cc931e9 (diff) | |
| parent | d90fc9c3deb6a9941a9cd0ba764e9c74e5060186 (diff) | |
Merge branch '2019-10-04-master-imports'
- Assorted TI platform fixes
- Revert the change that broke environment flag validation
- Assorted typo fixes
- Assorted Kconfig dependency fixes
- Other minor bug fixes
Diffstat (limited to 'include/initcall.h')
| -rw-r--r-- | include/initcall.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/include/initcall.h b/include/initcall.h index 78d15afe69b..b5acdd01bdb 100644 --- a/include/initcall.h +++ b/include/initcall.h @@ -30,11 +30,13 @@ static inline int initcall_run_list(const init_fnc_t init_sequence[]) #ifdef CONFIG_EFI_APP reloc_ofs = (unsigned long)image_base; #endif - debug("initcall: %p", (char *)*init_fnc_ptr - reloc_ofs); if (reloc_ofs) - debug(" (relocated to %p)\n", (char *)*init_fnc_ptr); + debug("initcall: %p (relocated to %p)\n", + (char *)*init_fnc_ptr - reloc_ofs, + (char *)*init_fnc_ptr); else - debug("\n"); + debug("initcall: %p\n", (char *)*init_fnc_ptr - reloc_ofs); + ret = (*init_fnc_ptr)(); if (ret) { printf("initcall sequence %p failed at call %p (err=%d)\n", |