diff options
| author | Tom Rini <trini@konsulko.com> | 2015-08-23 20:44:25 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-08-23 20:44:25 -0400 |
| commit | c851a2458fbc12495f4f786d4eabb612850a5143 (patch) | |
| tree | fa0b97f9ff8f744db11a1d296283ce7ce335a536 /configs | |
| parent | 14e7a30f2e8963fc5b91ba68e53bb2de708aee65 (diff) | |
| parent | 29aa439759ed2e5dfa45cd8d6d5a1d51604e3820 (diff) | |
| download | u-boot-imx-c851a2458fbc12495f4f786d4eabb612850a5143.zip u-boot-imx-c851a2458fbc12495f4f786d4eabb612850a5143.tar.gz u-boot-imx-c851a2458fbc12495f4f786d4eabb612850a5143.tar.bz2 | |
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>
Diffstat (limited to 'configs')
| -rw-r--r-- | configs/socfpga_arria5_defconfig | 6 | ||||
| -rw-r--r-- | configs/socfpga_cyclone5_defconfig | 7 | ||||
| -rw-r--r-- | configs/socfpga_socrates_defconfig | 7 |
3 files changed, 13 insertions, 7 deletions
diff --git a/configs/socfpga_arria5_defconfig b/configs/socfpga_arria5_defconfig index c2ba3ab..cb460e8 100644 --- a/configs/socfpga_arria5_defconfig +++ b/configs/socfpga_arria5_defconfig @@ -1,7 +1,7 @@ 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 @@ -12,3 +12,7 @@ CONFIG_OF_CONTROL=y CONFIG_SPL_OF_CONTROL=y CONFIG_SPL_DM=y CONFIG_SPI_FLASH=y +CONFIG_DM_ETH=y +CONFIG_ETH_DESIGNWARE=y +CONFIG_DM_GPIO=y +CONFIG_DWAPB_GPIO=y diff --git a/configs/socfpga_cyclone5_defconfig b/configs/socfpga_cyclone5_defconfig index 92e116e..8a7f8cc 100644 --- a/configs/socfpga_cyclone5_defconfig +++ b/configs/socfpga_cyclone5_defconfig @@ -1,7 +1,7 @@ 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 @@ -10,8 +10,9 @@ CONFIG_SPL_STACK_R_ADDR=0x00800000 # 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 diff --git a/configs/socfpga_socrates_defconfig b/configs/socfpga_socrates_defconfig index d54439d..d767579 100644 --- a/configs/socfpga_socrates_defconfig +++ b/configs/socfpga_socrates_defconfig @@ -1,7 +1,7 @@ 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 @@ -10,8 +10,9 @@ CONFIG_SPL_STACK_R_ADDR=0x00800000 # 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 |