From 4f38592f9f212c7e96707fb4938adfd5fa06d880 Mon Sep 17 00:00:00 2001 From: Alex Kiernan Date: Sun, 1 Apr 2018 09:22:35 +0000 Subject: [PATCH] ti: am335x: Fix bootargs when building without NET MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit If DHCP/PXE commands are disabled then the compilation fails due to bootargs attempting to use them: include/config_distro_bootcmd.h:319:2: error: expected ‘}’ before ‘BOOT_TARGET_DEVICES_references_PXE_without_CONFIG_CMD_DHCP_or_PXE’ Ensure that if the command aren't enabled, we don't try and use them. Signed-off-by: Alex Kiernan Acked-by: Joe Hershberger --- include/configs/am335x_evm.h | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h index 8d45b6fade..fc3fc179fb 100644 --- a/include/configs/am335x_evm.h +++ b/include/configs/am335x_evm.h @@ -74,14 +74,26 @@ #define BOOTENV_DEV_NAME_NAND(devtypeu, devtypel, instance) \ #devtypel #instance " " +#if CONFIG_IS_ENABLED(CMD_PXE) +# define BOOT_TARGET_PXE(func) func(PXE, pxe, na) +#else +# define BOOT_TARGET_PXE(func) +#endif + +#if CONFIG_IS_ENABLED(CMD_DHCP) +# define BOOT_TARGET_DHCP(func) func(DHCP, dhcp, na) +#else +# define BOOT_TARGET_DHCP(func) +#endif + #define BOOT_TARGET_DEVICES(func) \ func(MMC, mmc, 0) \ func(LEGACY_MMC, legacy_mmc, 0) \ func(MMC, mmc, 1) \ func(LEGACY_MMC, legacy_mmc, 1) \ func(NAND, nand, 0) \ - func(PXE, pxe, na) \ - func(DHCP, dhcp, na) + BOOT_TARGET_PXE(func) \ + BOOT_TARGET_DHCP(func) #include -- 2.30.2