diff options
| author | Patrick Delaunay <patrick.delaunay@st.com> | 2018-03-13 13:57:02 +0100 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-03-16 14:56:59 -0400 |
| commit | e2c219cd7103761826f4ca99c905f547ade34c97 (patch) | |
| tree | 824e5688cf5cbad2c59cc5c420025bb807a7a8b0 | |
| parent | 11f86cbaff517da4561ab2ed05354671be6ef7a1 (diff) | |
| download | u-boot-e2c219cd7103761826f4ca99c905f547ade34c97.tar.gz | |
common: move board_r.c prototypes in init.h
Move function prototypes used in common/board_r.c
from common.h to init.h
Signed-off-by: Patrick Delaunay <patrick.delaunay@st.com>
| -rw-r--r-- | include/common.h | 19 | ||||
| -rw-r--r-- | include/init.h | 14 |
2 files changed, 17 insertions, 16 deletions
diff --git a/include/common.h b/include/common.h index 0f77c8c282..6e7110c3f8 100644 --- a/include/common.h +++ b/include/common.h @@ -65,6 +65,7 @@ typedef void (interrupt_handler_t)(void *); /* startup functions, used in: * common/board_f.c * common/init/board_init.c + * common/board_r.c */ #include <init.h> @@ -95,19 +96,13 @@ int run_command_repeatable(const char *cmd, int flag); */ int run_command_list(const char *cmd, int len, int flag); -/* arch/$(ARCH)/lib/board.c */ -void board_init_r(gd_t *, ulong) __attribute__ ((noreturn)); - int checkboard(void); int show_board_info(void); -int last_stage_init(void); -int mac_read_from_eeprom(void); +int checkflash(void); +int checkdram(void); extern u8 __dtb_dt_begin[]; /* embedded device tree blob */ extern u8 __dtb_dt_spl_begin[]; /* embedded device tree blob for SPL/TPL */ -int set_cpu_clk_info(void); int mdm_init(void); -int update_flash_size(int flash_size); -int arch_early_init_r(void); /** * Show the DRAM size in a board-specific way @@ -254,14 +249,8 @@ int env_complete(char *var, int maxv, char *cmdv[], int maxsz, char *buf); #endif int get_env_id (void); -void pci_init (void); void pci_init_board(void); -int misc_init_r (void); -#if defined(CONFIG_VID) -int init_func_vid(void); -#endif - /* common/exports.c */ void jumptable_init(void); @@ -386,8 +375,6 @@ int get_clocks (void); ulong get_bus_freq (ulong); int get_serial_clock(void); -int cpu_init_r (void); - /* $(CPU)/interrupts.c */ int interrupt_init (void); void timer_interrupt (struct pt_regs *); diff --git a/include/init.h b/include/init.h index f952602b2f..89e48f2689 100644 --- a/include/init.h +++ b/include/init.h @@ -149,6 +149,20 @@ void board_init_f_init_reserve(ulong base); void arch_setup_gd(gd_t *gd_ptr); /* common/board_r.c */ +void board_init_r(gd_t *id, ulong dest_addr) __attribute__ ((noreturn)); + +int cpu_init_r(void); +int last_stage_init(void); +int mac_read_from_eeprom(void); +int set_cpu_clk_info(void); +int update_flash_size(int flash_size); +int arch_early_init_r(void); +void pci_init(void); +int misc_init_r(void); +#if defined(CONFIG_VID) +int init_func_vid(void); +#endif + #endif /* __ASSEMBLY__ */ /* Put only stuff here that the assembler can digest */ |