From: Alexander Graf Date: Fri, 15 Jun 2018 08:29:29 +0000 (+0200) Subject: ax25: Switch to CONFIG_BOOTP_PREFER_SERVERIP X-Git-Tag: v2018.07-rc3~1^2 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=a9ea30d267f26bee0b3a5cdd659624a866da3d19;p=oweals%2Fu-boot.git ax25: Switch to CONFIG_BOOTP_PREFER_SERVERIP The ax25-ae350 target currently uses CONFIG_BOOTP_SERVERIP which means we ignore the DHCP provided TFTP ip address. This breaks every case where we do now provide a serverip environment variable. Instead, let's use the new CONFIG_BOOT_PREFER_SERVERIP option to fall back to the DHCP provided TFTP IP if no serverip environment variable is set. Signed-off-by: Alexander Graf Acked-by: Joe Hershberger Acked-by: Rick Chen --- diff --git a/configs/ax25-ae350_defconfig b/configs/ax25-ae350_defconfig index fc04c87485..a328555af6 100644 --- a/configs/ax25-ae350_defconfig +++ b/configs/ax25-ae350_defconfig @@ -40,3 +40,4 @@ CONFIG_DM_SPI=y CONFIG_ATCSPI200_SPI=y CONFIG_TIMER=y CONFIG_ATCPIT100_TIMER=y +CONFIG_BOOTP_PREFER_SERVERIP=y diff --git a/include/configs/ax25-ae350.h b/include/configs/ax25-ae350.h index b1ca5ac11a..b230896734 100644 --- a/include/configs/ax25-ae350.h +++ b/include/configs/ax25-ae350.h @@ -11,7 +11,6 @@ * CPU and Board Configuration Options */ #define CONFIG_BOOTP_SEND_HOSTNAME -#define CONFIG_BOOTP_SERVERIP /* * Miscellaneous configurable options