cfi_flash: Remove assignments from if conditions

[u-boot] / include / mmc.h

diff --git a/include/mmc.h b/include/mmc.h
index f50c714428407513cde5673c9b92dd7db267efdb..a46eaed74699b982ca046bc34ea769c29a3283c4 100644 (file)
--- a/include/mmc.h
+++ b/include/mmc.h
@@ -585,9 +585,13 @@ struct mmc {
        uint tran_speed;
        uint legacy_speed; /* speed for the legacy mode provided by the card */
        uint read_bl_len;
+#if CONFIG_IS_ENABLED(MMC_WRITE)
        uint write_bl_len;
        uint erase_grp_size;    /* in 512-byte sectors */
+#endif
+#if CONFIG_IS_ENABLED(MMC_HW_PARTITIONING)
        uint hc_wp_grp_size;    /* in 512-byte sectors */
+#endif
 #if CONFIG_IS_ENABLED(MMC_WRITE)
        struct sd_ssr   ssr;    /* SD status register */
 #endif
@@ -596,8 +600,10 @@ struct mmc {
        u64 capacity_boot;
        u64 capacity_rpmb;
        u64 capacity_gp[4];
+#ifndef CONFIG_SPL_BUILD
        u64 enh_user_start;
        u64 enh_user_size;
+#endif
 #if !CONFIG_IS_ENABLED(BLK)
        struct blk_desc block_dev;
 #endif