On Tuesday 11 April 2023 14:33:31 Stefan Roese wrote: > Hi Pali, > > On 3/29/23 21:25, Pali Rohár wrote: > > Find SATA block device by blk_get_devnum_by_uclass_id() function and read > > from it the real block size of the SATA disk. > > > > Signed-off-by: Pali Rohár <p...@kernel.org> > > --- > > cmd/mvebu/bubt.c | 7 +++++-- > > 1 file changed, 5 insertions(+), 2 deletions(-) > > > > diff --git a/cmd/mvebu/bubt.c b/cmd/mvebu/bubt.c > > index 49797b23144b..bbe9851dfdeb 100644 > > --- a/cmd/mvebu/bubt.c > > +++ b/cmd/mvebu/bubt.c > > @@ -925,8 +925,11 @@ static int check_image_header(void) > > offset = le32_to_cpu(hdr->srcaddr); > > size = le32_to_cpu(hdr->blocksize); > > - if (hdr->blockid == 0x78) /* SATA id */ > > - offset *= 512; > > + if (hdr->blockid == 0x78) { /* SATA id */ > > + struct blk_desc *blk_dev = > > blk_get_devnum_by_uclass_id(UCLASS_SCSI, 0); > > A CI world build leads to this error for some targets. Here the log > for "maxbcm_defconfig": > > /opt/kernel.org/gcc-12.2.0-nolibc/arm-linux-gnueabi/bin/arm-linux-gnueabi-ld.bfd: > cmd/mvebu/bubt.o: in function `check_image_header': > /home/stefan/git/u-boot/u-boot-marvell/cmd/mvebu/bubt.c:928: undefined > reference to `blk_get_devnum_by_uclass_id' > make: *** [Makefile:1757: u-boot] Error 1 > > Could you please take a look?
Ok, I looked at it. Issue is that this board does not have enabled CONFIG_BLK which exports blk_get_devnum_by_uclass_id symbol. Probably this board does not have SATA at all, so any SATA related code is not relevant for it. I'm sending v2 patch with fixup to call blk_get_devnum_by_uclass_id() function only in case we have config BLK enabled. > Thanks, > Stefan > > > + unsigned long blksz = blk_dev ? blk_dev->blksz : 512; > > + offset *= blksz; > > + } > > if (offset % 4 != 0 || size < 4 || size % 4 != 0) { > > printf("Error: Bad A38x image blocksize.\n"); > > Viele Grüße, > Stefan Roese > > -- > DENX Software Engineering GmbH, Managing Director: Erika Unter > HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany > Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: s...@denx.de