common: Move main_loop() to init.h

Move this function out of common.h and into a better place.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Simon Goldschmidt <simon.k.r.goldschmidt@gmail.com>

diff --git a/common/board_r.c b/common/board_r.c
index e711de64b5b98fb64b3de63315cc6048ff6191a0..e7c25942965b780b917494b4ba161e68f994dc29 100644 (file)
--- a/common/board_r.c
+++ b/common/board_r.c
@@ -26,6 +26,7 @@
 #include <env_internal.h>
 #include <fdtdec.h>
 #include <ide.h>
+#include <init.h>
 #include <initcall.h>
 #if defined(CONFIG_CMD_KGDB)
 #include <kgdb.h>

diff --git a/common/main.c b/common/main.c
index a94df7ae042ffcb1dafd3e92581481127fc1973e..ec8994ad457b9393afec16a7514cd74186a6226a 100644 (file)
--- a/common/main.c
+++ b/common/main.c
@@ -12,6 +12,7 @@
 #include <command.h>
 #include <console.h>
 #include <env.h>
+#include <init.h>
 #include <version.h>
 
 /*

diff --git a/include/common.h b/include/common.h
index 8ac5fca9eeb79c44a61634a694b7173a538ff0b7..c35af99f02acfa820f9adbc52a462490c21d7618 100644 (file)
--- a/include/common.h
+++ b/include/common.h
@@ -63,9 +63,6 @@ void  hang            (void) __attribute__ ((noreturn));
 
 #include <display_options.h>
 
-/* common/main.c */
-void   main_loop       (void);
-
 int checkflash(void);
 int checkdram(void);
 extern u8 __dtb_dt_begin[];    /* embedded device tree blob */

diff --git a/include/init.h b/include/init.h
index 970a39a6a08f949616d81ec34a07ba5caee75e71..a5a2c79a90dc633cd06b51811dc2b435b41ff8be 100644 (file)
--- a/include/init.h
+++ b/include/init.h
@@ -221,6 +221,13 @@ void pci_init_board(void);
 
 void trap_init(unsigned long reloc_addr);
 
+/**
+ * main_loop() - Enter the main loop of U-Boot
+ *
+ * This normally runs the command line.
+ */
+void main_loop(void);
+
 #endif /* __ASSEMBLY__ */
 /* Put only stuff here that the assembler can digest */