[2/2] ax25: Switch to CONFIG_BOOTP_PREFER_SERVERIP

Message ID 20180606123202.53631-2-agraf@suse.de
State New
Headers show
Series
  • [1/2] net: Add option to prefer bootp/dhcp serverip
Related show

Commit Message

Alexander Graf June 6, 2018, 12:32 p.m.
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 <agraf@suse.de>
---
 configs/ax25-ae350_defconfig | 1 +
 include/configs/ax25-ae350.h | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

Patch

diff --git a/configs/ax25-ae350_defconfig b/configs/ax25-ae350_defconfig
index 5a69eb50c5..9e0ca3452d 100644
--- a/configs/ax25-ae350_defconfig
+++ b/configs/ax25-ae350_defconfig
@@ -45,3 +45,4 @@  CONFIG_TIMER=y
 CONFIG_ATCPIT100_TIMER=y
 CONFIG_DISTRO_DEFAULTS=y
 CONFIG_CPU_RISCV_64=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