[PATCH v3 81/95] Allow distroboot environment to be the same in SPL

[Simon Glass]

With the split config, we find that CONFIG_CMD_DHCP is not enabled in SPL.
While this is normally correct, it causes a build error with
BOOT_TARGET_DEVICES_references_PXE_without_CONFIG_CMD_DHCP_or_PXE

This is because some boards include PXE and DHXP in their
BOOT_TARGET_DEVICES #define. Before split config CONFIG_CMD_DHCP is
enabled in SPL, but with split config it is not, since we don't support
any commands in SPL.

The easiest way to fix this seems to be to use the CONFIG_PPL_... form.
This retains the existing behaviour.

Signed-off-by: Simon Glass <sjg at chromium.org>
---

Changes in v3:
- Add new patch to allow distroboot environment to be the same in SPL

 include/config_distro_bootcmd.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/config_distro_bootcmd.h b/include/config_distro_bootcmd.h
index 9d2a225e7eb..801c481f432 100644
--- a/include/config_distro_bootcmd.h
+++ b/include/config_distro_bootcmd.h
@@ -328,7 +328,7 @@
 	BOOT_TARGET_DEVICES_references_VIRTIO_without_CONFIG_CMD_VIRTIO
 #endif
 
-#if defined(CONFIG_CMD_DHCP)
+#if defined(CONFIG_PPL_CMD_DHCP)
 #if defined(CONFIG_EFI_LOADER)
 /* http://www.iana.org/assignments/dhcpv6-parameters/dhcpv6-parameters.xml */
 #if defined(CONFIG_ARM64) || defined(__aarch64__)
@@ -402,7 +402,7 @@
 	BOOT_TARGET_DEVICES_references_DHCP_without_CONFIG_CMD_DHCP
 #endif
 
-#if defined(CONFIG_CMD_DHCP) && defined(CONFIG_CMD_PXE)
+#if defined(CONFIG_PPL_CMD_DHCP) && defined(CONFIG_PPL_CMD_PXE)
 #define BOOTENV_DEV_PXE(devtypeu, devtypel, instance) \
 	"bootcmd_pxe=" \
 		BOOTENV_RUN_NET_USB_START \
-- 
2.39.1.581.gbfd45094c4-goog