Re: [Qemu-devel] [Qemu-ppc] [PATCH 1/4] PPC: e500: rename mpc8544ds into generic file

[Alexander Graf]

On 02.07.2012, at 23:16, Scott Wood wrote:

> On 07/02/2012 04:08 PM, Alexander Graf wrote:
>> 
>> On 02.07.2012, at 23:07, Scott Wood wrote:
>> 
>>> On 07/02/2012 03:58 PM, Andreas Färber wrote:
>>>> Am 02.07.2012 22:32, schrieb Scott Wood:
>>>>> On 07/02/2012 12:06 PM, Scott Wood wrote:
>>>>>> On 07/02/2012 11:50 AM, Andreas Färber wrote:
>>>>>>> Am 28.06.2012 01:50, schrieb Scott Wood:
>>>>>>>> hw/ppc/Makefile.objs                   |    2 +-
>>>>>>>> hw/{ppce500_mpc8544ds.c => ppc/e500.c} |   16 ++++++++--------
>>>>>>>> 2 files changed, 9 insertions(+), 9 deletions(-)
>>>>>>>> rename hw/{ppce500_mpc8544ds.c => ppc/e500.c} (99%)
>>>>>>>> 
>>>>>>>> diff --git a/hw/ppc/Makefile.objs b/hw/ppc/Makefile.objs
>>>>>>>> index aa4bbeb..aa77f64 100644
>>>>>>>> --- a/hw/ppc/Makefile.objs
>>>>>>>> +++ b/hw/ppc/Makefile.objs
>>>>>>>> @@ -15,7 +15,7 @@ obj-$(CONFIG_PSERIES) += spapr_pci.o pci-hotplug.o 
>>>>>>>> spapr_iommu.o
>>>>>>>> obj-y += ppc4xx_devs.o ppc4xx_pci.o ppc405_uc.o ppc405_boards.o
>>>>>>>> obj-y += ppc440_bamboo.o
>>>>>>>> # PowerPC E500 boards
>>>>>>>> -obj-$(CONFIG_FDT) += ppce500_mpc8544ds.o mpc8544_guts.o ppce500_spin.o
>>>>>>>> +obj-$(CONFIG_FDT) += ppc/e500.o mpc8544_guts.o ppce500_spin.o
>>>>>>>> # PowerPC 440 Xilinx ML507 reference board.
>>>>>>>> obj-y += virtex_ml507.o
>>>>>>>> # PowerPC OpenPIC
>>>>>>> [snip]
>>>>>>> 
>>>>>>> The location seems perfect for the file and nicely simplifies the file
>>>>>>> name, but could we avoid ../ppc/ by doing:
>>>>>>> 
>>>>>>> obj-$(CONFIG_FDT) += e500.o
>>>>>>> 
>>>>>>> further down after the ../ prefix has been added for the legacy files?
>>>>>> 
>>>>>> Ah, didn't notice that down there.  Will fix.
>>>>> 
>>>>> Wait, how will appending ../ help with the ppc/ prefix?
>>>> 
>>>> hw/ppc/ is the current directory. Therefore a ../ prefix is added for
>>>> all hw/ files in obj-y last thing in the Makefile. Your patch thus
>>>> constructs the path hw/ppc/../ppc/e500.o. My suggestion was to simply
>>>> use hw/ppc/e500.o. :)
>>> 
>>> How is hw/ppc/e500.o better than ppc/e500.o?
>> 
>> If I read this correctly, he's suggesting "e500.o" :)
> 
> No, plain "e500.o" won't work no matter where you put it in the makefile
> (unless you add more global prefix setting).  I think he's suggesting
> that the plan is to eventually migrate to everything specifying its full
> path, though I don't see why.

Why wouldn't "e500.o" in hw/ppc/Makefile.objs work? I'd hope we traverse the 
target specific path first, no?


Alex