Merge git://git.denx.de/u-boot-socfpga

Conflicts:
	configs/socfpga_arria5_defconfig
	configs/socfpga_cyclone5_defconfig
	configs/socfpga_socrates_defconfig

Merged these by hand and re-ran savedefconfig on them.

Signed-off-by: Tom Rini <trini@konsulko.com>

diff --cc configs/socfpga_arria5_defconfig
index c2ba3aba0e2b975a8177f2d24672ac62d3250a75,74184a00ffc7b3adc4b936fdd57ab2b5ca7b3285..cb460e86e05ba6f0f68313357f0eab97061c621f
--- 1/configs/socfpga_arria5_defconfig
--- 2/configs/socfpga_arria5_defconfig
+++ b/configs/socfpga_arria5_defconfig
@@@ -1,14 -1,26 +1,18 @@@
  CONFIG_ARM=y
  CONFIG_ARCH_SOCFPGA=y
--CONFIG_TARGET_SOCFPGA_ARRIA5=y
 +CONFIG_SYS_MALLOC_F_LEN=0x2000
+ CONFIG_TARGET_SOCFPGA_ARRIA5_SOCDK=y
  CONFIG_DEFAULT_DEVICE_TREE="socfpga_arria5_socdk"
  CONFIG_SPL=y
 +CONFIG_SPL_STACK_R=y
 +CONFIG_SPL_STACK_R_ADDR=0x00800000
  # CONFIG_CMD_IMLS is not set
  # CONFIG_CMD_FLASH is not set
  CONFIG_OF_CONTROL=y
  CONFIG_SPL_OF_CONTROL=y
 +CONFIG_SPL_DM=y
  CONFIG_SPI_FLASH=y
 -CONFIG_NETDEVICES=y
+ CONFIG_DM_ETH=y
 -CONFIG_SPL_DM=y
 -CONFIG_SPL_MMC_SUPPORT=y
 -CONFIG_DM_SEQ_ALIAS=y
 -CONFIG_SPL_SIMPLE_BUS=y
 -CONFIG_DM_SPI=y
 -CONFIG_DM_SPI_FLASH=y
 -CONFIG_SPL_SPI_SUPPORT=y
 -CONFIG_SPL_STACK_R=y
 -CONFIG_SPL_STACK_R_ADDR=0x00800000
 -CONFIG_SYS_MALLOC_F_LEN=0x2000
+ CONFIG_ETH_DESIGNWARE=y
+ CONFIG_DM_GPIO=y
+ CONFIG_DWAPB_GPIO=y

diff --cc configs/socfpga_cyclone5_defconfig
index 92e116e270c4ef381392376d05ed3cfa38008fd9,954c936dcc0aa0d78e7a6c50a0d36119b9b49bce..8a7f8ccb9509b88bdc089f229cbda4aded4d6490
--- 1/configs/socfpga_cyclone5_defconfig
--- 2/configs/socfpga_cyclone5_defconfig
+++ b/configs/socfpga_cyclone5_defconfig
@@@ -1,17 -1,26 +1,18 @@@
  CONFIG_ARM=y
  CONFIG_ARCH_SOCFPGA=y
--CONFIG_TARGET_SOCFPGA_CYCLONE5=y
 +CONFIG_SYS_MALLOC_F_LEN=0x2000
+ CONFIG_TARGET_SOCFPGA_CYCLONE5_SOCDK=y
  CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_socdk"
  CONFIG_SPL=y
 +CONFIG_SPL_STACK_R=y
 +CONFIG_SPL_STACK_R_ADDR=0x00800000
  # CONFIG_CMD_IMLS is not set
  # CONFIG_CMD_FLASH is not set
  CONFIG_OF_CONTROL=y
  CONFIG_SPL_OF_CONTROL=y
++CONFIG_SPL_DM=y
  CONFIG_SPI_FLASH=y
  CONFIG_DM_ETH=y
--CONFIG_NETDEVICES=y
  CONFIG_ETH_DESIGNWARE=y
- CONFIG_SPL_DM=y
+ CONFIG_DM_GPIO=y
+ CONFIG_DWAPB_GPIO=y
 -CONFIG_SPL_DM=y
 -CONFIG_SPL_MMC_SUPPORT=y
 -CONFIG_DM_SEQ_ALIAS=y
 -CONFIG_SPL_SIMPLE_BUS=y
 -CONFIG_DM_SPI=y
 -CONFIG_DM_SPI_FLASH=y
 -CONFIG_SPL_SPI_SUPPORT=y
 -CONFIG_SPL_STACK_R=y
 -CONFIG_SPL_STACK_R_ADDR=0x00800000
 -CONFIG_SYS_MALLOC_F_LEN=0x2000

diff --cc configs/socfpga_socrates_defconfig
index d54439dc69625c9bdc78369f7212b2a4da78bcdc,19eccc31408fff5b7b80febcbb568f8ab1dcc747..d7675791da6a2a39ab2c2dfefa89753fe130a4d9
--- 1/configs/socfpga_socrates_defconfig
--- 2/configs/socfpga_socrates_defconfig
+++ b/configs/socfpga_socrates_defconfig
@@@ -1,17 -1,26 +1,18 @@@
  CONFIG_ARM=y
  CONFIG_ARCH_SOCFPGA=y
--CONFIG_TARGET_SOCFPGA_CYCLONE5=y
 +CONFIG_SYS_MALLOC_F_LEN=0x2000
+ CONFIG_TARGET_SOCFPGA_CYCLONE5_SOCDK=y
  CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_socrates"
  CONFIG_SPL=y
 +CONFIG_SPL_STACK_R=y
 +CONFIG_SPL_STACK_R_ADDR=0x00800000
  # CONFIG_CMD_IMLS is not set
  # CONFIG_CMD_FLASH is not set
  CONFIG_OF_CONTROL=y
  CONFIG_SPL_OF_CONTROL=y
++CONFIG_SPL_DM=y
  CONFIG_SPI_FLASH=y
  CONFIG_DM_ETH=y
--CONFIG_NETDEVICES=y
  CONFIG_ETH_DESIGNWARE=y
- CONFIG_SPL_DM=y
+ CONFIG_DM_GPIO=y
+ CONFIG_DWAPB_GPIO=y
 -CONFIG_SPL_DM=y
 -CONFIG_SPL_MMC_SUPPORT=y
 -CONFIG_DM_SEQ_ALIAS=y
 -CONFIG_SPL_SIMPLE_BUS=y
 -CONFIG_DM_SPI=y
 -CONFIG_DM_SPI_FLASH=y
 -CONFIG_SPL_SPI_SUPPORT=y
 -CONFIG_SPL_STACK_R=y
 -CONFIG_SPL_STACK_R_ADDR=0x00800000
 -CONFIG_SYS_MALLOC_F_LEN=0x2000