]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
board: stm32mp1: use IS_ENABLED to prevent ifdef in set_dfu_alt_inf
authorPatrick Delaunay <patrick.delaunay@st.com>
Fri, 31 Jul 2020 14:31:46 +0000 (16:31 +0200)
committerPatrice Chotard <patrice.chotard@st.com>
Thu, 13 Aug 2020 07:52:49 +0000 (09:52 +0200)
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>
board/st/common/stm32mp_dfu.c

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