diff options
| author | Tom Rini <trini@konsulko.com> | 2025-05-26 16:07:19 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2025-05-26 16:07:19 -0600 |
| commit | 39b815d02d7ce6af32bcf023d20243c404b75a84 (patch) | |
| tree | 68cd13fa83e90f69bf8c989fbcde768b676eb6d7 /arch/arm/mach-imx/spl_imx_romapi.c | |
| parent | bab54f5942c428be698216224fd10b91d974d4da (diff) | |
| parent | 2ca1398a5ece8d33d8feb6b410e6e38588b5d2bc (diff) | |
Merge tag 'v2025.07-rc3' into next
Prepare v2025.07-rc3
Diffstat (limited to 'arch/arm/mach-imx/spl_imx_romapi.c')
| -rw-r--r-- | arch/arm/mach-imx/spl_imx_romapi.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/arch/arm/mach-imx/spl_imx_romapi.c b/arch/arm/mach-imx/spl_imx_romapi.c index 3982f4cca18..b7008df8e35 100644 --- a/arch/arm/mach-imx/spl_imx_romapi.c +++ b/arch/arm/mach-imx/spl_imx_romapi.c @@ -35,12 +35,10 @@ ulong __weak spl_romapi_get_uboot_base(u32 image_offset, u32 rom_bt_dev) { u32 sector = 0; - /* - * Some boards use this value even though MMC is not enabled in SPL, for - * example imx8mn_bsh_smm_s2 - */ -#ifdef CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR +#if IS_ENABLED(CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR) sector = CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR; +#elif IS_ENABLED(CONFIG_SPL_NAND_RAW_U_BOOT_USE_SECTOR) + sector = CONFIG_SPL_NAND_RAW_U_BOOT_SECTOR; #endif return image_offset + sector * 512 - 0x8000; |