[U-Boot] Fix SPL build for non-ARM targets

Submitted by Albert ARIBAUD on Jan. 8, 2013, 10:57 p.m.

Details

Message ID 1357685840-15910-1-git-send-email-albert.u.boot@aribaud.net
State Accepted
Delegated to: Tom Rini
Headers show

Commit Message

Albert ARIBAUD Jan. 8, 2013, 10:57 p.m.
Signed-off-by: Albert ARIBAUD <albert.u.boot@aribaud.net>
---
 drivers/mtd/nand/Makefile |    4 ++++
 1 file changed, 4 insertions(+)

Comments

Tom Rini Jan. 9, 2013, 1:35 p.m.
On Tue, Jan 08, 2013 at 11:57:20PM +0100, Albert ARIBAUD wrote:

> Signed-off-by: Albert ARIBAUD <albert.u.boot@aribaud.net>
> ---
>  drivers/mtd/nand/Makefile |    4 ++++
>  1 file changed, 4 insertions(+)
> 
> diff --git a/drivers/mtd/nand/Makefile b/drivers/mtd/nand/Makefile
> index 2c3812c..c77c0c4 100644
> --- a/drivers/mtd/nand/Makefile
> +++ b/drivers/mtd/nand/Makefile
> @@ -79,6 +79,10 @@ COBJS-$(CONFIG_TEGRA_NAND) += tegra_nand.o
>  COBJS-$(CONFIG_NAND_OMAP_GPMC) += omap_gpmc.o
>  COBJS-$(CONFIG_NAND_PLAT) += nand_plat.o
>  
> +else  # minimal SPL drivers
> +
> +COBJS-$(CONFIG_NAND_FSL_ELBC) += fsl_elbc_spl.o
> +
>  endif # drivers
>  endif # nand

Applied to u-boot/master, thanks!
Scott Wood Jan. 9, 2013, 7:53 p.m.
On 01/08/2013 04:57:20 PM, Albert ARIBAUD wrote:
> 
> Signed-off-by: Albert ARIBAUD <albert.u.boot@aribaud.net>
> ---
>  drivers/mtd/nand/Makefile |    4 ++++
>  1 file changed, 4 insertions(+)
> 
> diff --git a/drivers/mtd/nand/Makefile b/drivers/mtd/nand/Makefile
> index 2c3812c..c77c0c4 100644
> --- a/drivers/mtd/nand/Makefile
> +++ b/drivers/mtd/nand/Makefile
> @@ -79,6 +79,10 @@ COBJS-$(CONFIG_TEGRA_NAND) += tegra_nand.o
>  COBJS-$(CONFIG_NAND_OMAP_GPMC) += omap_gpmc.o
>  COBJS-$(CONFIG_NAND_PLAT) += nand_plat.o
> 
> +else  # minimal SPL drivers
> +
> +COBJS-$(CONFIG_NAND_FSL_ELBC) += fsl_elbc_spl.o
> +
>  endif # drivers
>  endif # nand

So, it looks like this is repairing breakage that came in through a  
manual merge resolution.  Should such merge resolutions not be posted  
to the list for review?  Or was it posted and I missed it?

-Scott
Tom Rini Jan. 9, 2013, 9:38 p.m.
On Wed, Jan 09, 2013 at 01:53:21PM -0600, Scott Wood wrote:
> On 01/08/2013 04:57:20 PM, Albert ARIBAUD wrote:
> >
> >Signed-off-by: Albert ARIBAUD <albert.u.boot@aribaud.net>
> >---
> > drivers/mtd/nand/Makefile |    4 ++++
> > 1 file changed, 4 insertions(+)
> >
> >diff --git a/drivers/mtd/nand/Makefile b/drivers/mtd/nand/Makefile
> >index 2c3812c..c77c0c4 100644
> >--- a/drivers/mtd/nand/Makefile
> >+++ b/drivers/mtd/nand/Makefile
> >@@ -79,6 +79,10 @@ COBJS-$(CONFIG_TEGRA_NAND) += tegra_nand.o
> > COBJS-$(CONFIG_NAND_OMAP_GPMC) += omap_gpmc.o
> > COBJS-$(CONFIG_NAND_PLAT) += nand_plat.o
> >
> >+else  # minimal SPL drivers
> >+
> >+COBJS-$(CONFIG_NAND_FSL_ELBC) += fsl_elbc_spl.o
> >+
> > endif # drivers
> > endif # nand
> 
> So, it looks like this is repairing breakage that came in through a
> manual merge resolution.  Should such merge resolutions not be
> posted to the list for review?  Or was it posted and I missed it?

None of the above.  That powerpc was broken twice (once by this, and
once by the arm head.S changes) was missed in my build testing.  We
don't have spelled out rules (that I'm aware of) for manual merges other
than asking that someone check that X still works (in this case, am335x
NAND).  It did, but I didn't read the merge myself was the problem.

Patch hide | download patch | download mbox

diff --git a/drivers/mtd/nand/Makefile b/drivers/mtd/nand/Makefile
index 2c3812c..c77c0c4 100644
--- a/drivers/mtd/nand/Makefile
+++ b/drivers/mtd/nand/Makefile
@@ -79,6 +79,10 @@  COBJS-$(CONFIG_TEGRA_NAND) += tegra_nand.o
 COBJS-$(CONFIG_NAND_OMAP_GPMC) += omap_gpmc.o
 COBJS-$(CONFIG_NAND_PLAT) += nand_plat.o
 
+else  # minimal SPL drivers
+
+COBJS-$(CONFIG_NAND_FSL_ELBC) += fsl_elbc_spl.o
+
 endif # drivers
 endif # nand