diff options
| author | Alex Kiernan <alex.kiernan@gmail.com> | 2018-04-01 09:22:35 +0000 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-04-08 23:00:58 -0400 |
| commit | 4f38592f9f212c7e96707fb4938adfd5fa06d880 (patch) | |
| tree | 4860a448af90d815d2b486bbc0ec9688b3a618b3 | |
| parent | f02b8d17619f76124045a9e75acc17d8de3207a1 (diff) | |
ti: am335x: Fix bootargs when building without NET
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 <alex.kiernan@gmail.com>
Acked-by: Joe Hershberger <joe.hershberger@ni.com>
| -rw-r--r-- | include/configs/am335x_evm.h | 16 |
1 files 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 <config_distro_bootcmd.h> |