| Message ID | 1531827206-16158-3-git-send-email-igor.opaniuk@linaro.org |
|---|---|
| State | Accepted |
| Commit | e9ee7398d64796d441067d5456b6e65780d11dbd |
| Headers | show |
| Series | avb2.0: fix multiple compilation issues in sandbox | expand |
On Tue, Jul 17, 2018 at 02:33:26PM +0300, Igor Opaniuk wrote: > Use blk_dread()/blk_dwrite() in mmc_read()/mmc_write() AVB operation > implementations. This fixes compilation issues when CONFIG_BLK is > enabled. > > Signed-off-by: Igor Opaniuk <igor.opaniuk@linaro.org> > --- > common/avb_verify.c | 9 +++++---- > 1 file changed, 5 insertions(+), 4 deletions(-) > > diff --git a/common/avb_verify.c b/common/avb_verify.c > index f9a00f8..20e35ad 100644 > --- a/common/avb_verify.c > +++ b/common/avb_verify.c > @@ -5,6 +5,7 @@ > */ > > #include <avb_verify.h> > +#include <blk.h> > #include <fastboot.h> > #include <image.h> > #include <malloc.h> > @@ -288,8 +289,8 @@ static unsigned long mmc_read_and_flush(struct mmc_part *part, > tmp_buf = buffer; > } > > - blks = part->mmc->block_dev.block_read(part->mmc_blk, > - start, sectors, tmp_buf); > + blks = blk_dread(part->mmc_blk, > + start, sectors, tmp_buf); > /* flush cache after read */ > flush_cache((ulong)tmp_buf, sectors * part->info.blksz); > > @@ -327,8 +328,8 @@ static unsigned long mmc_write(struct mmc_part *part, lbaint_t start, > tmp_buf = buffer; > } > > - return part->mmc->block_dev.block_write(part->mmc_blk, > - start, sectors, tmp_buf); > + return blk_dwrite(part->mmc_blk, > + start, sectors, tmp_buf); > } > > static struct mmc_part *get_partition(AvbOps *ops, const char *partition) > -- > 2.7.4 > I confirm this patch fixes below compilation failure on sandbox (LIBAVB=y, AVB_VERIFY=y, FASTBOOT=y, BLK=y): common/avb_verify.c: In function ‘mmc_read_and_flush’: common/avb_verify.c:291:18: error: ‘struct mmc’ has no member named ‘block_dev’ blks = part->mmc->block_dev.block_read(part->mmc_blk, ^~ common/avb_verify.c: In function ‘mmc_write’: common/avb_verify.c:330:18: error: ‘struct mmc’ has no member named ‘block_dev’ return part->mmc->block_dev.block_write(part->mmc_blk, With this patch, avb_verify compiles equally well with BLK=y and BLK=n. Tested-by: Eugeniu Rosca <rosca.eugeniu@gmail.com> Thanks, Eugeniu.
On Tue, Jul 17, 2018 at 02:33:26PM +0300, Igor Opaniuk wrote: > Use blk_dread()/blk_dwrite() in mmc_read()/mmc_write() AVB operation > implementations. This fixes compilation issues when CONFIG_BLK is > enabled. > > Signed-off-by: Igor Opaniuk <igor.opaniuk@linaro.org> > Tested-by: Eugeniu Rosca <rosca.eugeniu@gmail.com> Applied to u-boot/master, thanks! -- Tom
diff --git a/common/avb_verify.c b/common/avb_verify.c index f9a00f8..20e35ad 100644 --- a/common/avb_verify.c +++ b/common/avb_verify.c @@ -5,6 +5,7 @@ */ #include <avb_verify.h> +#include <blk.h> #include <fastboot.h> #include <image.h> #include <malloc.h> @@ -288,8 +289,8 @@ static unsigned long mmc_read_and_flush(struct mmc_part *part, tmp_buf = buffer; } - blks = part->mmc->block_dev.block_read(part->mmc_blk, - start, sectors, tmp_buf); + blks = blk_dread(part->mmc_blk, + start, sectors, tmp_buf); /* flush cache after read */ flush_cache((ulong)tmp_buf, sectors * part->info.blksz); @@ -327,8 +328,8 @@ static unsigned long mmc_write(struct mmc_part *part, lbaint_t start, tmp_buf = buffer; } - return part->mmc->block_dev.block_write(part->mmc_blk, - start, sectors, tmp_buf); + return blk_dwrite(part->mmc_blk, + start, sectors, tmp_buf); } static struct mmc_part *get_partition(AvbOps *ops, const char *partition)
Use blk_dread()/blk_dwrite() in mmc_read()/mmc_write() AVB operation implementations. This fixes compilation issues when CONFIG_BLK is enabled. Signed-off-by: Igor Opaniuk <igor.opaniuk@linaro.org> --- common/avb_verify.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)