From: Mike Frysinger <vapier@gentoo.org>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH] Macronix MX25xx MTD SPI flash driver
Date: Mon, 6 Apr 2009 07:11:49 -0400 [thread overview]
Message-ID: <200904060711.50104.vapier@gentoo.org> (raw)
In-Reply-To: <1239033283-26144-1-git-send-email-prafulla@marvell.com>
On Monday 06 April 2009 11:54:43 Prafulla Wadaskar wrote:
> --- a/drivers/mtd/spi/Makefile
> +++ b/drivers/mtd/spi/Makefile
> @@ -27,6 +27,7 @@ LIB := $(obj)libspi_flash.a
>
> COBJS-$(CONFIG_SPI_FLASH) += spi_flash.o
> COBJS-$(CONFIG_SPI_FLASH_ATMEL) += atmel.o
> +COBJS-$(CONFIG_SPI_FLASH_MACRONIX) += macronix.o
> COBJS-$(CONFIG_SPI_FLASH_STMICRO) += stmicro.o
when submitting patches, you should be developing them against mainline, not
something older. trying to merge this patch would result in conflicts because
this file has changed here.
> +static int macronix_wait_ready(struct spi_flash *flash, unsigned long
> ...
> + if (ret) {
> + debug("SF: Failed to send command %02x: %d\n", cmd[0], ret);
looks like you forgot to change "cmd[0]" to "cmd"
since these are trivial and i'm in a good mood, i'll go ahead and fix up the
conflicts and add them to my sf branch. but in the future please make sure to
integrate these methodologies.
-mike
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: This is a digitally signed message part.
Url : http://lists.denx.de/pipermail/u-boot/attachments/20090406/4694e050/attachment.pgp
next prev parent reply other threads:[~2009-04-06 11:11 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-04-06 15:54 [U-Boot] [PATCH] Macronix MX25xx MTD SPI flash driver Prafulla Wadaskar
2009-04-06 10:46 ` Prafulla Wadaskar
2009-04-06 11:04 ` Mike Frysinger
2009-04-06 11:17 ` Prafulla Wadaskar
2009-04-06 11:11 ` Mike Frysinger [this message]
2009-04-06 18:15 ` Wolfgang Denk
2009-04-06 21:48 ` Mike Frysinger
2009-04-06 11:17 ` Mike Frysinger
2009-04-06 18:13 ` Wolfgang Denk
-- strict thread matches above, loose matches on Subject: below --
2009-04-03 11:49 [U-Boot] [PATCH] debug_print macros support Prafulla Wadaskar
2009-04-03 11:49 ` [U-Boot] [PATCH] bin_dep.sh Support Prafulla Wadaskar
2009-04-03 11:49 ` [U-Boot] [PATCH] Macronix MX25xx MTD SPI flash driver Prafulla Wadaskar
2009-04-03 14:14 ` Mike Frysinger
2009-04-06 7:23 ` Prafulla Wadaskar
2009-04-06 7:39 ` Mike Frysinger
2009-04-06 8:27 ` Prafulla Wadaskar
2009-04-06 8:49 ` Mike Frysinger
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=200904060711.50104.vapier@gentoo.org \
--to=vapier@gentoo.org \
--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