diff options
| author | Simon Glass <sjg@chromium.org> | 2019-12-28 10:44:45 -0700 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-01-17 13:26:49 -0500 |
| commit | 941338725d339c233379def75adeaa0977587a96 (patch) | |
| tree | bcc3b3f8296c954690fa5ff2cd4bdf9a69467abc /include | |
| parent | 1444998230824ac9e95c14073a00e99e59b78ed8 (diff) | |
common: Move relocate_code() to init.h
This is an init function so move it out of the common header. Avoid using
the typedef so that we don't have to include the global_data header file.
Also tidy up the function style in comments while we are here.
Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/common.h | 6 | ||||
| -rw-r--r-- | include/init.h | 10 |
2 files changed, 10 insertions, 6 deletions
diff --git a/include/common.h b/include/common.h index 34ef346400..82228e2050 100644 --- a/include/common.h +++ b/include/common.h @@ -102,12 +102,6 @@ void fdc_hw_init (void); int testdram(void); #endif /* CONFIG_SYS_DRAM_TEST */ -#if defined(CONFIG_ARM) -void relocate_code(ulong); -#else -void relocate_code(ulong, gd_t *, ulong) __attribute__ ((noreturn)); -#endif - void s_init(void); void upmconfig (unsigned int, unsigned int *, unsigned int); diff --git a/include/init.h b/include/init.h index a5a2c79a90..f6105de666 100644 --- a/include/init.h +++ b/include/init.h @@ -12,6 +12,8 @@ #include <linux/types.h> +struct global_data; + #ifndef __ASSEMBLY__ /* put C only stuff in this section */ /* @@ -228,6 +230,14 @@ void trap_init(unsigned long reloc_addr); */ void main_loop(void); +#if defined(CONFIG_ARM) +void relocate_code(ulong addr_moni); +#else +void relocate_code(ulong start_addr_sp, struct global_data *new_gd, + ulong relocaddr) + __attribute__ ((noreturn)); +#endif + #endif /* __ASSEMBLY__ */ /* Put only stuff here that the assembler can digest */ |