mmc: fix bug in mmc_startup_v4()

[people/ms/u-boot.git] / include / mmc.h

diff --git a/include/mmc.h b/include/mmc.h
index 3abeb581aef220c0b7600b9e7a8b1d8b0a019ea2..86f885b504e1c21269ae043a0b4577f03623eb7a 100644 (file)
--- a/include/mmc.h
+++ b/include/mmc.h
@@ -54,6 +54,7 @@
 #define MMC_VERSION_4_1                MAKE_MMC_VERSION(4, 1, 0)
 #define MMC_VERSION_4_2                MAKE_MMC_VERSION(4, 2, 0)
 #define MMC_VERSION_4_3                MAKE_MMC_VERSION(4, 3, 0)
+#define MMC_VERSION_4_4                MAKE_MMC_VERSION(4, 4, 0)
 #define MMC_VERSION_4_41       MAKE_MMC_VERSION(4, 4, 1)
 #define MMC_VERSION_4_5                MAKE_MMC_VERSION(4, 5, 0)
 #define MMC_VERSION_5_0                MAKE_MMC_VERSION(5, 0, 0)
@@ -589,7 +590,9 @@ struct mmc {
        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
@@ -598,8 +601,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