diff options
| author | Tom Rini | 2016-05-24 11:59:02 -0400 |
|---|---|---|
| committer | Tom Rini | 2016-05-24 11:59:02 -0400 |
| commit | 2ee490a0245b65826a8ce8e42e34c9bf805d3656 (patch) | |
| tree | c53f7d3513bd284b181d3aaa61534a0d62751884 /configs | |
| parent | ec8fb48ce98987065493b27422200897cf0909f8 (diff) | |
| parent | 0a71cd77290ca317ecf6f15984a91abbee741e09 (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-net
Signed-off-by: Tom Rini <trini@konsulko.com>
Conflicts:
drivers/net/zynq_gem.c
Diffstat (limited to 'configs')
| -rw-r--r-- | configs/am437x_gp_evm_defconfig | 1 | ||||
| -rw-r--r-- | configs/am437x_sk_evm_defconfig | 1 | ||||
| -rw-r--r-- | configs/dra74_evm_defconfig | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/configs/am437x_gp_evm_defconfig b/configs/am437x_gp_evm_defconfig index 03b02ac9fe6..f098fd3b15c 100644 --- a/configs/am437x_gp_evm_defconfig +++ b/configs/am437x_gp_evm_defconfig @@ -47,3 +47,4 @@ CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_G_DNL_MANUFACTURER="Texas Instruments" CONFIG_G_DNL_VENDOR_NUM=0x0403 CONFIG_G_DNL_PRODUCT_NUM=0xbd00 +CONFIG_DM_ETH=y diff --git a/configs/am437x_sk_evm_defconfig b/configs/am437x_sk_evm_defconfig index 48ec91f4f1e..8be0412a8bf 100644 --- a/configs/am437x_sk_evm_defconfig +++ b/configs/am437x_sk_evm_defconfig @@ -51,3 +51,4 @@ CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_G_DNL_MANUFACTURER="Texas Instruments" CONFIG_G_DNL_VENDOR_NUM=0x0403 CONFIG_G_DNL_PRODUCT_NUM=0xbd00 +CONFIG_DM_ETH=y diff --git a/configs/dra74_evm_defconfig b/configs/dra74_evm_defconfig index a11dcd56c34..32ffce7e185 100644 --- a/configs/dra74_evm_defconfig +++ b/configs/dra74_evm_defconfig @@ -50,3 +50,4 @@ CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_G_DNL_MANUFACTURER="Texas Instruments" CONFIG_G_DNL_VENDOR_NUM=0x0451 CONFIG_G_DNL_PRODUCT_NUM=0xd022 +CONFIG_DM_ETH=y |