From mboxrd@z Thu Jan  1 00:00:00 1970
From: Scott Wood <scottwood@freescale.com>
Date: Wed, 9 Jan 2013 13:53:21 -0600
Subject: [U-Boot] [PATCH] Fix SPL build for non-ARM targets
In-Reply-To: <1357685840-15910-1-git-send-email-albert.u.boot@aribaud.net>
	(from albert.u.boot@aribaud.net on Tue Jan  8 16:57:20 2013)
References: <1357685840-15910-1-git-send-email-albert.u.boot@aribaud.net>
Message-ID: <1357761201.18196.1@snotra>
List-Id: <u-boot.lists.denx.de>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
To: u-boot@lists.denx.de

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