diff options
| author | Rajesh Bhagat <rajesh.bhagat@nxp.com> | 2019-01-12 07:30:51 +0000 |
|---|---|---|
| committer | Ye Li <ye.li@nxp.com> | 2019-07-17 00:14:12 -0700 |
| commit | 7a7702da2786e0678bbba41edd4d470dcea5fa35 (patch) | |
| tree | d6745fbd02df070a2eab03e2c4a530da8fd41f4d | |
| parent | d38685ac5f99ea62e3b9c291e0396fec6fb222e7 (diff) | |
env: fix allow to build multiple environments
Patch fixes build error when enabling CONFIG_ENV_IS_IN_SPI_FLAS
and CONFIG_ENV_IS_IN_MMC at the same time mentioned issue in
below link:
Refer: https://lists.denx.de/pipermail/u-boot/2018-February/319565.html
build error when enabling CONFIG_ENV_IS_IN_SPI_FLASH and
CONFIG_ENV_IS_IN_MMC at the same time.
Signed-off-by: Rajesh Bhagat <rajesh.bhagat@nxp.com>
Reviewed-by: York Sun <york.sun@nxp.com>
| -rw-r--r-- | include/environment.h | 9 | ||||
| -rw-r--r-- | include/mmc.h | 3 |
2 files changed, 3 insertions, 9 deletions
diff --git a/include/environment.h b/include/environment.h index ec12af55c1..678f14250e 100644 --- a/include/environment.h +++ b/include/environment.h @@ -164,15 +164,6 @@ extern env_t *env_ptr; extern void env_reloc(void); #endif -#ifdef CONFIG_ENV_IS_IN_MMC -#include <mmc.h> - -extern int mmc_get_env_addr(struct mmc *mmc, int copy, u32 *env_addr); -# ifdef CONFIG_SYS_MMC_ENV_PART -extern uint mmc_get_env_part(struct mmc *mmc); -# endif -#endif - #ifndef DO_DEPS_ONLY #include <env_attr.h> diff --git a/include/mmc.h b/include/mmc.h index 40ed3bc01a..7f8116115d 100644 --- a/include/mmc.h +++ b/include/mmc.h @@ -839,6 +839,9 @@ void board_mmc_power_init(void); int board_mmc_init(bd_t *bis); int cpu_mmc_init(bd_t *bis); int mmc_get_env_addr(struct mmc *mmc, int copy, u32 *env_addr); +# ifdef CONFIG_SYS_MMC_ENV_PART +extern uint mmc_get_env_part(struct mmc *mmc); +# endif int mmc_get_env_dev(void); int mmc_map_to_kernel_blk(int dev_no); |