diff options
| author | Tom Rini <trini@konsulko.com> | 2017-05-26 15:18:53 (GMT) |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-05-26 15:18:53 (GMT) |
| commit | 8dc1b17f14c9201c7d0da0f33e404a7e051b2ec6 (patch) | |
| tree | b4566d2d99140d4180efc2ca9f32b2ddf3e310a8 /board | |
| parent | be62fbf376261ab3a4ed5db3bf54d5df9e216d9f (diff) | |
| parent | be71a179bdd935336fb0bee8283be729144ac965 (diff) | |
| download | u-boot-fsl-qoriq-8dc1b17f14c9201c7d0da0f33e404a7e051b2ec6.tar.xz | |
Merge branch 'master' of git://git.denx.de/u-boot-nds32
Move FTMAC100 to where it should be, alphabetically in
drivers/net/Kconfig
Signed-off-by: Tom Rini <trini@konsulko.com>
Conflicts:
drivers/net/Kconfig
Diffstat (limited to 'board')
| -rw-r--r-- | board/AndesTech/adp-ae3xx/adp-ae3xx.c | 4 | ||||
| -rw-r--r-- | board/AndesTech/adp-ag101p/adp-ag101p.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/board/AndesTech/adp-ae3xx/adp-ae3xx.c b/board/AndesTech/adp-ae3xx/adp-ae3xx.c index ab174fa..98ed4d9 100644 --- a/board/AndesTech/adp-ae3xx/adp-ae3xx.c +++ b/board/AndesTech/adp-ae3xx/adp-ae3xx.c @@ -7,7 +7,7 @@ */ #include <common.h> -#if defined(CONFIG_FTMAC100) +#if defined(CONFIG_FTMAC100) && !defined(CONFIG_DM_ETH) #include <netdev.h> #endif #include <linux/io.h> @@ -56,7 +56,7 @@ int dram_init_banksize(void) return 0; } -#if defined(CONFIG_FTMAC100) +#if defined(CONFIG_FTMAC100) && !defined(CONFIG_DM_ETH) int board_eth_init(bd_t *bd) { return ftmac100_initialize(bd); diff --git a/board/AndesTech/adp-ag101p/adp-ag101p.c b/board/AndesTech/adp-ag101p/adp-ag101p.c index 0fd6fb0..a462941 100644 --- a/board/AndesTech/adp-ag101p/adp-ag101p.c +++ b/board/AndesTech/adp-ag101p/adp-ag101p.c @@ -7,7 +7,7 @@ */ #include <common.h> -#if defined(CONFIG_FTMAC100) +#if defined(CONFIG_FTMAC100) && !defined(CONFIG_DM_ETH) #include <netdev.h> #endif #include <linux/io.h> @@ -62,7 +62,7 @@ int dram_init_banksize(void) return 0; } -#if defined(CONFIG_FTMAC100) +#if defined(CONFIG_FTMAC100) && !defined(CONFIG_DM_ETH) int board_eth_init(bd_t *bd) { return ftmac100_initialize(bd); |