Am 21.05.2018 um 17:04 schrieb Sam Ravnborg: > On Mon, May 21, 2018 at 02:54:32PM +0300, Peter Mamonov wrote: >> Signed-off-by: Peter Mamonov <pmamonov@xxxxxxxxx> >> --- >> include/common.h | 4 ++++ >> 1 file changed, 4 insertions(+) >> >> diff --git a/include/common.h b/include/common.h >> index 60e5005b8..4b3bcae40 100644 >> --- a/include/common.h >> +++ b/include/common.h >> @@ -142,7 +142,11 @@ void barebox_set_hostname_no_overwrite(const char *); >> #if defined(CONFIG_MIPS) >> #include <asm/addrspace.h> >> >> +#ifdef CONFIG_64BIT >> +#define IOMEM(addr) ((void __force __iomem *)PHYS_TO_XKSEG_UNCACHED(addr)) >> +#else >> #define IOMEM(addr) ((void __force __iomem *)CKSEG1ADDR(addr)) >> +#endif >> #else >> #define IOMEM(addr) ((void __force __iomem *)(addr)) >> #endif > > Another way to handle this would be to move the definition of IOMEM to asm/common.h > and then in this file define IOMEM only if not already defined. > > Then we could avoid this MIPS specific stuff in the middle of a common file. I would prefer arch/mips/include/asm/io.h for example in kernel we have: arch/arm/include/asm/io.h:165:#define IOMEM(x) arch/hexagon/include/asm/io.h:38:#define IOMEM(x) -- Regards, Oleksij
Attachment:
signature.asc
Description: OpenPGP digital signature
_______________________________________________ barebox mailing list barebox@xxxxxxxxxxxxxxxxxxx http://lists.infradead.org/mailman/listinfo/barebox
