LM
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

board: freescale: p1_p2_rdb_pc: Allow to compile it without env support 

When env support is disabled then usage of env_init() or env_relocate()
generates linker errors. So do not compile env_init() or env_relocate()
in SPL code when env support is disabled in SPL.

Signed-off-by: Pali Rohár <pali@kernel.org>
Reviewed-by: Priyanka Jain <priyanka.jain@nxp.com>
This commit is contained in:
Pali Rohár 2022-04-03 00:24:27 +02:00 committed by Priyanka Jain
parent 78cdaf4053
commit 03edf23376
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
board/freescale/p1_p2_rdb_pc/spl.c
View File

@ -83,12 +83,15 @@ void board_init_r(gd_t *gd, ulong dest_addr)
CONFIG_SPL_RELOC_MALLOC_SIZE); CONFIG_SPL_RELOC_MALLOC_SIZE);
gd->flags |= GD_FLG_FULL_MALLOC_INIT; gd->flags |= GD_FLG_FULL_MALLOC_INIT;
#ifdef CONFIG_SPL_ENV_SUPPORT
#ifndef CONFIG_SPL_NAND_BOOT #ifndef CONFIG_SPL_NAND_BOOT
env_init(); env_init();
#endif #endif
#endif
#ifdef CONFIG_SPL_MMC_BOOT #ifdef CONFIG_SPL_MMC_BOOT
mmc_initialize(bd); mmc_initialize(bd);
#endif #endif
#ifdef CONFIG_SPL_ENV_SUPPORT
/* relocate environment function pointers etc. */ /* relocate environment function pointers etc. */
#ifdef CONFIG_SPL_NAND_BOOT #ifdef CONFIG_SPL_NAND_BOOT
nand_spl_load_image(CONFIG_ENV_OFFSET, CONFIG_ENV_SIZE, nand_spl_load_image(CONFIG_ENV_OFFSET, CONFIG_ENV_SIZE,
@ -98,6 +101,7 @@ void board_init_r(gd_t *gd, ulong dest_addr)
#else #else
env_relocate(); env_relocate();
#endif #endif
#endif
#if CONFIG_IS_ENABLED(SYS_I2C_LEGACY) #if CONFIG_IS_ENABLED(SYS_I2C_LEGACY)
i2c_init_all(); i2c_init_all();