diff options
| author | Michal Simek <michal.simek@xilinx.com> | 2020-09-16 11:14:01 +0300 |
|---|---|---|
| committer | Michal Simek <michal.simek@xilinx.com> | 2020-09-23 15:29:57 +0300 |
| commit | a2c87cb82ac7b09bc48650d84330aa76941839dd (patch) | |
| tree | 27afdfcb2db27f7a34b85cec9887fc4423d2fdc5 /include/configs/xilinx_versal.h | |
| parent | e3259a700a27c738b64caacdc629937d0cd71282 (diff) | |
| download | u-boot-a2c87cb82ac7b09bc48650d84330aa76941839dd.tar.xz | |
xilinx: versal: Fix compilation error when !CONFIG_NET
PXE and DHCP shouldn't be listed when commands are not enabled that's why
handle it in the same way as is done for Zynq and ZynqMP.
Fixes: ec48b6c991f4 ("arm64: versal: Add support for new Xilinx Versal ACAPs")
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Diffstat (limited to 'include/configs/xilinx_versal.h')
| -rw-r--r-- | include/configs/xilinx_versal.h | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/include/configs/xilinx_versal.h b/include/configs/xilinx_versal.h index d7255a05df..8b416327b5 100644 --- a/include/configs/xilinx_versal.h +++ b/include/configs/xilinx_versal.h @@ -94,6 +94,18 @@ # define BOOT_TARGET_DEVICES_MMC(func) #endif +#if defined(CONFIG_CMD_PXE) && defined(CONFIG_CMD_DHCP) +# define BOOT_TARGET_DEVICES_PXE(func) func(PXE, pxe, na) +#else +# define BOOT_TARGET_DEVICES_PXE(func) +#endif + +#if defined(CONFIG_CMD_DHCP) +# define BOOT_TARGET_DEVICES_DHCP(func) func(DHCP, dhcp, na) +#else +# define BOOT_TARGET_DEVICES_DHCP(func) +#endif + #if defined(CONFIG_ZYNQMP_GQSPI) || defined(CONFIG_CADENCE_OSPI_VERSAL) # define BOOT_TARGET_DEVICES_XSPI(func) func(XSPI, xspi, 0) #else @@ -135,8 +147,8 @@ BOOT_TARGET_DEVICES_MMC(func) \ BOOT_TARGET_DEVICES_XSPI(func) \ BOOT_TARGET_DEVICES_DFU_USB(func) \ - func(PXE, pxe, na) \ - func(DHCP, dhcp, na) + BOOT_TARGET_DEVICES_PXE(func) \ + BOOT_TARGET_DEVICES_DHCP(func) #include <config_distro_bootcmd.h> |