Message ID | 20120709140429.GA25506@tyr.buserror.net |
---|---|
State | New |
Headers | show |
Am 09.07.2012 16:04, schrieb Scott Wood: > Recent patches "PPC: e500: rename mpc8544ds into generic file", "PPC: > e500: split mpc8544ds machine from generic e500 code", and "PPC: e500: > add generic e500 platform" moved certain e500-related files to the bottom > of the makefile because they're now in ppc/, but the dependency on > CONFIG_FDT was accidentally dropped. This broke the build when FDT > support is not enabled. > > Signed-off-by: Scott Wood <scottwood@freescale.com> Reviewed-by: Andreas Färber <afaerber@suse.de> But this can probably still be squashed into the original patches for bisectability I hope? Andreas > --- > hw/ppc/Makefile.objs | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/hw/ppc/Makefile.objs b/hw/ppc/Makefile.objs > index 81bcc72..951e407 100644 > --- a/hw/ppc/Makefile.objs > +++ b/hw/ppc/Makefile.objs > @@ -27,4 +27,4 @@ obj-y += xilinx_ethlite.o > > obj-y := $(addprefix ../,$(obj-y)) > > -obj-y += e500.o mpc8544ds.o e500plat.o > +obj-$(CONFIG_FDT) += e500.o mpc8544ds.o e500plat.o >
On 07/09/2012 09:07 AM, Andreas Färber wrote: > Am 09.07.2012 16:04, schrieb Scott Wood: >> Recent patches "PPC: e500: rename mpc8544ds into generic file", "PPC: >> e500: split mpc8544ds machine from generic e500 code", and "PPC: e500: >> add generic e500 platform" moved certain e500-related files to the bottom >> of the makefile because they're now in ppc/, but the dependency on >> CONFIG_FDT was accidentally dropped. This broke the build when FDT >> support is not enabled. >> >> Signed-off-by: Scott Wood <scottwood@freescale.com> > > Reviewed-by: Andreas Färber <afaerber@suse.de> > > But this can probably still be squashed into the original patches for > bisectability I hope? OK, wasn't sure what the rebase policy was once the patch is in a maintainer tree. Alex, do you want me to resend the original patchset with the fix squashed? -Scott
On 09.07.2012, at 16:36, Scott Wood wrote: > On 07/09/2012 09:07 AM, Andreas Färber wrote: >> Am 09.07.2012 16:04, schrieb Scott Wood: >>> Recent patches "PPC: e500: rename mpc8544ds into generic file", "PPC: >>> e500: split mpc8544ds machine from generic e500 code", and "PPC: e500: >>> add generic e500 platform" moved certain e500-related files to the bottom >>> of the makefile because they're now in ppc/, but the dependency on >>> CONFIG_FDT was accidentally dropped. This broke the build when FDT >>> support is not enabled. >>> >>> Signed-off-by: Scott Wood <scottwood@freescale.com> >> >> Reviewed-by: Andreas Färber <afaerber@suse.de> >> >> But this can probably still be squashed into the original patches for >> bisectability I hope? > > OK, wasn't sure what the rebase policy was once the patch is in a > maintainer tree. Alex, do you want me to resend the original patchset > with the fix squashed? No worries, I'll just squash it in myself. I keep my trees rebaseable. That heavily improves bisectability and as long as nobody complains, I'd like to keep it that way :). Alex
On 09.07.2012, at 16:04, Scott Wood wrote: > Recent patches "PPC: e500: rename mpc8544ds into generic file", "PPC: > e500: split mpc8544ds machine from generic e500 code", and "PPC: e500: > add generic e500 platform" moved certain e500-related files to the bottom > of the makefile because they're now in ppc/, but the dependency on > CONFIG_FDT was accidentally dropped. This broke the build when FDT > support is not enabled. > > Signed-off-by: Scott Wood <scottwood@freescale.com> Thanks, merged into the respective other patches. Alex
diff --git a/hw/ppc/Makefile.objs b/hw/ppc/Makefile.objs index 81bcc72..951e407 100644 --- a/hw/ppc/Makefile.objs +++ b/hw/ppc/Makefile.objs @@ -27,4 +27,4 @@ obj-y += xilinx_ethlite.o obj-y := $(addprefix ../,$(obj-y)) -obj-y += e500.o mpc8544ds.o e500plat.o +obj-$(CONFIG_FDT) += e500.o mpc8544ds.o e500plat.o
Recent patches "PPC: e500: rename mpc8544ds into generic file", "PPC: e500: split mpc8544ds machine from generic e500 code", and "PPC: e500: add generic e500 platform" moved certain e500-related files to the bottom of the makefile because they're now in ppc/, but the dependency on CONFIG_FDT was accidentally dropped. This broke the build when FDT support is not enabled. Signed-off-by: Scott Wood <scottwood@freescale.com> --- hw/ppc/Makefile.objs | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)