diff options
| author | Tom Rini <trini@konsulko.com> | 2021-04-19 13:35:23 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-04-19 13:35:23 -0400 |
| commit | eed05148c261e3b5f00b11a7a14bf0222b80a0ac (patch) | |
| tree | 160eb57422bb1501c8a8899b3b855f4a8e4949dc /include | |
| parent | 5fa1e2ffebcb78f6e249c2b2b9a0430b440fa4c6 (diff) | |
| parent | fcf3c9deae1acfda81051c8c211fcbefd4217e1d (diff) | |
Merge tag 'u-boot-amlogic-20210419' of https://source.denx.de/u-boot/custodians/u-boot-amlogic
- fix Ethernet on Odroid-C2 by re-adding old bindings style PHY reset
- add G12A PCIe clock gates
- add G12A PCIe PHY OPs
- enable PCIe for Khadas VIM3/VIM3L boards DT
- enable PCIe and NVME for Khadas VIM3/VIM3L boards config
- update Amlogic board documentation for PCIe support
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/meson64.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/include/configs/meson64.h b/include/configs/meson64.h index 7e97f890526..17ebccd2c4b 100644 --- a/include/configs/meson64.h +++ b/include/configs/meson64.h @@ -58,6 +58,12 @@ #define BOOT_TARGET_DEVICES_USB(func) #endif +#ifdef CONFIG_CMD_NVME + #define BOOT_TARGET_NVME(func) func(NVME, nvme, 0) +#else + #define BOOT_TARGET_NVME(func) +#endif + #ifndef BOOT_TARGET_DEVICES #define BOOT_TARGET_DEVICES(func) \ func(ROMUSB, romusb, na) \ @@ -65,6 +71,7 @@ func(MMC, mmc, 1) \ func(MMC, mmc, 2) \ BOOT_TARGET_DEVICES_USB(func) \ + BOOT_TARGET_NVME(func) \ func(PXE, pxe, na) \ func(DHCP, dhcp, na) #endif |