brain-hackers_pepepper-mirror/u-boot-brain
1
0
Fork 0
mirror of https://github.com/brain-hackers/u-boot-brain synced 2024-06-09 23:36:03 +09:00
Code Issues Projects Releases Wiki Activity

board: stm32mp1: use IS_ENABLED to prevent ifdef in set_dfu_alt_inf

Browse Source 
Use CONFIG_IS_ENABLED to prevent ifdef in set_dfu_alt_inf.

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:46 +02:00 committed by Patrice Chotard
parent 3434bbe698
commit 75f9b190e4
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
board/st/common/stm32mp_dfu.c
View File

@ -114,11 +114,13 @@ void set_dfu_alt_info(char *interface, char *devstr)
snprintf(buf, DFU_ALT_BUF_LEN, snprintf(buf, DFU_ALT_BUF_LEN,
"ram 0=%s", CONFIG_DFU_ALT_RAM0); "ram 0=%s", CONFIG_DFU_ALT_RAM0);
if (!uclass_get_device(UCLASS_MMC, 0, &dev)) if (CONFIG_IS_ENABLED(MMC)) {
board_get_alt_info_mmc(dev, buf); if (!uclass_get_device(UCLASS_MMC, 0, &dev))
board_get_alt_info_mmc(dev, buf);
if (!uclass_get_device(UCLASS_MMC, 1, &dev)) if (!uclass_get_device(UCLASS_MMC, 1, &dev))
board_get_alt_info_mmc(dev, buf); board_get_alt_info_mmc(dev, buf);
}
if (CONFIG_IS_ENABLED(MTD)) { if (CONFIG_IS_ENABLED(MTD)) {
/* probe all MTD devices */ /* probe all MTD devices */
@ -140,12 +142,12 @@ void set_dfu_alt_info(char *interface, char *devstr)
board_get_alt_info_mtd(mtd, buf); board_get_alt_info_mtd(mtd, buf);
} }
#ifdef CONFIG_DFU_VIRT if (IS_ENABLED(CONFIG_DFU_VIRT)) {
strncat(buf, "&virt 0=OTP", DFU_ALT_BUF_LEN); strncat(buf, "&virt 0=OTP", DFU_ALT_BUF_LEN);
if (IS_ENABLED(CONFIG_PMIC_STPMIC1)) if (IS_ENABLED(CONFIG_PMIC_STPMIC1))
strncat(buf, "&virt 1=PMIC", DFU_ALT_BUF_LEN); strncat(buf, "&virt 1=PMIC", DFU_ALT_BUF_LEN);
#endif }
env_set("dfu_alt_info", buf); env_set("dfu_alt_info", buf);
puts("DFU alt info setting: done\n"); puts("DFU alt info setting: done\n");