From: Scott Wood <scottwood@freescale.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH] Fix SPL build for non-ARM targets
Date: Wed, 9 Jan 2013 13:53:21 -0600 [thread overview]
Message-ID: <1357761201.18196.1@snotra> (raw)
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)
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
next prev parent reply other threads:[~2013-01-09 19:53 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-08 22:57 [U-Boot] [PATCH] Fix SPL build for non-ARM targets Albert ARIBAUD
2013-01-09 13:35 ` Tom Rini
2013-01-09 19:53 ` Scott Wood [this message]
2013-01-09 21:38 ` Tom Rini
2013-01-09 21:56 ` Scott Wood
2013-01-09 22:06 ` Scott Wood
2013-01-09 22:25 ` Tom Rini
2013-01-09 22:41 ` Scott Wood
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1357761201.18196.1@snotra \
--to=scottwood@freescale.com \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox