| Message ID | 20120627235055.GA9149@tyr.buserror.net |
|---|---|
| State | New |
| Headers | show |
Hi Scott, Am 28.06.2012 01:50, schrieb Scott Wood: > Rename the file (with no changes other than fixing up the header paths) > in preparation for refactoring into a generic e500 platform. Also move > it into the newly created ppc/ directory. > > Signed-off-by: Scott Wood <scottwood@freescale.com> > --- > 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? Also a heads-up that I have some ppce500_pci.c cleanups upcoming for pci_host v3 series. I avoided touching the machine, so I don't see any conflicts with your refactoring. Regards, Andreas
On 07/02/2012 11:50 AM, Andreas Färber wrote: > Hi Scott, > > Am 28.06.2012 01:50, schrieb Scott Wood: >> Rename the file (with no changes other than fixing up the header paths) >> in preparation for refactoring into a generic e500 platform. Also move >> it into the newly created ppc/ directory. >> >> Signed-off-by: Scott Wood <scottwood@freescale.com> >> --- >> 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. -Scott
On 07/02/2012 12:06 PM, Scott Wood wrote: > On 07/02/2012 11:50 AM, Andreas Färber wrote: >> Hi Scott, >> >> Am 28.06.2012 01:50, schrieb Scott Wood: >>> Rename the file (with no changes other than fixing up the header paths) >>> in preparation for refactoring into a generic e500 platform. Also move >>> it into the newly created ppc/ directory. >>> >>> Signed-off-by: Scott Wood <scottwood@freescale.com> >>> --- >>> 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? -Scott
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. :) Andreas
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? -Scott
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" :) Alex
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. -Scott
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
On 07/02/2012 04:17 PM, Alexander Graf wrote: > > 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: >>> >>>> 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? Sigh, my fault for trying to read a makefile on short sleep. I hadn't paid enough attention to exactly what that addprefix was doing. :-P Will fix. -Scott
Il 02/07/2012 23:17, Alexander Graf ha scritto: >>> 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? Not sure about the question... the idea is to abolish vpath and rely only on the path to the current Makefile.objs file. So, e500.o in hw/ppc/Makefile.objs, after the addsuffix would compile to hw/ppc/e500.o e500.o in hw/ppc/Makefile.objs, before the addsuffix would compile to hw/ppc/../e500.o aka hw/e500.o e500.o in hw/Makefile.objs would compile to hw/e500.o There is no conflict between hw/e500.o and hw/ppc/e500.o, but of course if you specify hw/e500.o twice (one normally, one via hw/ppc/..) you get duplicate definitions. Paolo
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 diff --git a/hw/ppce500_mpc8544ds.c b/hw/ppc/e500.c similarity index 99% rename from hw/ppce500_mpc8544ds.c rename to hw/ppc/e500.c index 8b9fd83..0b383e6 100644 --- a/hw/ppce500_mpc8544ds.c +++ b/hw/ppc/e500.c @@ -17,19 +17,19 @@ #include "config.h" #include "qemu-common.h" #include "net.h" -#include "hw.h" -#include "pc.h" -#include "pci.h" -#include "boards.h" +#include "hw/hw.h" +#include "hw/pc.h" +#include "hw/pci.h" +#include "hw/boards.h" #include "sysemu.h" #include "kvm.h" #include "kvm_ppc.h" #include "device_tree.h" -#include "openpic.h" -#include "ppc.h" -#include "loader.h" +#include "hw/openpic.h" +#include "hw/ppc.h" +#include "hw/loader.h" #include "elf.h" -#include "sysbus.h" +#include "hw/sysbus.h" #include "exec-memory.h" #include "host-utils.h"
Rename the file (with no changes other than fixing up the header paths) in preparation for refactoring into a generic e500 platform. Also move it into the newly created ppc/ directory. Signed-off-by: Scott Wood <scottwood@freescale.com> --- 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%)