| Message ID | 20180503110036.15364-1-judge.packham@gmail.com |
|---|---|
| State | Accepted |
| Commit | edcf7eacbd733fdb1c9bbf6edf8db7f536171932 |
| Delegated to: | Tom Rini |
| Headers | show |
| Series | [U-Boot,1/2] net: mvgbe: remove CONFIG_DOVE | expand |
On 03.05.2018 13:00, Chris Packham wrote: > Nothing defines CONFIG_DOVE so remove the code that uses it. > > Signed-off-by: Chris Packham <judge.packham@gmail.com> Reviewed-by: Stefan Roese <sr@denx.de> Thanks, Stefan
On Thu, May 3, 2018 at 6:00 AM, Chris Packham <judge.packham@gmail.com> wrote: > Nothing defines CONFIG_DOVE so remove the code that uses it. > > Signed-off-by: Chris Packham <judge.packham@gmail.com> Acked-by: Joe Hershberger <joe.hershberger@ni.com>
On Thu, May 03, 2018 at 11:00:34PM +1200, Chris Packham wrote: > Nothing defines CONFIG_DOVE so remove the code that uses it. > > Signed-off-by: Chris Packham <judge.packham@gmail.com> > Reviewed-by: Stefan Roese <sr@denx.de> > Acked-by: Joe Hershberger <joe.hershberger@ni.com> Applied to u-boot/master, thanks!
diff --git a/drivers/net/mvgbe.c b/drivers/net/mvgbe.c index f833efbe6779..47148e526008 100644 --- a/drivers/net/mvgbe.c +++ b/drivers/net/mvgbe.c @@ -27,8 +27,6 @@ #include <asm/arch/soc.h> #elif defined(CONFIG_ORION5X) #include <asm/arch/orion5x.h> -#elif defined(CONFIG_DOVE) -#include <asm/arch/dove.h> #endif #include "mvgbe.h" diff --git a/drivers/net/mvgbe.h b/drivers/net/mvgbe.h index 27a3f41e80cd..7a42d70831ed 100644 --- a/drivers/net/mvgbe.h +++ b/drivers/net/mvgbe.h @@ -292,17 +292,10 @@ #define EBAR_TARGET_GUNIT 0x00000007 /* Window attrib */ -#if defined(CONFIG_DOVE) -#define EBAR_DRAM_CS0 0x00000000 -#define EBAR_DRAM_CS1 0x00000000 -#define EBAR_DRAM_CS2 0x00000000 -#define EBAR_DRAM_CS3 0x00000000 -#else #define EBAR_DRAM_CS0 0x00000E00 #define EBAR_DRAM_CS1 0x00000D00 #define EBAR_DRAM_CS2 0x00000B00 #define EBAR_DRAM_CS3 0x00000700 -#endif /* DRAM Target interface */ #define EBAR_DRAM_NO_CACHE_COHERENCY 0x00000000
Nothing defines CONFIG_DOVE so remove the code that uses it. Signed-off-by: Chris Packham <judge.packham@gmail.com> --- drivers/net/mvgbe.c | 2 -- drivers/net/mvgbe.h | 7 ------- 2 files changed, 9 deletions(-)