diff options
author | Tom Rini <trini@konsulko.com> | 2023-08-18 13:45:58 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2023-08-18 13:45:58 -0400 |
commit | 3881c9fbb7fdd98f6eae5cd33f7e9abe9455a585 (patch) | |
tree | 3522dea6d6e5bff9c2d9bcae8354e16223c5b518 /common/spl | |
parent | 14ba0a8bbc342a677982acc787ae542b84ed7993 (diff) | |
parent | 48f792e31b88343bfccbaf73808e3d02a2be90dc (diff) |
Merge branch '2023-08-18-assorted-updates' into next
- Use built-in ffs/fls on ARM, fix a PIE issue in SPL on ARMv8, bcm283x
and mediatek updates, whitespace fix in UFS uclass, make CI use
"tools-only" defconfig for more tests, add TI TCA9554 GPIO support,
cache alignment fix for SCSI, and fix a problem with
SYS_MMCSD_RAW_MODE_ARGS_SECTOR in SPL.
Diffstat (limited to 'common/spl')
-rw-r--r-- | common/spl/spl_mmc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/common/spl/spl_mmc.c b/common/spl/spl_mmc.c index a665091b00..20f687e138 100644 --- a/common/spl/spl_mmc.c +++ b/common/spl/spl_mmc.c @@ -229,7 +229,7 @@ static int mmc_load_image_raw_os(struct spl_image_info *spl_image, { int ret; -#if CONFIG_VAL(SYS_MMCSD_RAW_MODE_ARGS_SECTOR) +#if defined(CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR) unsigned long count; count = blk_dread(mmc_get_blk_desc(mmc), |