diff options
| author | Simon Glass | 2019-12-28 10:44:45 -0700 |
|---|---|---|
| committer | Jagan Teki | 2020-01-24 23:06:48 +0530 |
| commit | 532f90235aa8824037b13bc559723b55620370fe (patch) | |
| tree | 88c27be629bd8a86f744215968e21620a3323f0a /include | |
| parent | 65de5394640e300642de5121b2d9e5087d4783dd (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 34ef346400c..82228e20507 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 a5a2c79a90d..f6105de6660 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 */ |