diff options
| author | Tom Rini <trini@konsulko.com> | 2020-10-29 11:30:29 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-10-29 11:30:29 -0400 |
| commit | 8d7f3fcb4a20bade1a940cea3e3b6983587d0fc9 (patch) | |
| tree | 52a8fec4f072c262a6f55a99b790d36d65f96462 /configs | |
| parent | 47754334b164eae4fde538c406ff3678dfb05042 (diff) | |
| parent | aaedaaae63921c7edefd0f14ec5f1921a7641454 (diff) | |
| download | u-boot-8d7f3fcb4a20bade1a940cea3e3b6983587d0fc9.zip u-boot-8d7f3fcb4a20bade1a940cea3e3b6983587d0fc9.tar.gz u-boot-8d7f3fcb4a20bade1a940cea3e3b6983587d0fc9.tar.bz2 | |
Merge https://gitlab.denx.de/u-boot/custodians/u-boot-marvellWIP/29Oct2020
- Armada 8k: Add NAND support via PXA3xx NAND driver (Baruch)
- Armada 8k: Use ATF serdes init instead of the "old" U-Boot version
(Baruch)
- Minor update to Octeon TX/TX2 defconfig (Stefan)
Diffstat (limited to 'configs')
| -rw-r--r-- | configs/octeontx2_95xx_defconfig | 2 | ||||
| -rw-r--r-- | configs/octeontx2_96xx_defconfig | 2 | ||||
| -rw-r--r-- | configs/octeontx_81xx_defconfig | 2 | ||||
| -rw-r--r-- | configs/octeontx_83xx_defconfig | 2 |
4 files changed, 8 insertions, 0 deletions
diff --git a/configs/octeontx2_95xx_defconfig b/configs/octeontx2_95xx_defconfig index e37c837..591caa7 100644 --- a/configs/octeontx2_95xx_defconfig +++ b/configs/octeontx2_95xx_defconfig @@ -86,6 +86,8 @@ CONFIG_SPI_FLASH_MACRONIX=y CONFIG_SPI_FLASH_SPANSION=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_DM_ETH=y +CONFIG_NET_OCTEONTX2=y +CONFIG_OCTEONTX_SMI=y CONFIG_PCI=y CONFIG_DM_PCI=y CONFIG_DM_PCI_COMPAT=y diff --git a/configs/octeontx2_96xx_defconfig b/configs/octeontx2_96xx_defconfig index 403ea51..0a8888a 100644 --- a/configs/octeontx2_96xx_defconfig +++ b/configs/octeontx2_96xx_defconfig @@ -99,6 +99,8 @@ CONFIG_DM_ETH=y CONFIG_E1000=y CONFIG_E1000_SPI=y CONFIG_CMD_E1000=y +CONFIG_NET_OCTEONTX2=y +CONFIG_OCTEONTX_SMI=y CONFIG_NVME=y CONFIG_PCI=y CONFIG_DM_PCI=y diff --git a/configs/octeontx_81xx_defconfig b/configs/octeontx_81xx_defconfig index 78efcf5..c006a14 100644 --- a/configs/octeontx_81xx_defconfig +++ b/configs/octeontx_81xx_defconfig @@ -100,6 +100,8 @@ CONFIG_DM_ETH=y CONFIG_E1000=y CONFIG_E1000_SPI=y CONFIG_CMD_E1000=y +CONFIG_NET_OCTEONTX=y +CONFIG_OCTEONTX_SMI=y CONFIG_NVME=y CONFIG_PCI=y CONFIG_DM_PCI=y diff --git a/configs/octeontx_83xx_defconfig b/configs/octeontx_83xx_defconfig index f5b0528..86b4bc5 100644 --- a/configs/octeontx_83xx_defconfig +++ b/configs/octeontx_83xx_defconfig @@ -97,6 +97,8 @@ CONFIG_DM_ETH=y CONFIG_E1000=y CONFIG_E1000_SPI=y CONFIG_CMD_E1000=y +CONFIG_NET_OCTEONTX=y +CONFIG_OCTEONTX_SMI=y CONFIG_NVME=y CONFIG_PCI=y CONFIG_DM_PCI=y |