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>

diff --git a/include/common.h b/include/common.h
index 0f77c8c282990141c771f2b42b6b69b12b277892..6e7110c3f8d689add07fe1a7a364f7b0be458660 100644 (file)
--- 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 f952602b2fb3820b8e41e726ac05c6bc933bf93b..89e48f2689a05e042aae0bc6a09493f21214c2b4 100644 (file)
--- 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 */