diff options
| author | Tom Rini <trini@konsulko.com> | 2025-04-16 08:12:30 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2025-04-16 08:12:30 -0600 |
| commit | da4dd9ed7a97652c142f34662113535d1843031d (patch) | |
| tree | 4839e599e796efd52637181275247af6b704435d /cmd | |
| parent | 5b4ae0f3f040908602c80908c3023b5454883d4a (diff) | |
| parent | 9af45190d6dbe4d7369c01c34b6fe40dc00d8663 (diff) | |
Merge tag 'u-boot-marvell-20250516' of https://source.denx.de/u-boot/custodians/u-boot-marvell
CI: https://dev.azure.com/sr0718/u-boot/_build/results?buildId=390&view=results
- mvebu_espressobin_ultra-88f3720_defconfig: disable SATA
- helios4: enable ddr odt0 on write for both chip-select
- clearfog,helios4: disable sdhci sdma
- mvebu/bubt: Correct usage of IS_ENABLED() macro
- mvebu: Correct SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR usage
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/mvebu/bubt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cmd/mvebu/bubt.c b/cmd/mvebu/bubt.c index 5e4ffc40d72..6b7d9ee061d 100644 --- a/cmd/mvebu/bubt.c +++ b/cmd/mvebu/bubt.c @@ -931,7 +931,7 @@ static int check_image_header(void) size = le32_to_cpu(hdr->blocksize); if (hdr->blockid == 0x78) { /* SATA id */ - struct blk_desc *blk_dev = IS_ENABLED(BLK) ? blk_get_devnum_by_uclass_id(UCLASS_SCSI, 0) : NULL; + struct blk_desc *blk_dev = IS_ENABLED(CONFIG_BLK) ? blk_get_devnum_by_uclass_id(UCLASS_SCSI, 0) : NULL; unsigned long blksz = blk_dev ? blk_dev->blksz : 512; offset *= blksz; } |