]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
board: freescale: p1_p2_rdb_pc: Allow to compile it without env support
authorPali Rohár <pali@kernel.org>
Sat, 2 Apr 2022 22:24:27 +0000 (00:24 +0200)
committerPriyanka Jain <priyanka.jain@nxp.com>
Tue, 26 Apr 2022 11:48:39 +0000 (17:18 +0530)
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>
board/freescale/p1_p2_rdb_pc/spl.c

index f855f3a81c3df72e0f6cbd6dca8f844f08d419bc..22156f2824ec98d85eed424c0d7c59a9f3cae3cd 100644 (file)
@@ -83,12 +83,15 @@ void board_init_r(gd_t *gd, ulong dest_addr)
                        CONFIG_SPL_RELOC_MALLOC_SIZE);
        gd->flags |= GD_FLG_FULL_MALLOC_INIT;
 
+#ifdef CONFIG_SPL_ENV_SUPPORT
 #ifndef CONFIG_SPL_NAND_BOOT
        env_init();
 #endif
+#endif
 #ifdef CONFIG_SPL_MMC_BOOT
        mmc_initialize(bd);
 #endif
+#ifdef CONFIG_SPL_ENV_SUPPORT
        /* relocate environment function pointers etc. */
 #ifdef CONFIG_SPL_NAND_BOOT
        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
        env_relocate();
 #endif
+#endif
 
 #if CONFIG_IS_ENABLED(SYS_I2C_LEGACY)
        i2c_init_all();