diff options
| author | Tom Rini <trini@konsulko.com> | 2016-08-15 16:38:39 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-08-15 16:38:39 -0400 |
| commit | 2ef98d33166e5c22a61eba29c20e236b72f1e8a2 (patch) | |
| tree | 288afa85ba7134787f5c7146b0d87aaeb07d9b78 /include/configs | |
| parent | b064c9124acddbcdc70843f62fda13a2d7d7a392 (diff) | |
| parent | cc2593128f7ad1b879e9e5bd3097f6c717cf4c9a (diff) | |
| download | u-boot-imx-2ef98d33166e5c22a61eba29c20e236b72f1e8a2.zip u-boot-imx-2ef98d33166e5c22a61eba29c20e236b72f1e8a2.tar.gz u-boot-imx-2ef98d33166e5c22a61eba29c20e236b72f1e8a2.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-net
Diffstat (limited to 'include/configs')
| -rw-r--r-- | include/configs/corvus.h | 1 | ||||
| -rw-r--r-- | include/configs/openrisc-generic.h | 1 | ||||
| -rw-r--r-- | include/configs/smartweb.h | 1 | ||||
| -rw-r--r-- | include/configs/snapper9g45.h | 1 | ||||
| -rw-r--r-- | include/configs/taurus.h | 1 |
5 files changed, 4 insertions, 1 deletions
diff --git a/include/configs/corvus.h b/include/configs/corvus.h index e6a811a..28ea15b 100644 --- a/include/configs/corvus.h +++ b/include/configs/corvus.h @@ -95,6 +95,7 @@ /* Ethernet */ #define CONFIG_MACB +#define CONFIG_PHYLIB #define CONFIG_RMII #define CONFIG_NET_RETRY_COUNT 20 #define CONFIG_AT91_WANTS_COMMON_PHY diff --git a/include/configs/openrisc-generic.h b/include/configs/openrisc-generic.h index 913256a..227c0ca 100644 --- a/include/configs/openrisc-generic.h +++ b/include/configs/openrisc-generic.h @@ -44,7 +44,6 @@ /* * Ethernet */ -#define CONFIG_ETHOC #define CONFIG_SYS_ETHOC_BASE 0x92000000 #define CONFIG_BOOTFILE "boot.img" diff --git a/include/configs/smartweb.h b/include/configs/smartweb.h index 6add391..076a5ce 100644 --- a/include/configs/smartweb.h +++ b/include/configs/smartweb.h @@ -122,6 +122,7 @@ * */ #define CONFIG_MACB +#define CONFIG_PHYLIB #define CONFIG_USB_HOST_ETHER #define CONFIG_USB_ETHER_ASIX #define CONFIG_USB_ETHER_MCS7830 diff --git a/include/configs/snapper9g45.h b/include/configs/snapper9g45.h index fd6c70e..c91ab71 100644 --- a/include/configs/snapper9g45.h +++ b/include/configs/snapper9g45.h @@ -56,6 +56,7 @@ /* Ethernet */ #define CONFIG_MACB +#define CONFIG_PHYLIB #define CONFIG_RMII #define CONFIG_NET_RETRY_COUNT 20 #define CONFIG_RESET_PHY_R diff --git a/include/configs/taurus.h b/include/configs/taurus.h index 882a4e5..2d091db 100644 --- a/include/configs/taurus.h +++ b/include/configs/taurus.h @@ -99,6 +99,7 @@ /* Ethernet */ #define CONFIG_MACB +#define CONFIG_PHYLIB #define CONFIG_RMII #define CONFIG_AT91_WANTS_COMMON_PHY |