Merge branch 'u-boot-samsung/master' into 'u-boot-arm/master'

[u-boot] / board / freescale / common / sdhc_boot.c

diff --git a/board/freescale/common/sdhc_boot.c b/board/freescale/common/sdhc_boot.c
index f6e2b2bbd6775d1a1928118246bfdf68e42b2e07..022f38b117f2c945cb6e5eb7e1cea21612631cce 100644 (file)
--- a/board/freescale/common/sdhc_boot.c
+++ b/board/freescale/common/sdhc_boot.c
@@ -16,6 +16,8 @@
 #define ESDHC_BOOT_IMAGE_SIZE  0x48
 #define ESDHC_BOOT_IMAGE_ADDR  0x50
 
+#define ESDHC_DEFAULT_ENVADDR  0x400
+
 int mmc_get_env_addr(struct mmc *mmc, int copy, u32 *env_addr)
 {
        u8 *tmp_buf;
@@ -39,6 +41,33 @@ int mmc_get_env_addr(struct mmc *mmc, int copy, u32 *env_addr)
        /* Get the code size from offset 0x48 */
        code_len = *(u32 *)(tmp_buf + ESDHC_BOOT_IMAGE_SIZE);
 
+#ifdef CONFIG_ESDHC_HC_BLK_ADDR
+       /*
+        * On soc BSC9131, BSC9132:
+        * In High Capacity SD Cards (> 2 GBytes), the 32-bit source address and
+        * code length of these soc specify the memory address in block address
+        * format. Block length is fixed to 512 bytes as per the SD High
+        * Capacity specification.
+        */
+       u64 tmp;
+
+       if (mmc->high_capacity) {
+               tmp = (u64)code_offset * blklen;
+               tmp += code_len * blklen;
+       } else
+               tmp = code_offset + code_len;
+
+       if ((tmp + CONFIG_ENV_SIZE > mmc->capacity) ||
+                       (tmp > 0xFFFFFFFFU))
+               *env_addr = ESDHC_DEFAULT_ENVADDR;
+       else
+               *env_addr = tmp;
+
+       free(tmp_buf);
+
+       return 0;
+#endif
+
        *env_addr = code_offset + code_len;
 
        free(tmp_buf);