| Message ID | 20171103133013.70104-2-chris.brandt@renesas.com |
|---|---|
| State | Accepted |
| Commit | 5ad565b0d1c10d6bdbf40c0264573e2044ab80fc |
| Delegated to: | Joe Hershberger |
| Headers | show |
| Series | net: update Ethernet for Renesas RZ/A1 | expand |
Hi, 2017-11-03 22:30 GMT+09:00 Chris Brandt <chris.brandt@renesas.com>: > The macros inl and outl maybe already be defined from file > arch/arm/include/asm/io.h so there may be no reason to define them. > And if you do try defined them here, you get a redefined complier warning. > > Signed-off-by: Chris Brandt <chris.brandt@renesas.com> Acked-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org> > --- > drivers/net/sh_eth.h | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/drivers/net/sh_eth.h b/drivers/net/sh_eth.h > index 3645f0eca7..2345c34368 100644 > --- a/drivers/net/sh_eth.h > +++ b/drivers/net/sh_eth.h > @@ -25,8 +25,10 @@ > #define ADDR_TO_PHY(addr) ((int)(addr) & ~0xe0000000) > #endif > #elif defined(CONFIG_ARM) > -#define inl readl > +#ifndef inl > +#define inl readl > #define outl writel > +#endif > #define ADDR_TO_PHY(addr) ((int)(addr)) > #define ADDR_TO_P2(addr) (addr) > #endif /* defined(CONFIG_SH) */ > -- > 2.14.1 > > > _______________________________________________ > U-Boot mailing list > U-Boot@lists.denx.de > https://lists.denx.de/listinfo/u-boot
On Fri, Nov 3, 2017 at 8:30 AM, Chris Brandt <chris.brandt@renesas.com> wrote: > The macros inl and outl maybe already be defined from file > arch/arm/include/asm/io.h so there may be no reason to define them. > And if you do try defined them here, you get a redefined complier warning. > > Signed-off-by: Chris Brandt <chris.brandt@renesas.com> Acked-by: Joe Hershberger <joe.hershberger@ni.com>
Hi Chris, https://patchwork.ozlabs.org/patch/833923/ was applied to http://git.denx.de/?p=u-boot/u-boot-net.git Thanks! -Joe
diff --git a/drivers/net/sh_eth.h b/drivers/net/sh_eth.h index 3645f0eca7..2345c34368 100644 --- a/drivers/net/sh_eth.h +++ b/drivers/net/sh_eth.h @@ -25,8 +25,10 @@ #define ADDR_TO_PHY(addr) ((int)(addr) & ~0xe0000000) #endif #elif defined(CONFIG_ARM) -#define inl readl +#ifndef inl +#define inl readl #define outl writel +#endif #define ADDR_TO_PHY(addr) ((int)(addr)) #define ADDR_TO_P2(addr) (addr) #endif /* defined(CONFIG_SH) */
The macros inl and outl maybe already be defined from file arch/arm/include/asm/io.h so there may be no reason to define them. And if you do try defined them here, you get a redefined complier warning. Signed-off-by: Chris Brandt <chris.brandt@renesas.com> --- drivers/net/sh_eth.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)