[U-Boot] commit 620776d causes TFTP error: 'Unsupported option(s) requested' (8)

[Bin Meng]

Hi,

With latest u-boot/master, TFTP is seriously broken.

=> tftp 100000 bzImage
Speed: 100, full duplex
Using pch_gbe device
TFTP from server 10.10.0.8; our IP address is 10.10.0.100; sending
through gateway 10.10.0.1
Filename 'bzImage'.
Load address: 0x100000
Loading: T
TFTP error: 'Unsupported option(s) requested' (8)
Starting again

git bisect shows the following commit broke the TFTP

commit 620776d734e4b126c407f636bda825a594a17723
Author: Pavel Machek <pavel at denx.de>
Date:   Tue Aug 18 14:34:26 2015 +0200

    tftp: adjust settings to be suitable for 100Mbit ethernet

    Adjust timouts and retry counts to be suitable for loaded ethernet
    network. With 5 seconds timeout, 10 retries maximum, tftp is
    impossible even on local network with single full-speed TCP
    connection.

    100msec timeout should be suitable for most networks tftp is used on,
    that is local ethernets. Timeout count really needs to be way higher,
    as lost packets are normal when TCP is running over the same network.

    Enforce 10msec minimum.

    Signed-off-by: Pavel Machek <pavel at denx.de>
    Acked-by: Joe Hershberger <joe.hershberger at ni.com>

Can we get this fixed ASAP? Thanks,

Regards,
Bin