* [U-Boot] [PATCH v2] sunxi: Fix build when CONFIG_CMD_PXE or CONFIG_CMD_DHCP are disabled
@ 2019-02-13 17:50 megous at megous.com
2019-04-12 6:35 ` Jagan Teki
2019-04-18 16:48 ` Jagan Teki
0 siblings, 2 replies; 3+ messages in thread
From: megous at megous.com @ 2019-02-13 17:50 UTC (permalink / raw)
To: u-boot
From: Ondrej Jirman <megous@megous.com>
Fixes a compilation failure with disabled PXE or DHCP command when using
sunxi platform.
Signed-off-by: Ondřej Jirman <megous@megous.com>
---
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(-)
diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h
index b01d1c3c84..d421b93509 100644
--- a/include/configs/sunxi-common.h
+++ b/include/configs/sunxi-common.h
@@ -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 \
--
2.20.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [U-Boot] [PATCH v2] sunxi: Fix build when CONFIG_CMD_PXE or CONFIG_CMD_DHCP are disabled
2019-02-13 17:50 [U-Boot] [PATCH v2] sunxi: Fix build when CONFIG_CMD_PXE or CONFIG_CMD_DHCP are disabled megous at megous.com
@ 2019-04-12 6:35 ` Jagan Teki
2019-04-18 16:48 ` Jagan Teki
1 sibling, 0 replies; 3+ messages in thread
From: Jagan Teki @ 2019-04-12 6:35 UTC (permalink / raw)
To: u-boot
On Wed, Feb 13, 2019 at 11:20 PM <megous@megous.com> wrote:
>
> From: Ondrej Jirman <megous@megous.com>
>
> Fixes a compilation failure with disabled PXE or DHCP command when using
> sunxi platform.
>
> Signed-off-by: Ondřej Jirman <megous@megous.com>
> ---
Reviewed-by: Jagan Teki <jagan@amarulasolutions.com>
^ permalink raw reply [flat|nested] 3+ messages in thread
* [U-Boot] [PATCH v2] sunxi: Fix build when CONFIG_CMD_PXE or CONFIG_CMD_DHCP are disabled
2019-02-13 17:50 [U-Boot] [PATCH v2] sunxi: Fix build when CONFIG_CMD_PXE or CONFIG_CMD_DHCP are disabled megous at megous.com
2019-04-12 6:35 ` Jagan Teki
@ 2019-04-18 16:48 ` Jagan Teki
1 sibling, 0 replies; 3+ messages in thread
From: Jagan Teki @ 2019-04-18 16:48 UTC (permalink / raw)
To: u-boot
On Wed, Feb 13, 2019 at 11:20 PM <megous@megous.com> wrote:
>
> From: Ondrej Jirman <megous@megous.com>
>
> Fixes a compilation failure with disabled PXE or DHCP command when using
> sunxi platform.
>
> Signed-off-by: Ondřej Jirman <megous@megous.com>
> ---
Applied to u-boot-sunxi/master
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-04-18 16:48 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-02-13 17:50 [U-Boot] [PATCH v2] sunxi: Fix build when CONFIG_CMD_PXE or CONFIG_CMD_DHCP are disabled megous at megous.com
2019-04-12 6:35 ` Jagan Teki
2019-04-18 16:48 ` Jagan Teki
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.