[U-Boot] [PATCH] Macronix MX25xx MTD SPI flash driver
Mike Frysinger
vapier at gentoo.org
Mon Apr 6 13:11:49 CEST 2009
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
More information about the U-Boot
mailing list