diff options
| author | Alexander Graf <agraf@suse.de> | 2018-06-15 10:29:29 +0200 |
|---|---|---|
| committer | Joe Hershberger <joe.hershberger@ni.com> | 2018-07-02 14:14:21 -0500 |
| commit | a9ea30d267f26bee0b3a5cdd659624a866da3d19 (patch) | |
| tree | a4b51ec25699bc932717c69c6a2ce23a7034ce87 | |
| parent | bdce340cc6a17efe1d980eda378c3b1984059362 (diff) | |
| download | u-boot-a9ea30d267f26bee0b3a5cdd659624a866da3d19.tar.gz | |
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 <agraf@suse.de>
Acked-by: Joe Hershberger <joe.hershberger@ni.com>
Acked-by: Rick Chen <rick@andestech.com>
| -rw-r--r-- | configs/ax25-ae350_defconfig | 1 | ||||
| -rw-r--r-- | include/configs/ax25-ae350.h | 1 |
2 files changed, 1 insertions, 1 deletions
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 |