On Thu, Dec 12, 2019 at 1:48 AM Simon Glass <s...@chromium.org> wrote: > > Move this function out of common.h and into a better place. > > Signed-off-by: Simon Glass <s...@chromium.org>
Reviewed-by: Simon Goldschmidt <simon.k.r.goldschm...@gmail.com> > --- > > common/board_r.c | 1 + > common/main.c | 1 + > include/common.h | 3 --- > include/init.h | 7 +++++++ > 4 files changed, 9 insertions(+), 3 deletions(-) > > diff --git a/common/board_r.c b/common/board_r.c > index 5464172259..cda90bd385 100644 > --- a/common/board_r.c > +++ b/common/board_r.c > @@ -25,6 +25,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 a94df7ae04..ec8994ad45 100644 > --- 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 fecfa27747..f1a3d32547 100644 > --- a/include/common.h > +++ b/include/common.h > @@ -64,9 +64,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 8b65b2afe4..105afc6c3c 100644 > --- a/include/init.h > +++ b/include/init.h > @@ -210,6 +210,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 */ > > -- > 2.24.0.525.g8f36a354ae-goog >
