Hi Marek, On 22 August 2015 at 10:48, Marek Vasut <[email protected]> wrote: > On Saturday, August 22, 2015 at 06:01:44 PM, Simon Glass wrote: >> Hi Marek, > > Hi! > >> On 22 August 2015 at 09:50, Marek Vasut <[email protected]> wrote: >> > On Saturday, August 22, 2015 at 03:40:26 PM, Simon Glass wrote: >> > >> > Hi! >> > >> > [...] >> > >> >> >> One way or another we'll figure this out sooner rather than later. >> >> > >> >> > I know :) >> >> >> >> Masahiro's series landed so I have applied this to u-boot-dm. >> >> >> >> Please check that it works as you expect. >> > >> > I think we're having a minor duplicity here now. Check the >> > >> > drivers/core/Makefile, there's this bit already: >> > obj-$(CONFIG_$(SPL_)OF_CONTROL) += simple-bus.o >> > >> > And since I have both CONFIG_OF_CONTROL and CONFIG_SPL_OF_CONTROL, I >> > get the simple bus driver as well. >> > >> > But I don't think that the current state is entirely correct. I propose >> > the remove the above obj-$(CONFIG_$(SPL_)OF_CONTROL) += simple-bus.o from >> > the Makefile to fix the duplicity and achieve the behavior you wanted to >> > have. What do you think please ? I can send a quick patch. >> >> Actually I think that is just a merge error that I made. Can you >> please check it now? > > I think the in drivers/core/Kconfig , the SPL_SIMPLE_BUS should now depend on > SPL_OF_CONTROL, not on OF_CONTROL, right ? :)
Ah yes that sounds right. Would you like to send a new patch against mainline? I think it is best to consider this a rewrite rather than a merge! Regards, Simon _______________________________________________ U-Boot mailing list [email protected] http://lists.denx.de/mailman/listinfo/u-boot
