[U-Boot] [PATCH v3] net: axi_ethernet: Add driver to u-boot

[Michal Simek]

Dear Wolfgang Denk,


> In message <1316094617-13657-1-git-send-email-monstr at monstr.eu> you wrote:
>> Add axi_ethernet driver for little-endian Microblaze.
>>
>> RX/TX BDs and rxframe buffer are shared among all axi_ethernet MACs.
>> Only one MAC can work in one time.
>>
>> Signed-off-by: Michal Simek <monstr at monstr.eu>
>>
>> ---
>>
>> v2: Fix cammelcase weirdness
>>     Create mdio_wait function with timeouts
>>     Synchronize debug messages
>>     Remove base address + offset notation -> use struct instead
>>
>> v3: Fix comments
>>     Add timeouts/delays to waiting loops
>>     Use in/out_be32 for dma accesses
>>     Setup return values for phy functions
>> ---
>>  drivers/net/Makefile          |    1 +
>>  drivers/net/xilinx_axi_emac.c |  664 +++++++++++++++++++++++++++++++++++++++++
>>  include/netdev.h              |    2 +
>>  3 files changed, 667 insertions(+), 0 deletions(-)
>>  create mode 100644 drivers/net/xilinx_axi_emac.c
> 
> This fails to apply:
> 
> Applying: net: axi_ethernet: Add driver to u-boot
> fatal: sha1 information is lacking or useless (include/netdev.h).
> Repository lacks necessary blobs to fall back on 3-way merge.
> Cannot fall back to three-way merge.
> Patch failed at 0001 net: axi_ethernet: Add driver to u-boot
> When you have resolved this problem run "git am --resolved".
> If you would prefer to skip this patch, instead run "git am --skip".
> To restore the original branch and stop patching run "git am --abort".
> 
> 
> Please fix and resubmit.

Have resent v4.

Thanks,
Michal


-- 
Michal Simek, Ing. (M.Eng)
w: www.monstr.eu p: +42-0-721842854
Maintainer of Linux kernel 2.6 Microblaze Linux - http://www.monstr.eu/fdt/
Microblaze U-BOOT custodian