powerpc: mpc85xx: Fix incorrect application of patch
I messed up application of patch5a428e7510
("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:5a428e7510
("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>
This commit is contained in:
@@ -63,8 +63,8 @@ SECTIONS
|
|||||||
__init_end = .;
|
__init_end = .;
|
||||||
_end = .;
|
_end = .;
|
||||||
|
|
||||||
#ifndef KEEP_RESET_VECTOR
|
#if CONFIG_IS_ENABLED(SYS_MPC85XX_NO_RESETVEC)
|
||||||
#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 = .;
|
mmc_u_boot_offs = .;
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
@@ -101,7 +101,7 @@ SECTIONS
|
|||||||
.resetvec IMAGE_TEXT_BASE + RESET_VECTOR_OFFSET : {
|
.resetvec IMAGE_TEXT_BASE + RESET_VECTOR_OFFSET : {
|
||||||
KEEP(*(.resetvec))
|
KEEP(*(.resetvec))
|
||||||
} = 0xffff
|
} = 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 = .;
|
mmc_u_boot_offs = .;
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
Reference in New Issue
Block a user