From: Heiko Schocher <hs@denx.de>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH 1/3] mtd, spi: add MTD layer driver
Date: Thu, 17 Jul 2014 06:27:19 +0200 [thread overview]
Message-ID: <53C750A7.7050502@denx.de> (raw)
In-Reply-To: <CACUy__Xa4xnemxmGKZKjaUDuM3c5-nR1Qo9NTKf1P1ONWSJnfQ@mail.gmail.com>
Hello Daniel,
Am 16.07.2014 20:42, schrieb Daniel Schwierzeck:
> Dear Heiko,
>
> 2014-07-14 9:39 GMT+02:00 Heiko Schocher<hs@denx.de>:
>> From: Daniel Schwierzeck<daniel.schwierzeck@gmail.com>
>>
>> add MTD layer driver for spi, original patch from:
>> http://git.denx.de/?p=u-boot/u-boot-mips.git;a=commitdiff;h=bb246819cdc90493dd7089eaa51b9e639765cced
>>
>> changes from Heiko Schocher against this patch:
>> - remove compile error if not defining CONFIG_SPI_FLASH_MTD:
>
> thanks for picking up this patch
thanks for your work!
>> LD drivers/mtd/spi/built-in.o
>> drivers/mtd/spi/sf_probe.o: In function `spi_flash_mtd_unregister':
>> /home/hs/abb/imx6/u-boot/drivers/mtd/spi/sf_internal.h:168: multiple definition of `spi_flash_mtd_unregister'
>> drivers/mtd/spi/sf_params.o:/home/hs/abb/imx6/u-boot/drivers/mtd/spi/sf_internal.h:168: first defined here
>> drivers/mtd/spi/sf_ops.o: In function `spi_flash_mtd_unregister':
>> /home/hs/abb/imx6/u-boot/drivers/mtd/spi/sf_internal.h:168: multiple definition of `spi_flash_mtd_unregister'
>> drivers/mtd/spi/sf_params.o:/home/hs/abb/imx6/u-boot/drivers/mtd/spi/sf_internal.h:168: first defined here
>> make[1]: *** [drivers/mtd/spi/built-in.o] Fehler 1
>> make: *** [drivers/mtd/spi] Fehler 2
> ...
>> diff --git a/drivers/mtd/spi/sf_internal.h b/drivers/mtd/spi/sf_internal.h
>> index 6bcd522..c883d1d 100644
>> --- a/drivers/mtd/spi/sf_internal.h
>> +++ b/drivers/mtd/spi/sf_internal.h
>> @@ -156,4 +156,17 @@ int spi_flash_read_common(struct spi_flash *flash, const u8 *cmd,
>> int spi_flash_cmd_read_ops(struct spi_flash *flash, u32 offset,
>> size_t len, void *data);
>>
>> +#ifdef CONFIG_SPI_FLASH_MTD
>> +int spi_flash_mtd_register(struct spi_flash *flash);
>> +void spi_flash_mtd_unregister(void);
>> +#else
>> +static inline int spi_flash_mtd_register(struct spi_flash *flash)
>> +{
>> + return 0;
>> +}
>> +static __maybe_unused void spi_flash_mtd_unregister(void)
>> +{
>> +}
>> +#endif
>> +
>> #endif /* _SF_INTERNAL_H_ */
>
> there is a copy&paste error in the original patch. But the fix should
> be "static inline" rather than "static __maybe_unused"
Ah, thanks! Fixed this, MAKEALL started ...
bye,
Heiko
--
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
next prev parent reply other threads:[~2014-07-17 4:27 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-07-14 7:39 [U-Boot] [PATCH 0/3] spi, sf: add mtdparts feature to spi and sf commands Heiko Schocher
2014-07-14 7:39 ` [U-Boot] [PATCH 1/3] mtd, spi: add MTD layer driver Heiko Schocher
2014-07-16 18:42 ` Daniel Schwierzeck
2014-07-17 4:27 ` Heiko Schocher [this message]
2014-07-14 7:39 ` [U-Boot] [PATCH 2/3] mtd, nand: move common functions from cmd_nand.c to common place Heiko Schocher
2014-07-30 0:29 ` Scott Wood
2014-08-11 8:40 ` Heiko Schocher
2014-08-15 0:10 ` Scott Wood
2014-07-14 7:39 ` [U-Boot] [PATCH 3/3] spi, sf: use offset and size in sf cmd from mtdpartition Heiko Schocher
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=53C750A7.7050502@denx.de \
--to=hs@denx.de \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.