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

board: stm32mp1: use IS_ENABLED to prevent ifdef in env functions

Browse Source 
Use IS_ENABLED to prevent ifdef in env functions:
- env_get_location
- env_ext4_get_intf
- mmc_get_env_dev

Signed-off-by: Patrick Delaunay <patrick.delaunay@st.com>
Reviewed-by: Patrice Chotard <patrice.chotard@st.com>
This commit is contained in:
Patrick Delaunay 2020-07-31 16:31:49 +02:00 committed by Patrice Chotard
parent 72b099897a
commit ebfd592f16
1 changed files with 17 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
board/st/stm32mp1/stm32mp1.c
View File

@ -785,31 +785,33 @@ enum env_location env_get_location(enum env_operation op, int prio)
return ENVL_UNKNOWN; return ENVL_UNKNOWN;
switch (bootmode & TAMP_BOOT_DEVICE_MASK) { switch (bootmode & TAMP_BOOT_DEVICE_MASK) {
#if CONFIG_IS_ENABLED(ENV_IS_IN_MMC)
case BOOT_FLASH_SD: case BOOT_FLASH_SD:
case BOOT_FLASH_EMMC: case BOOT_FLASH_EMMC:
return ENVL_MMC; if (CONFIG_IS_ENABLED(ENV_IS_IN_MMC))
#endif return ENVL_MMC;
#if CONFIG_IS_ENABLED(ENV_IS_IN_EXT4) else if (CONFIG_IS_ENABLED(ENV_IS_IN_EXT4))
case BOOT_FLASH_SD: return ENVL_EXT4;
case BOOT_FLASH_EMMC: else
return ENVL_EXT4; return ENVL_NOWHERE;
#endif
#if CONFIG_IS_ENABLED(ENV_IS_IN_UBI)
case BOOT_FLASH_NAND: case BOOT_FLASH_NAND:
case BOOT_FLASH_SPINAND: case BOOT_FLASH_SPINAND:
return ENVL_UBI; if (CONFIG_IS_ENABLED(ENV_IS_IN_UBI))
#endif return ENVL_UBI;
#if CONFIG_IS_ENABLED(ENV_IS_IN_SPI_FLASH) else
return ENVL_NOWHERE;
case BOOT_FLASH_NOR: case BOOT_FLASH_NOR:
return ENVL_SPI_FLASH; if (CONFIG_IS_ENABLED(ENV_IS_IN_SPI_FLASH))
#endif return ENVL_SPI_FLASH;
else
return ENVL_NOWHERE;
default: default:
return ENVL_NOWHERE; return ENVL_NOWHERE;
} }
} }
#if defined(CONFIG_ENV_IS_IN_EXT4)
const char *env_ext4_get_intf(void) const char *env_ext4_get_intf(void)
{ {
u32 bootmode = get_bootmode(); u32 bootmode = get_bootmode();
@ -830,16 +832,12 @@ const char *env_ext4_get_dev_part(void)
return dev_part[(bootmode & TAMP_BOOT_INSTANCE_MASK) - 1]; return dev_part[(bootmode & TAMP_BOOT_INSTANCE_MASK) - 1];
} }
#endif
#if defined(CONFIG_ENV_IS_IN_MMC)
int mmc_get_env_dev(void) int mmc_get_env_dev(void)
{ {
u32 bootmode = get_bootmode(); u32 bootmode = get_bootmode();
return (bootmode & TAMP_BOOT_INSTANCE_MASK) - 1; return (bootmode & TAMP_BOOT_INSTANCE_MASK) - 1;
} }
#endif
#if defined(CONFIG_OF_BOARD_SETUP) #if defined(CONFIG_OF_BOARD_SETUP)
int ft_board_setup(void *blob, struct bd_info *bd) int ft_board_setup(void *blob, struct bd_info *bd)