From: Alexander Graf Date: Wed, 1 Jun 2016 20:41:54 +0000 (+0200) Subject: ARM64: zynqmp: Remove CONFIG_BOOTP_SERVERIP X-Git-Tag: v2016.07-rc1~21^2~2 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=a8b6a156c0f7fb99502229e454bc9c3b38645280;p=oweals%2Fu-boot.git ARM64: zynqmp: Remove CONFIG_BOOTP_SERVERIP When the CONFIG_BOOTP_SERVERIP option is set, we ignore all dhcp values for the tftp server and use our own serverip and file name instead. This is usually not what we want and I doubt it's set for a good reason on ZynqMP. It definitely hurts if we want to support uEFI PXE boot on it. So just remove the option for now. Signed-off-by: Alexander Graf Signed-off-by: Michal Simek --- diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h index 795d58646e..ac3de0ac81 100644 --- a/include/configs/xilinx_zynqmp.h +++ b/include/configs/xilinx_zynqmp.h @@ -76,7 +76,6 @@ #define CONFIG_BOOTP_GATEWAY #define CONFIG_BOOTP_HOSTNAME #define CONFIG_BOOTP_MAY_FAIL -#define CONFIG_BOOTP_SERVERIP #define CONFIG_BOOTP_DNS #define CONFIG_BOOTP_PXE #define CONFIG_BOOTP_SUBNETMASK