| Message ID | 1463256198-3829-19-git-send-email-sjg@chromium.org |
|---|---|
| State | Accepted |
| Commit | e419a3ec1aa3f094268976b6c10e9b636a97c64d |
| Delegated to: | Simon Glass |
| Headers | show |
On 14 May 2016 at 14:03, Simon Glass <sjg@chromium.org> wrote: > When these functions are not compiled in, we still need to declare the > correct function signature to avoid a build warnings in SPL. Fix this. > > Signed-off-by: Simon Glass <sjg@chromium.org> > --- > > drivers/mmc/mmc_private.h | 14 ++++++++++++++ > 1 file changed, 14 insertions(+) Applied to u-boot-dm.
diff --git a/drivers/mmc/mmc_private.h b/drivers/mmc/mmc_private.h index 27b9e5f..9f0d5c2 100644 --- a/drivers/mmc/mmc_private.h +++ b/drivers/mmc/mmc_private.h @@ -37,6 +37,19 @@ ulong mmc_bwrite(struct blk_desc *block_dev, lbaint_t start, lbaint_t blkcnt, /* SPL will never write or erase, declare dummies to reduce code size. */ +#ifdef CONFIG_BLK +static inline unsigned long mmc_berase(struct udevice *dev, + lbaint_t start, lbaint_t blkcnt) +{ + return 0; +} + +static inline ulong mmc_bwrite(struct udevice *dev, lbaint_t start, + lbaint_t blkcnt, const void *src) +{ + return 0; +} +#else static inline unsigned long mmc_berase(struct blk_desc *block_dev, lbaint_t start, lbaint_t blkcnt) { @@ -48,6 +61,7 @@ static inline ulong mmc_bwrite(struct blk_desc *block_dev, lbaint_t start, { return 0; } +#endif #endif /* CONFIG_SPL_BUILD */
When these functions are not compiled in, we still need to declare the correct function signature to avoid a build warnings in SPL. Fix this. Signed-off-by: Simon Glass <sjg@chromium.org> --- drivers/mmc/mmc_private.h | 14 ++++++++++++++ 1 file changed, 14 insertions(+)