From 1c119f2c1667ea2747693f7fd2166205e1a10b09 Mon Sep 17 00:00:00 2001 From: Olof Johansson Date: Tue, 27 Jul 2010 23:11:15 -0500 Subject: [PATCH] mmc: fix non-arm build due to eMMC 4.3+ change MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit drivers/mmc/core/mmc.c:228: error: ‘SZ_256K’ undeclared (first use in this function) Introduced by: mmc: subtract boot sectors from disk size for eMMC 4.3+ devices (SZ_* doesn't exist on anything but arm) Change-Id: I981217adea4ef56bf870562b6711488f3f4bf830 Signed-off-by: Olof Johansson --- drivers/mmc/core/mmc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c index f5b2aaf2371f..45055c46d954 100644 --- a/drivers/mmc/core/mmc.c +++ b/drivers/mmc/core/mmc.c @@ -255,8 +255,8 @@ static int mmc_read_ext_csd(struct mmc_card *card) /* Cards with density > 2GiB are sector addressed */ if (card->ext_csd.sectors > (2u * 1024 * 1024 * 1024) / 512) { unsigned boot_sectors; - boot_sectors = ext_csd[EXT_CSD_BOOT_SIZE_MULTI]; - boot_sectors *= SZ_256K / 512; + /* size is in 256K chunks, i.e. 512 sectors each */ + boot_sectors = ext_csd[EXT_CSD_BOOT_SIZE_MULTI] * 512; card->ext_csd.sectors -= boot_sectors; mmc_card_set_blockaddr(card); } -- 2.34.1