]> git.baikalelectronics.ru Git - uboot.git/commit
powerpc: mpc85xx: Fix incorrect application of patch
authorMarek Behún <kabel@kernel.org>
Mon, 19 Sep 2022 09:32:08 +0000 (11:32 +0200)
committerTom Rini <trini@konsulko.com>
Mon, 19 Sep 2022 12:30:58 +0000 (08:30 -0400)
commit6dfb14cd66d9b454df1028459a16fc575ac15c8c
tree5b1c3be3ac9e7e79d5d1abf1ccd88d98a390f1fc
parente92cb16dec281d56ca07193df4904764bc6fe2ff
powerpc: mpc85xx: Fix incorrect application of patch

I messed up application of patch 87827d704fa4 ("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: 87827d704fa4 ("mmc: fsl_esdhc_spl: Add support for builds without
CONFIG_SYS_MMC_U_BOOT_OFFS")
Signed-off-by: Marek Behún <kabel@kernel.org>
Reviewed-by: Pali Rohár <pali@kernel.org>
arch/powerpc/cpu/mpc85xx/u-boot-spl.lds