From mboxrd@z Thu Jan 1 00:00:00 1970 From: Heiko Schocher Date: Thu, 17 Jul 2014 06:27:19 +0200 Subject: [U-Boot] [PATCH 1/3] mtd, spi: add MTD layer driver In-Reply-To: References: <1405323547-32588-1-git-send-email-hs@denx.de> <1405323547-32588-2-git-send-email-hs@denx.de> Message-ID: <53C750A7.7050502@denx.de> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de Hello Daniel, Am 16.07.2014 20:42, schrieb Daniel Schwierzeck: > Dear Heiko, > > 2014-07-14 9:39 GMT+02:00 Heiko Schocher: >> From: Daniel Schwierzeck >> >> 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