Merge branch 'master' of git://git.denx.de/u-boot-socfpga

diff --combined configs/socfpga_arria10_defconfig
index 983d5ee,2fc9e6b..1b9ce17
--- 1/configs/socfpga_arria10_defconfig
--- 2/configs/socfpga_arria10_defconfig
+++ b/configs/socfpga_arria10_defconfig
@@@ -7,7 -7,6 +7,7 @@@ CONFIG_SPL=
  CONFIG_IDENT_STRING="socfpga_arria10"
  CONFIG_DEFAULT_DEVICE_TREE="socfpga_arria10_socdk_sdmmc"
  CONFIG_DISTRO_DEFAULTS=y
 +CONFIG_NR_DRAM_BANKS=1
  CONFIG_USE_BOOTARGS=y
  CONFIG_BOOTARGS="console=ttyS0,115200"
  # CONFIG_USE_BOOTCOMMAND is not set
@@@ -35,5 -34,7 +35,7 @@@ CONFIG_DWAPB_GPIO=
  CONFIG_DM_MMC=y
  CONFIG_MTD_DEVICE=y
  CONFIG_MTD_PARTITIONS=y
+ CONFIG_DM_ETH=y
+ CONFIG_ETH_DESIGNWARE=y
  CONFIG_SPI=y
  CONFIG_USE_TINY_PRINTF=y