| Message ID | 1342882947-9174-10-git-send-email-marex@denx.de |
|---|---|
| State | Accepted |
| Delegated to: | Tom Rini |
| Headers | show |
Dear Otavio Salvador, > On Sat, Jul 21, 2012 at 12:02 PM, Marek Vasut <marex@denx.de> wrote: > > This fixes the breakage with SPL on most OMAP boards after the GPIO > > driver was moved. > > It seems logical this to be merged on the GPIO move patch. Any reason > to not do that? This is rather a fix, maybe it should have been ordered before the GPIO move patch even. Best regards, Marek Vasut
On Sat, Jul 21, 2012 at 2:50 PM, Marek Vasut <marex@denx.de> wrote: > Dear Otavio Salvador, > >> On Sat, Jul 21, 2012 at 12:02 PM, Marek Vasut <marex@denx.de> wrote: >> > This fixes the breakage with SPL on most OMAP boards after the GPIO >> > driver was moved. >> >> It seems logical this to be merged on the GPIO move patch. Any reason >> to not do that? > > This is rather a fix, maybe it should have been ordered before the GPIO move > patch even. If it were working before it is not a fix ... but a required change for it to work. I usually prefer to have changes that allow for bisect to run fine and this might cause a build failure, as far as I can see...
Dear Otavio Salvador, > On Sat, Jul 21, 2012 at 2:50 PM, Marek Vasut <marex@denx.de> wrote: > > Dear Otavio Salvador, > > > >> On Sat, Jul 21, 2012 at 12:02 PM, Marek Vasut <marex@denx.de> wrote: > >> > This fixes the breakage with SPL on most OMAP boards after the GPIO > >> > driver was moved. > >> > >> It seems logical this to be merged on the GPIO move patch. Any reason > >> to not do that? > > > > This is rather a fix, maybe it should have been ordered before the GPIO > > move patch even. > > If it were working before it is not a fix ... but a required change > for it to work. > > I usually prefer to have changes that allow for bisect to run fine and > this might cause a build failure, as far as I can see... So let's reorder those patches so this goes before the GPIO move patch and be done with it. Best regards, Marek Vasut
On Sat, Jul 21, 2012 at 2:58 PM, Marek Vasut <marex@denx.de> wrote: >> On Sat, Jul 21, 2012 at 2:50 PM, Marek Vasut <marex@denx.de> wrote: >> > Dear Otavio Salvador, >> > >> >> On Sat, Jul 21, 2012 at 12:02 PM, Marek Vasut <marex@denx.de> wrote: >> >> > This fixes the breakage with SPL on most OMAP boards after the GPIO >> >> > driver was moved. >> >> >> >> It seems logical this to be merged on the GPIO move patch. Any reason >> >> to not do that? >> > >> > This is rather a fix, maybe it should have been ordered before the GPIO >> > move patch even. >> >> If it were working before it is not a fix ... but a required change >> for it to work. >> >> I usually prefer to have changes that allow for bisect to run fine and >> this might cause a build failure, as far as I can see... > > So let's reorder those patches so this goes before the GPIO move patch and be > done with it. Works for me. :-)
On Sat, Jul 21, 2012 at 05:02:27PM +0200, Marek Vasut wrote: > This fixes the breakage with SPL on most OMAP boards after the GPIO > driver was moved. > > Signed-off-by: Marek Vasut <marex@denx.de> > Cc: Wolfgang Denk <wd@denx.de> > Cc: Albert Aribaud <albert.u.boot@aribaud.net> > Cc: U-Boot DM <u-boot-dm@lists.denx.de> > Cc: Tom Rini <trini@ti.com> The change is fine so Acked-by: Tom Rini <trini@ti.com> But please re-order in the series so that there is no breakage. I do hate bisect failing run-time when we know we could have not :)
Dear Tom Rini, > On Sat, Jul 21, 2012 at 05:02:27PM +0200, Marek Vasut wrote: > > This fixes the breakage with SPL on most OMAP boards after the GPIO > > driver was moved. > > > > Signed-off-by: Marek Vasut <marex@denx.de> > > Cc: Wolfgang Denk <wd@denx.de> > > Cc: Albert Aribaud <albert.u.boot@aribaud.net> > > Cc: U-Boot DM <u-boot-dm@lists.denx.de> > > Cc: Tom Rini <trini@ti.com> > > The change is fine so > > Acked-by: Tom Rini <trini@ti.com> > > But please re-order in the series so that there is no breakage. I do > hate bisect failing run-time when we know we could have not :) Sure, if you can pick 10/10 first, 06/10 afterwards as we discussed on IRC, that'd be great. This is not really a series and I should have posted it as such, I admit. Best regards, Marek Vasut
On Tue, Jul 24, 2012 at 12:03:22AM +0200, Marek Vasut wrote: > Dear Tom Rini, > > > On Sat, Jul 21, 2012 at 05:02:27PM +0200, Marek Vasut wrote: > > > This fixes the breakage with SPL on most OMAP boards after the GPIO > > > driver was moved. > > > > > > Signed-off-by: Marek Vasut <marex@denx.de> > > > Cc: Wolfgang Denk <wd@denx.de> > > > Cc: Albert Aribaud <albert.u.boot@aribaud.net> > > > Cc: U-Boot DM <u-boot-dm@lists.denx.de> > > > Cc: Tom Rini <trini@ti.com> > > > > The change is fine so > > > > Acked-by: Tom Rini <trini@ti.com> > > > > But please re-order in the series so that there is no breakage. I do > > hate bisect failing run-time when we know we could have not :) > > Sure, if you can pick 10/10 first, 06/10 afterwards as we discussed on IRC, > that'd be great. This is not really a series and I should have posted it as > such, I admit. As we discussed, I've taken 10/10 and 06/10 (in that order to prevent build breakage) and applied to u-boot-ti/master. I also updated them trivially to deal with am335x also using the GPIO driver now.
Dear Tom Rini, > On Tue, Jul 24, 2012 at 12:03:22AM +0200, Marek Vasut wrote: > > Dear Tom Rini, > > > > > On Sat, Jul 21, 2012 at 05:02:27PM +0200, Marek Vasut wrote: > > > > This fixes the breakage with SPL on most OMAP boards after the GPIO > > > > driver was moved. > > > > > > > > Signed-off-by: Marek Vasut <marex@denx.de> > > > > Cc: Wolfgang Denk <wd@denx.de> > > > > Cc: Albert Aribaud <albert.u.boot@aribaud.net> > > > > Cc: U-Boot DM <u-boot-dm@lists.denx.de> > > > > Cc: Tom Rini <trini@ti.com> > > > > > > The change is fine so > > > > > > Acked-by: Tom Rini <trini@ti.com> > > > > > > But please re-order in the series so that there is no breakage. I do > > > hate bisect failing run-time when we know we could have not :) > > > > Sure, if you can pick 10/10 first, 06/10 afterwards as we discussed on > > IRC, that'd be great. This is not really a series and I should have > > posted it as such, I admit. > > As we discussed, I've taken 10/10 and 06/10 (in that order to prevent > build breakage) and applied to u-boot-ti/master. I also updated them > trivially to deal with am335x also using the GPIO driver now. Thanks Tom. btw we should cut the cross-list posting short ... Best regards, Marek Vasut
diff --git a/include/configs/devkit8000.h b/include/configs/devkit8000.h index e529099..1f44a42 100644 --- a/include/configs/devkit8000.h +++ b/include/configs/devkit8000.h @@ -315,6 +315,7 @@ #define CONFIG_SPL_I2C_SUPPORT #define CONFIG_SPL_LIBGENERIC_SUPPORT #define CONFIG_SPL_SERIAL_SUPPORT +#define CONFIG_SPL_GPIO_SUPPORT #define CONFIG_SPL_POWER_SUPPORT #define CONFIG_SPL_NAND_SUPPORT #define CONFIG_SPL_MMC_SUPPORT diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h index 382b791..cdcfbe0 100644 --- a/include/configs/omap3_beagle.h +++ b/include/configs/omap3_beagle.h @@ -421,6 +421,7 @@ #define CONFIG_SPL_FAT_SUPPORT #define CONFIG_SPL_SERIAL_SUPPORT #define CONFIG_SPL_NAND_SUPPORT +#define CONFIG_SPL_GPIO_SUPPORT #define CONFIG_SPL_POWER_SUPPORT #define CONFIG_SPL_OMAP3_ID_NAND #define CONFIG_SPL_LDSCRIPT "$(CPUDIR)/omap-common/u-boot-spl.lds" diff --git a/include/configs/omap3_overo.h b/include/configs/omap3_overo.h index f6afb7a..92bd8fc 100644 --- a/include/configs/omap3_overo.h +++ b/include/configs/omap3_overo.h @@ -326,6 +326,7 @@ #define CONFIG_SPL_FAT_SUPPORT #define CONFIG_SPL_SERIAL_SUPPORT #define CONFIG_SPL_NAND_SUPPORT +#define CONFIG_SPL_GPIO_SUPPORT #define CONFIG_SPL_POWER_SUPPORT #define CONFIG_SPL_LDSCRIPT "$(CPUDIR)/omap-common/u-boot-spl.lds" diff --git a/include/configs/omap4_common.h b/include/configs/omap4_common.h index bc73f21..6f298a1 100644 --- a/include/configs/omap4_common.h +++ b/include/configs/omap4_common.h @@ -279,6 +279,7 @@ #define CONFIG_SPL_FAT_SUPPORT #define CONFIG_SPL_LIBGENERIC_SUPPORT #define CONFIG_SPL_SERIAL_SUPPORT +#define CONFIG_SPL_GPIO_SUPPORT #define CONFIG_SPL_LDSCRIPT "$(CPUDIR)/omap-common/u-boot-spl.lds" #define CONFIG_SYS_THUMB_BUILD diff --git a/include/configs/tam3517-common.h b/include/configs/tam3517-common.h index 94006e7..24f6f7e 100644 --- a/include/configs/tam3517-common.h +++ b/include/configs/tam3517-common.h @@ -252,6 +252,7 @@ #define CONFIG_SPL_I2C_SUPPORT #define CONFIG_SPL_LIBGENERIC_SUPPORT #define CONFIG_SPL_SERIAL_SUPPORT +#define CONFIG_SPL_GPIO_SUPPORT #define CONFIG_SPL_POWER_SUPPORT #define CONFIG_SPL_NAND_SUPPORT #define CONFIG_SPL_LDSCRIPT "$(CPUDIR)/omap-common/u-boot-spl.lds"
This fixes the breakage with SPL on most OMAP boards after the GPIO driver was moved. Signed-off-by: Marek Vasut <marex@denx.de> Cc: Wolfgang Denk <wd@denx.de> Cc: Albert Aribaud <albert.u.boot@aribaud.net> Cc: U-Boot DM <u-boot-dm@lists.denx.de> Cc: Tom Rini <trini@ti.com> --- include/configs/devkit8000.h | 1 + include/configs/omap3_beagle.h | 1 + include/configs/omap3_overo.h | 1 + include/configs/omap4_common.h | 1 + include/configs/tam3517-common.h | 1 + 5 files changed, 5 insertions(+)