diff options
author | Tom Rini <trini@konsulko.com> | 2020-08-25 10:24:40 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2020-08-25 13:38:29 -0400 |
commit | 9f9ecd3e4d7839e24c182fb7b24937e19b670f1b (patch) | |
tree | 4250ad58dba47ae6127d4129b9a19dc648fd064d /arch/arm/Makefile | |
parent | ec54217ddc6f52f3b7dad7a3fd6d8a3abd64ab7e (diff) | |
parent | 6944937f9c4d21f39dd257bce7b677a0f6849cea (diff) |
Merge https://gitlab.denx.de/u-boot/custodians/u-boot-marvell
- Add basic Marvell/Cavium OcteonTX/TX2 support (Suneel)
- Infrastructure changes to PCI uclass to support these SoC's (Suneel)
- Add PCI, MMC & watchdog driver drivers for OcteonTX/TX2 (Suneel)
- Increase CONFIG_SYS_MALLOC_F_LEN for qemu-x86 (Stefan)
Diffstat (limited to 'arch/arm/Makefile')
-rw-r--r-- | arch/arm/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/Makefile b/arch/arm/Makefile index bf3890e99b..28b523b37c 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -80,6 +80,8 @@ machine-$(CONFIG_ARCH_STM32MP) += stm32mp machine-$(CONFIG_ARCH_SUNXI) += sunxi machine-$(CONFIG_ARCH_TEGRA) += tegra machine-$(CONFIG_ARCH_U8500) += u8500 +machine-$(CONFIG_ARCH_OCTEONTX) += octeontx +machine-$(CONFIG_ARCH_OCTEONTX2) += octeontx2 machine-$(CONFIG_ARCH_UNIPHIER) += uniphier machine-$(CONFIG_ARCH_VERSAL) += versal machine-$(CONFIG_ARCH_ZYNQ) += zynq |