summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcodewalker <codewalker@hardkernel.com>2015-11-26 07:29:28 +0300
committercodewalker <codewalker@hardkernel.com>2015-11-26 07:29:28 +0300
commitc60ff124cdd9d3d98ba8eac1eff144ce787a8cc6 (patch)
treeae6b4a6b41b369a7818f7a34f595eec5d45032db
parent136cae0717c9778dab5fb0cf6d35f65a0a9ec8c5 (diff)
parentb88272f981ed57d3a181c76fa93ed93b4502db26 (diff)
downloadu-boot-c60ff124cdd9d3d98ba8eac1eff144ce787a8cc6.tar.xz
Merge branch 'odroid-v2015.10' of ssh://git.linuxfactory.or.kr:29418/u-boot into odroid-v2015.10odroid-v2015.10
-rw-r--r--drivers/mmc/mmc.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c
index 2edce1866f..d130c9af2f 100644
--- a/drivers/mmc/mmc.c
+++ b/drivers/mmc/mmc.c
@@ -971,13 +971,14 @@ static int mmc_read_ext_csd(struct mmc *host)
ext_csd_struct = ext_csd[EXT_CSD_REV];
host->ext_csd.boot_size_multi = ext_csd[BOOT_SIZE_MULTI];
-
+#if !defined(CONFIG_HKDK4412)
if (ext_csd_struct > 7) {
printf("unrecognised EXT_CSD structure "
"version %d\n", ext_csd_struct);
err = -1;
goto out;
}
+#endif
if (ext_csd_struct >= 2) {
host->ext_csd.sectors =