[U-Boot-Users] Pull Request: u-boot-net

[U-Boot-Users] Pull Request: u-boot-net

[Ben Warren]

Wolfgang,

Please pull from u-boot-net.  I merged with mainline tonight, so 
hopefully everything's up-to-date.  I'm sure you'll let me know if 
anything's amiss.

regards,
Ben

------------------------------------

The following changes since commit 8a92b7c60b40ff79e2cc96e13aeac2a531dde473:
  Wolfgang Denk (1):
        Merge with /home/wd/git/u-boot/custodian/u-boot-mpc86xx

are found in the git repository at:

  git://www.denx.de/git/u-boot-net.git

Ben Warren (1):
      Sync'd u-boot-net with mainline

David Updegraff (1):
      multicast tftp: RFC2090

Mike Rapoport (1):
      Add ability to take MAC address from the environment to DM9000 driver

Vadim Bendebury (1):
      cosmetic changes to bcm570x driver

Wilson Callan (1):
      New CONFIG_BOOTP_SERVERIP option

 README               |   15 +-
 drivers/bcm570x.c    | 2322 ++++++-------
 drivers/bcm570x_lm.h |  207 +-
 drivers/bcm570x_mm.h |   58 +-
 drivers/dm9000x.c    |   15 +
 drivers/rtl8139.c    |    7 +
 drivers/tigon3.c     | 9697 
++++++++++++++++++++++++--------------------------
 drivers/tigon3.h     | 3759 ++++++++++----------
 drivers/tsec.c       |   48 +
 include/net.h        |   34 +-
 net/bootp.c          |    2 +
 net/eth.c            |   45 +
 net/net.c            |    8 +
 net/tftp.c           |  238 ++-
 14 files changed, 8076 insertions(+), 8379 deletions(-)

[U-Boot-Users] Pull Request: u-boot-net

[Wolfgang Denk]

Dear Ben,

in message <46C12E13.5040205@qstreams.com> you wrote:
> 
> Please pull from u-boot-net.  I merged with mainline tonight, so 
> hopefully everything's up-to-date.  I'm sure you'll let me know if 
> anything's amiss.

Done.

There were a few files with trailing white space  (drivers/rtl8139.c,
net/eth.c, net/net.c, net/tftp.c). I fixed these.

Best regards,

Wolfgang Denk

-- 
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
Anyone who doesn't believe in miracles is not a realist.
                                                   - David Ben Gurion

[U-Boot-Users] Pull Request: u-boot-net

[Ben Warren]

Wolfgang Denk wrote:
> Dear Ben,
>
> in message <46C12E13.5040205@qstreams.com> you wrote:
>   
>> Please pull from u-boot-net.  I merged with mainline tonight, so 
>> hopefully everything's up-to-date.  I'm sure you'll let me know if 
>> anything's amiss.
>>     
>
> Done.
>
> There were a few files with trailing white space  (drivers/rtl8139.c,
> net/eth.c, net/net.c, net/tftp.c). I fixed these.
>
> Best regards,
>
> Wolfgang Denk
>
>   
Thanks. I used the --whitespace=strip option in git-am, so am a bit 
curious how this happened.

regards,
Ben

[U-Boot-Users] Pull request: u-boot-net

[Ben Warren]

Wolfgang,

Please pull from the net repo:

The following changes since commit 2c8d41969b47eb0b973912830c58689b2ba0e50a:
  Wolfgang Denk (1):
        Merge branch 'master' of git://git.denx.de/u-boot-testing

are available in the git repository at:

  git://www.denx.de/git/u-boot-net.git master

Jens Gehrlein (1):
      smc911x: add 16 bit support

Ron Madrid (1):
      Add Marvell 88E1118 support for TSEC

TsiChung Liew (1):
      ColdFire: Add 10 base ethernet support for mcf5445x

Wolfgang Grandegger (1):
      E1000: Add support for the 82541GI LF Intel Pro 1000 GT Desktop 
Adapter

 README                |   15 +++++++++++++++
 drivers/net/e1000.c   |    2 ++
 drivers/net/e1000.h   |    3 ++-
 drivers/net/mcffec.c  |    6 ++++++
 drivers/net/smc911x.c |   21 +++++++++++++++++++--
 drivers/net/tsec.c    |   31 +++++++++++++++++++++++++++++++
 include/pci_ids.h     |    3 ++-
 7 files changed, 77 insertions(+), 4 deletions(-)

[U-Boot-Users] Pull request: u-boot-net

[Ben Warren]

Wolfgang,

Ben Warren wrote:
> Wolfgang,
>
> Please pull from the net repo:
>
> The following changes since commit 
> 2c8d41969b47eb0b973912830c58689b2ba0e50a:
>  Wolfgang Denk (1):
>        Merge branch 'master' of git://git.denx.de/u-boot-testing
>
> are available in the git repository at:
>
>  git://www.denx.de/git/u-boot-net.git master
>
Please hold off on pulling this.  I made a git error on further 
submissions and need to fix it.

regards,
Ben

[U-Boot-Users] Pull request: u-boot-net

[Ben Warren]

Ben Warren wrote:
> Wolfgang,
>
> Ben Warren wrote:
>> Wolfgang,
>>
>> Please pull from the net repo:
>>
>> The following changes since commit 
>> 2c8d41969b47eb0b973912830c58689b2ba0e50a:
>>  Wolfgang Denk (1):
>>        Merge branch 'master' of git://git.denx.de/u-boot-testing
>>
>> are available in the git repository at:
>>
>>  git://www.denx.de/git/u-boot-net.git master
>>
> Please hold off on pulling this.  I made a git error on further 
> submissions and need to fix it.
>
> regards,
> Ben
>
It's OK now.  Please pull.

regards,
Ben

[U-Boot-Users] Pull request: u-boot-net

[Wolfgang Denk]

In message <484CD13C.2020208@gmail.com> you wrote:
>
> >> Please pull from the net repo:
> >>
> >> The following changes since commit 
> >> 2c8d41969b47eb0b973912830c58689b2ba0e50a:
> >>  Wolfgang Denk (1):
> >>        Merge branch 'master' of git://git.denx.de/u-boot-testing
> >>
> >> are available in the git repository at:
> >>
> >>  git://www.denx.de/git/u-boot-net.git master
...
> It's OK now.  Please pull.

Applied, thanks.

Best regards,

Wolfgang Denk

-- 
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
Beware of the Turing Tar-pit in  which  everything  is  possible  but
nothing of interest is easy.