| Message ID | 20180615082929.82491-4-agraf@suse.de |
|---|---|
| State | Accepted |
| Commit | a9ea30d267f26bee0b3a5cdd659624a866da3d19 |
| Headers | show |
| Series | net: Sanitize DHCP variable override | expand |
On Fri, Jun 15, 2018 at 3:29 AM, Alexander Graf <agraf@suse.de> wrote: > 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>
2018-06-16 4:12 GMT+08:00 Joe Hershberger <joe.hershberger@ni.com>: > On Fri, Jun 15, 2018 at 3:29 AM, Alexander Graf <agraf@suse.de> wrote: >> 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>
Hi Alexander, https://patchwork.ozlabs.org/patch/929829/ was applied to http://git.denx.de/?p=u-boot/u-boot-net.git Thanks! -Joe
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
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(-)