[U-Boot] [PATCH 3/5] x86: qemu: Wrap E1000 driver only when DM_PCI is not used

[Bin Meng]

Hi Simon,

On Tue, May 5, 2015 at 11:43 PM, Simon Glass <sjg at chromium.org> wrote:
> Hi Bin,
>
> On 5 May 2015 at 09:35, Bin Meng <bmeng.cn at gmail.com> wrote:
>> Hi Simon,
>>
>> On Tue, May 5, 2015 at 11:24 PM, Bin Meng <bmeng.cn at gmail.com> wrote:
>>> E1000 driver has not been converted to driver model, so wrap it
>>> only when DM_PCI is not used.
>>>
>>> Signed-off-by: Bin Meng <bmeng.cn at gmail.com>
>>> ---
>>>
>>>  include/configs/qemu-x86.h | 2 ++
>>>  1 file changed, 2 insertions(+)
>>>
>>> diff --git a/include/configs/qemu-x86.h b/include/configs/qemu-x86.h
>>> index 463620d..281aaa5 100644
>>> --- a/include/configs/qemu-x86.h
>>> +++ b/include/configs/qemu-x86.h
>>> @@ -32,7 +32,9 @@
>>>  #define CONFIG_PCI_IO_SIZE             0xe000
>>>
>>>  #define CONFIG_PCI_PNP
>>> +#ifndef CONFIG_DM_PCI
>>>  #define CONFIG_E1000
>>
>> This is because E1000 driver is using pci_hose_phys_to_bus() API which
>> DM_PCI does not provide. Do you plan to fix this?
>
> That function can be moved to pci_compat.c to get things building.
>
> However I believe it does not work and I don't have hardware to test
> it. Do you have time to take a look?
>

Looks like moving it to pci_common.c can fix this and the driver still
works. I will send a v2 soon.

Regards,
Bin