| Message ID | 20170517142311.29484-29-sjg@chromium.org |
|---|---|
| State | Accepted |
| Commit | b885d02e2c3ebb05c723519d8f566cb409d223df |
| Delegated to: | Tom Rini |
| Headers | show |
On Wed, May 17, 2017 at 08:23:01AM -0600, Simon Glass wrote: > With a small tweak we can avoid including these files for all boards. > > Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Tom Rini <trini@konsulko.com>
On Wed, May 17, 2017 at 08:23:01AM -0600, Simon Glass wrote: > With a small tweak we can avoid including these files for all boards. > > Signed-off-by: Simon Glass <sjg@chromium.org> > Reviewed-by: Tom Rini <trini@konsulko.com> Applied to u-boot/master, thanks!
diff --git a/common/board_f.c b/common/board_f.c index a212f2b539..fe90faf309 100644 --- a/common/board_f.c +++ b/common/board_f.c @@ -31,6 +31,9 @@ #include <trace.h> #include <video.h> #include <watchdog.h> +#ifdef CONFIG_MACH_TYPE +#include <asm/mach-types.h> +#endif #if defined(CONFIG_MP) && defined(CONFIG_PPC) #include <asm/mp.h> #endif diff --git a/include/common.h b/include/common.h index c5cb65beda..3004c22b72 100644 --- a/include/common.h +++ b/include/common.h @@ -425,12 +425,6 @@ static inline int setenv_addr(const char *varname, const void *addr) return setenv_hex(varname, (ulong)addr); } -#ifdef CONFIG_ARM -# include <asm/mach-types.h> -# include <asm/setup.h> -# include <asm/u-boot.h> -#endif /* CONFIG_ARM */ - #ifdef CONFIG_AUTO_COMPLETE int env_complete(char *var, int maxv, char *cmdv[], int maxsz, char *buf); #endif
With a small tweak we can avoid including these files for all boards. Signed-off-by: Simon Glass <sjg@chromium.org> --- common/board_f.c | 3 +++ include/common.h | 6 ------ 2 files changed, 3 insertions(+), 6 deletions(-)