jcs.org / u-boot
"Das U-Boot" Source Tree
0
fork

Configure Feed

Select the types of activity you want to include in your feed.

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>

authored by

Chanho Park and committed by
Tom Rini 72ff74dc 3d729838

+18 -6
+18 -6
include/configs/vexpress_aemv8.h
··· 154 154 #define FUNC_MMC(func) 155 155 #endif 156 156 157 + #if CONFIG_IS_ENABLED(CMD_PXE) 158 + #define BOOT_TARGET_PXE(func) func(PXE, pxe, na) 159 + #else 160 + #define BOOT_TARGET_PXE(func) 161 + #endif 162 + 163 + #if CONFIG_IS_ENABLED(CMD_DHCP) 164 + #define BOOT_TARGET_DHCP(func) func(DHCP, dhcp, na) 165 + #else 166 + #define BOOT_TARGET_DHCP(func) 167 + #endif 168 + 157 169 /* 158 170 * Boot by loading an Android image, or kernel, initrd and FDT through 159 171 * semihosting into DRAM. ··· 188 200 func(SATA, sata, 0) \ 189 201 func(SATA, sata, 1) \ 190 202 FUNC_VIRTIO(func) \ 191 - func(PXE, pxe, na) \ 192 - func(DHCP, dhcp, na) \ 203 + BOOT_TARGET_PXE(func) \ 204 + BOOT_TARGET_DHCP(func) \ 193 205 func(AFS, afs, na) 194 206 195 207 #define VEXPRESS_KERNEL_ADDR 0x80080000 ··· 212 224 func(MEM, mem, na) \ 213 225 FUNC_VIRTIO(func) \ 214 226 FUNC_MMC(func) \ 215 - func(PXE, pxe, na) \ 216 - func(DHCP, dhcp, na) 227 + BOOT_TARGET_PXE(func) \ 228 + BOOT_TARGET_DHCP(func) 217 229 218 230 #define VEXPRESS_KERNEL_ADDR 0x80080000 219 231 #define VEXPRESS_PXEFILE_ADDR 0x8fa00000 ··· 234 246 #define BOOT_TARGET_DEVICES(func) \ 235 247 func(MEM, mem, na) \ 236 248 FUNC_VIRTIO(func) \ 237 - func(PXE, pxe, na) \ 238 - func(DHCP, dhcp, na) 249 + BOOT_TARGET_PXE(func) \ 250 + BOOT_TARGET_DHCP(func) 239 251 240 252 #define VEXPRESS_KERNEL_ADDR 0x00200000 241 253 #define VEXPRESS_PXEFILE_ADDR 0x0fb00000