[PATCH] powerpc: mpc85xx: Fix incorrect application of patch

[Pali Rohár]

On Monday 19 September 2022 11:32:08 Marek Behún wrote:
> I messed up application of patch 5a428e751044 ("mmc: fsl_esdhc_spl: Add
> support for builds without CONFIG_SYS_MMC_U_BOOT_OFFS"). I took it from
> a work-in-progress branch where I changed usage of
>   CONFIG_SDCARD to CONFIG_SD_BOOT
> and refactored
>   SYS_MPC85XX_NO_RESETVEC
> mess.
> 
> But these changes aren't in master yet. Fix the wrong usage of these
> macros.
> 
> Fixes: 5a428e751044 ("mmc: fsl_esdhc_spl: Add support for builds without CONFIG_SYS_MMC_U_BOOT_OFFS")
> Signed-off-by: Marek Behún <kabel at kernel.org>

Reviewed-by: Pali Rohár <pali at kernel.org>

> ---
> Tom, should I send another PR with this fix or do you want to apply
> it yourself?
> 
> BTW sorry about this. It wasn't caught by CI and I wanted to send at
> least the fixes to master ASAP. I now looked again together with Pali
> at the rest of the patches and they are fine.
> ---
>  arch/powerpc/cpu/mpc85xx/u-boot-spl.lds | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/arch/powerpc/cpu/mpc85xx/u-boot-spl.lds b/arch/powerpc/cpu/mpc85xx/u-boot-spl.lds
> index a36aa1793d..f28826c5d1 100644
> --- a/arch/powerpc/cpu/mpc85xx/u-boot-spl.lds
> +++ b/arch/powerpc/cpu/mpc85xx/u-boot-spl.lds
> @@ -63,8 +63,8 @@ SECTIONS
>  	__init_end = .;
>  	_end = .;
>  
> -#ifndef KEEP_RESET_VECTOR
> -#if defined(CONFIG_SD_BOOT) && !defined(CONFIG_SYS_MMC_U_BOOT_OFFS)
> +#if CONFIG_IS_ENABLED(SYS_MPC85XX_NO_RESETVEC)
> +#if defined(CONFIG_SDCARD) && !defined(CONFIG_SYS_MMC_U_BOOT_OFFS)
>  	mmc_u_boot_offs = .;
>  #endif
>  #endif
> @@ -101,7 +101,7 @@ SECTIONS
>  	.resetvec IMAGE_TEXT_BASE + RESET_VECTOR_OFFSET : {
>  		KEEP(*(.resetvec))
>  	} = 0xffff
> -#if defined(CONFIG_SD_BOOT) && !defined(CONFIG_SYS_MMC_U_BOOT_OFFS)
> +#if defined(CONFIG_SDCARD) && !defined(CONFIG_SYS_MMC_U_BOOT_OFFS)
>  	mmc_u_boot_offs = .;
>  #endif
>  #endif
> -- 
> 2.35.1
>