From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Schwierzeck Date: Tue, 8 Jan 2019 17:14:44 +0100 Subject: [U-Boot] [PATCH 1/2] mmc: Use proper IS_ENABLED macro to check block support In-Reply-To: <20190107211325.13526-1-ezequiel@collabora.com> References: <20190107211325.13526-1-ezequiel@collabora.com> Message-ID: <8f7ebc9a-a9ba-3291-2269-c7bc1cb38397@gmail.com> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de Am 07.01.19 um 22:13 schrieb Ezequiel Garcia: > Use CONFIG_IS_ENABLED(BLK) instead of CONFIG_BLK, > in order to fix the following build issues when > CONFIG_SPL_MMC_WRITE is selected: > > drivers/mmc/mmc_write.c:69:7: error: conflicting types for 'mmc_berase' > ulong mmc_berase(struct udevice *dev, lbaint_t start, lbaint_t blkcnt) > ^~~~~~~~~~ > In file included from drivers/mmc/mmc_write.c:15:0: > drivers/mmc/mmc_private.h:39:7: note: previous declaration of 'mmc_berase' was here > ulong mmc_berase(struct blk_desc *block_dev, lbaint_t start, lbaint_t blkcnt); > ^~~~~~~~~~ > drivers/mmc/mmc_write.c:187:7: error: conflicting types for 'mmc_bwrite' > ulong mmc_bwrite(struct udevice *dev, lbaint_t start, lbaint_t blkcnt, > ^~~~~~~~~~ > In file included from drivers/mmc/mmc_write.c:15:0: > drivers/mmc/mmc_private.h:37:7: note: previous declaration of 'mmc_bwrite' was here > ulong mmc_bwrite(struct blk_desc *block_dev, lbaint_t start, lbaint_t blkcnt, > ^~~~~~~~~~ > > Signed-off-by: Ezequiel Garcia > --- > drivers/mmc/mmc_write.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > Reviewed-by: Daniel Schwierzeck -- - Daniel