diff options
| author | Tom Rini <trini@konsulko.com> | 2015-12-24 09:31:35 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-12-24 09:31:35 -0500 |
| commit | 40253dd12a64086885097d253b665c9876635e76 (patch) | |
| tree | ab93904ec84b33c1e9336baa8eae710dd957683f /include/configs/axs101.h | |
| parent | 8182b41994f0b1824c31652d64171ffa596517fc (diff) | |
| parent | e662573822d24dcdc079d29ff397cb8bacf97b27 (diff) | |
| download | u-boot-imx-40253dd12a64086885097d253b665c9876635e76.zip u-boot-imx-40253dd12a64086885097d253b665c9876635e76.tar.gz u-boot-imx-40253dd12a64086885097d253b665c9876635e76.tar.bz2 | |
Merge git://git.denx.de/u-boot-socfpga
Conflicts:
include/configs/axs101.h
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'include/configs/axs101.h')
| -rw-r--r-- | include/configs/axs101.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/include/configs/axs101.h b/include/configs/axs101.h index c92cca2..98fff63 100644 --- a/include/configs/axs101.h +++ b/include/configs/axs101.h @@ -95,16 +95,10 @@ /* * Ethernet PHY configuration */ -#define CONFIG_PHYLIB #define CONFIG_MII #define CONFIG_PHY_GIGE /* - * Ethernet configuration - */ -#define CONFIG_DW_AUTONEG - -/* * USB 1.1 configuration */ #define CONFIG_USB_OHCI_NEW |