cmd: mvebu/bubt: a38x: Do not hardcode SATA block size to 512

Find SATA block device by blk_get_devnum_by_uclass_id() function and read
from it the real block size of the SATA disk. In case of error, fallback
back to 512 bytes.

Signed-off-by: Pali Rohár <pali@kernel.org>

diff --git a/cmd/mvebu/bubt.c b/cmd/mvebu/bubt.c
index 37ff9c455228805a01c1c8c2ed59a7673f87115a..ca24a5c1c4ba0a60ba3b99a3d831363c30e104a1 100644 (file)
--- a/cmd/mvebu/bubt.c
+++ b/cmd/mvebu/bubt.c
@@ -924,8 +924,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 = IS_ENABLED(BLK) ? blk_get_devnum_by_uclass_id(UCLASS_SCSI, 0) : NULL;
+               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");