From mboxrd@z Thu Jan 1 00:00:00 1970 From: Mike Frysinger Date: Mon, 6 Apr 2009 07:11:49 -0400 Subject: [U-Boot] [PATCH] Macronix MX25xx MTD SPI flash driver In-Reply-To: <1239033283-26144-1-git-send-email-prafulla@marvell.com> References: <1239033283-26144-1-git-send-email-prafulla@marvell.com> Message-ID: <200904060711.50104.vapier@gentoo.org> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de 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