vexpress64: Fix bootargs when building without NET

When building without DHCP/PXE configurations (NET disabled),
compilation errors may occur due to mismatched bootargs.
Ensure bootargs related to DHCP/PXE are not enabled if the
corresponding commands are disabled.

include/config_distro_bootcmd.h:443:9: error: expected ‘}’ before
‘BOOT_TARGET_DEVICES_references_PXE_without_CONFIG_CMD_DHCP_or_PXE’
  443 |         BOOT_TARGET_DEVICES_references_PXE_without_CONFIG_CMD_DHCP_or_PXE
      |         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Signed-off-by: Chanho Park <parkch98@gmail.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>

diff --git a/include/configs/vexpress_aemv8.h b/include/configs/vexpress_aemv8.h
index 8020689..b5a17f9 100644 (file)
--- a/include/configs/vexpress_aemv8.h
+++ b/include/configs/vexpress_aemv8.h
@@ -154,6 +154,18 @@
 #define FUNC_MMC(func)
 #endif
 
+#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
+
 /*
  * Boot by loading an Android image, or kernel, initrd and FDT through
  * semihosting into DRAM.
@@ -188,8 +200,8 @@
        func(SATA, sata, 0)             \
        func(SATA, sata, 1)             \
        FUNC_VIRTIO(func)               \
-       func(PXE, pxe, na)              \
-       func(DHCP, dhcp, na)            \
+       BOOT_TARGET_PXE(func)           \
+       BOOT_TARGET_DHCP(func)          \
        func(AFS, afs, na)
 
 #define VEXPRESS_KERNEL_ADDR           0x80080000
@@ -212,8 +224,8 @@
        func(MEM, mem, na)              \
        FUNC_VIRTIO(func)               \
        FUNC_MMC(func)                  \
-       func(PXE, pxe, na)              \
-       func(DHCP, dhcp, na)
+       BOOT_TARGET_PXE(func)           \
+       BOOT_TARGET_DHCP(func)
 
 #define VEXPRESS_KERNEL_ADDR           0x80080000
 #define VEXPRESS_PXEFILE_ADDR          0x8fa00000
@@ -234,8 +246,8 @@
 #define BOOT_TARGET_DEVICES(func)      \
        func(MEM, mem, na)              \
        FUNC_VIRTIO(func)               \
-       func(PXE, pxe, na)              \
-       func(DHCP, dhcp, na)
+       BOOT_TARGET_PXE(func)           \
+       BOOT_TARGET_DHCP(func)
 
 #define VEXPRESS_KERNEL_ADDR           0x00200000
 #define VEXPRESS_PXEFILE_ADDR          0x0fb00000