From: Tom Rini <trini@ti.com>
Date: Sat, 22 Jun 2013 11:38:12 +0000 (-0400)
Subject: Merge branch 'master' of git://git.denx.de/u-boot-arm
X-Git-Tag: v2013.07-rc2~60
X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-uboot.git;a=commitdiff_plain;h=348e47f766ac228fb02d1af562b2e9a4c69355db

Merge branch 'master' of git://git.denx.de/u-boot-arm
---

348e47f766ac228fb02d1af562b2e9a4c69355db
diff --cc include/mmc.h
index ea198d87b7,f88f672f11..583c30e270
--- a/include/mmc.h
+++ b/include/mmc.h
@@@ -158,10 -163,9 +163,11 @@@
  /*
   * EXT_CSD fields
   */
 +#define EXT_CSD_GP_SIZE_MULT		143	/* R/W */
  #define EXT_CSD_PARTITIONING_SUPPORT	160	/* RO */
 +#define EXT_CSD_RPMB_MULT		168	/* RO */
  #define EXT_CSD_ERASE_GROUP_DEF		175	/* R/W */
+ #define EXT_CSD_BOOT_BUS_WIDTH		177
  #define EXT_CSD_PART_CONF		179	/* R/W */
  #define EXT_CSD_BUS_WIDTH		183	/* R/W */
  #define EXT_CSD_HS_TIMING		185	/* R/W */