Signed-off-by: Peter Mamonov <pmamonov@xxxxxxxxx> --- arch/mips/include/asm/io.h | 2 ++ include/common.h | 7 ++----- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/arch/mips/include/asm/io.h b/arch/mips/include/asm/io.h index 5a4cbf564..ee6151693 100644 --- a/arch/mips/include/asm/io.h +++ b/arch/mips/include/asm/io.h @@ -106,6 +106,8 @@ static inline void __raw_writel(u32 b, volatile void __iomem *addr) #define out_be16(a, v) __raw_writew(__cpu_to_be16(v), a) #define out_be32(a, v) __raw_writel(__cpu_to_be32(v), a) +#define IOMEM(addr) ((void __force __iomem *)CKSEG1ADDR(addr)) + #include <asm-generic/io.h> #endif /* __ASM_MIPS_IO_H */ diff --git a/include/common.h b/include/common.h index 60e5005b8..f93bd7f5d 100644 --- a/include/common.h +++ b/include/common.h @@ -30,6 +30,7 @@ #include <linux/kernel.h> #include <linux/stddef.h> #include <asm/common.h> +#include <asm/io.h> #include <printk.h> /* @@ -139,11 +140,7 @@ const char *barebox_get_hostname(void); void barebox_set_hostname(const char *); void barebox_set_hostname_no_overwrite(const char *); -#if defined(CONFIG_MIPS) -#include <asm/addrspace.h> - -#define IOMEM(addr) ((void __force __iomem *)CKSEG1ADDR(addr)) -#else +#ifndef IOMEM #define IOMEM(addr) ((void __force __iomem *)(addr)) #endif -- 2.17.0 _______________________________________________ barebox mailing list barebox@xxxxxxxxxxxxxxxxxxx http://lists.infradead.org/mailman/listinfo/barebox
