diff options
| author | Pali Rohár <[email protected]> | 2023-04-11 20:35:51 +0200 |
|---|---|---|
| committer | Stefan Roese <[email protected]> | 2023-04-13 11:34:47 +0200 |
| commit | 4548b37a29035c1d946e86513b70029cb4dc08b4 (patch) | |
| tree | 10385cb825b47acb35962828247e6f232dd266fe /cmd/mvebu | |
| parent | fa06a6df65b7bf77c112aa3f83b3b62bf7790712 (diff) | |
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 <[email protected]>
Diffstat (limited to 'cmd/mvebu')
| -rw-r--r-- | cmd/mvebu/bubt.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/cmd/mvebu/bubt.c b/cmd/mvebu/bubt.c index 37ff9c45522..ca24a5c1c4b 100644 --- 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"); |