sunxi: Fix build when CONFIG_CMD_PXE or CONFIG_CMD_DHCP are disabled
PATCH v2 1/1 sunxi: Fix build when CONFIG_CMD_PXE or CONFIG_CMD_DHCP are disabled
From: Ondrej Jirman <[email protected]>
Fixes a compilation failure with disabled PXE or DHCP command when using sunxi platform.
---
This was previously sent as a part of other series of patches, but it's unrelated to the rest of the patches, so I'm resending it individually.
v2:
- improved description
include/configs/sunxi-common.h | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-)
include/configs/sunxi-common.h +14 -2
@@ -399,6 +399,18 @@ extern int soft_i2c_gpio_scl;#define BOOT_TARGET_DEVICES_USB (func)#endif +#ifdef CONFIG_CMD_PXE +#define BOOT_TARGET_DEVICES_PXE (func) func(PXE, pxe, na) +#else +#define BOOT_TARGET_DEVICES_PXE (func) +#endif + +#ifdef CONFIG_CMD_DHCP +#define BOOT_TARGET_DEVICES_DHCP (func) func(DHCP, dhcp, na) +#else +#define BOOT_TARGET_DEVICES_DHCP (func) +#endif +/* FEL boot support, auto-execute boot.scr if a script address was provided */ #define BOOTENV_DEV_FEL (devtypeu, devtypel, instance) \ "bootcmd_fel=" \
@@ -414,8 +426,8 @@ extern int soft_i2c_gpio_scl; BOOT_TARGET_DEVICES_MMC(func) \ BOOT_TARGET_DEVICES_SCSI(func) \ BOOT_TARGET_DEVICES_USB(func) \ - func(PXE, pxe, na) \ - func(DHCP, dhcp, na) + BOOT_TARGET_DEVICES_PXE(func) \ + BOOT_TARGET_DEVICES_DHCP(func) #ifdef CONFIG_OLD_SUNXI_KERNEL_COMPAT#define BOOTCMD_SUNXI_COMPAT \
Signature · 1 line
2.20.1
PATCH v2 1/1 sunxi: Fix build when CONFIG_CMD_PXE or CONFIG_CMD_DHCP are disabled
Quoted 8 lines · On Wed, Feb 13, 2019 at 11:20 PM <[email protected]> wrote:
From: Ondrej Jirman <[email protected]>
Fixes a compilation failure with disabled PXE or DHCP command when using sunxi platform.
Signed-off-by Ondřej Jirman <[email protected]>---
PATCH v2 1/1 sunxi: Fix build when CONFIG_CMD_PXE or CONFIG_CMD_DHCP are disabled
In reply to megous at megous.comQuoted 8 lines · On Wed, Feb 13, 2019 at 11:20 PM <[email protected]> wrote:
From: Ondrej Jirman <[email protected]>
Fixes a compilation failure with disabled PXE or DHCP command when using sunxi platform.
Signed-off-by Ondřej Jirman <[email protected]>---
Applied to u-boot-sunxi/master