From: Tom Rini Date: Mon, 24 Aug 2015 00:44:25 +0000 (-0400) Subject: Merge git://git.denx.de/u-boot-socfpga X-Git-Tag: v2015.10-rc3~96 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=c851a2458fbc12495f4f786d4eabb612850a5143;p=u-boot 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 --- c851a2458fbc12495f4f786d4eabb612850a5143 diff --cc configs/socfpga_arria5_defconfig index c2ba3aba0e,74184a00ff..cb460e86e0 --- a/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_DM_ETH=y -CONFIG_NETDEVICES=y + CONFIG_ETH_DESIGNWARE=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_cyclone5_defconfig index 92e116e270,954c936dcc..8a7f8ccb95 --- a/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 d54439dc69,19eccc3140..d7675791da --- a/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