test/py: vboot: Remove stderr redirect from openssl command

[u-boot] / include / configs / xilinx_zynqmp.h

diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h
index 56c8b0cb68aae474297508a7fb8793b5c611e048..e9086f99061fe5db8c4f95b3d1677d69fda4a9fc 100644 (file)
--- a/include/configs/xilinx_zynqmp.h
+++ b/include/configs/xilinx_zynqmp.h
@@ -1,11 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * Configuration for Xilinx ZynqMP
  * (C) Copyright 2014 - 2015 Xilinx, Inc.
  * Michal Simek <michal.simek@xilinx.com>
  *
  * Based on Configuration for Versatile Express
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #ifndef __XILINX_ZYNQMP_H
@@ -172,7 +171,7 @@
 # define BOOT_TARGET_DEVICES_USB(func)
 #endif
 
-#if defined(CONFIG_CMD_PXE)
+#if defined(CONFIG_CMD_PXE) && defined(CONFIG_CMD_DHCP)
 # define BOOT_TARGET_DEVICES_PXE(func) func(PXE, pxe, na)
 #else
 # define BOOT_TARGET_DEVICES_PXE(func)