summaryrefslogtreecommitdiff
path: root/include/configs/tegra-common-post.h
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2021-07-09 10:11:54 -0400
committerTom Rini <trini@konsulko.com>2021-07-18 21:05:31 -0400
commit3fa03bcf8c67f3636104ecfc941f80af5b31ad9a (patch)
treebcc498577926246c6363012c55cafef67d40e754 /include/configs/tegra-common-post.h
parent67b77d72f408b71194d008b4c1bbb1f1c2470039 (diff)
tegra: Test on CONFIG_CMD_USB being enabled for distro bootcmd
Reuse the common logic to allow for BOOT_TARGET_DEVICES to list USB as a possibility if we're building for a platform that will have USB but not if we don't, so that we don't hit the link-time check for trying to have USB boot on a non-USB system. Acked-by: Tom Warren <twarren@nvidia.com> Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'include/configs/tegra-common-post.h')
-rw-r--r--include/configs/tegra-common-post.h9
1 files changed, 8 insertions, 1 deletions
diff --git a/include/configs/tegra-common-post.h b/include/configs/tegra-common-post.h
index fae0e761fb..dd7a75ae46 100644
--- a/include/configs/tegra-common-post.h
+++ b/include/configs/tegra-common-post.h
@@ -21,11 +21,18 @@
#define CONFIG_SYS_NONCACHED_MEMORY (1 << 20) /* 1 MiB */
#ifndef CONFIG_SPL_BUILD
+
+#if CONFIG_IS_ENABLED(CMD_USB)
+# define BOOT_TARGET_USB(func) func(USB, usb, 0)
+#else
+# define BOOT_TARGET_USB(func)
+#endif
+
#ifndef BOOT_TARGET_DEVICES
#define BOOT_TARGET_DEVICES(func) \
func(MMC, mmc, 1) \
func(MMC, mmc, 0) \
- func(USB, usb, 0) \
+ BOOT_TARGET_USB(func) \
func(PXE, pxe, na) \
func(DHCP, dhcp, na)
#endif