diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c
index 3930aad13ba90912e65f7f0498f616a59d579c2b..c1ba57f86dd4a8b8be87f7a374c6579581ee69be 100644
--- a/drivers/mmc/mmc.c
+++ b/drivers/mmc/mmc.c
@@ -2028,6 +2028,7 @@ static int mmc_startup_v4(struct mmc *mmc)
 		mmc->capacity_gp[i] <<= 19;
 	}
 
+#ifndef CONFIG_SPL_BUILD
 	if (part_completed) {
 		mmc->enh_user_size =
 			(ext_csd[EXT_CSD_ENH_SIZE_MULT + 2] << 16) +
@@ -2044,6 +2045,7 @@ static int mmc_startup_v4(struct mmc *mmc)
 		if (mmc->high_capacity)
 			mmc->enh_user_start <<= 9;
 	}
+#endif
 
 	/*
 	 * Host needs to enable ERASE_GRP_DEF bit if device is
diff --git a/include/mmc.h b/include/mmc.h
index 3abeb581aef220c0b7600b9e7a8b1d8b0a019ea2..cd068b9429bf419d67ffa99e0f846899f5b36d89 100644
--- a/include/mmc.h
+++ b/include/mmc.h
@@ -598,8 +598,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