diff --git a/common/board_f.c b/common/board_f.c index a212f2b53921356f730c4bd28d8515b2182385b2..fe90faf309083efed2846d211040e0935e92ec60 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 c5cb65bedae46ef208ddbce95e682c89f97e727b..3004c22b7283672ec0102388f46c8eaef18f8ae4 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