diff options
author | Philip Rakity <prakity@marvell.com> | 2011-03-19 14:10:33 -0400 |
---|---|---|
committer | Chris Ball <cjb@laptop.org> | 2011-05-24 20:59:13 -0400 |
commit | 41e2a4893566ced3c46af15df5b727326881e47d (patch) | |
tree | 62263d47bf1f034857e8138095af724aa61c53bb /include/linux/mmc | |
parent | 7c21738efd0b5e8c2a9ac2440e7ffbf432d6f239 (diff) |
mmc: Ensure linux starts in eMMC user partition
uBoot sometimes leaves eMMC pointing to the private boot partition.
Ensure we always start looking at the user partition.
Signed-off-by: Philip Rakity <prakity@marvell.com>
Signed-off-by: Bruce Clemens <bpclemens@marvell.com>
Signed-off-by: Mark F. Brown <markb@marvell.com>
Signed-off-by: Chris Ball <cjb@laptop.org>
Diffstat (limited to 'include/linux/mmc')
-rw-r--r-- | include/linux/mmc/card.h | 1 | ||||
-rw-r--r-- | include/linux/mmc/mmc.h | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/mmc/card.h b/include/linux/mmc/card.h index adb4888248be..557b73263390 100644 --- a/include/linux/mmc/card.h +++ b/include/linux/mmc/card.h | |||
@@ -45,6 +45,7 @@ struct mmc_ext_csd { | |||
45 | u8 rev; | 45 | u8 rev; |
46 | u8 erase_group_def; | 46 | u8 erase_group_def; |
47 | u8 sec_feature_support; | 47 | u8 sec_feature_support; |
48 | u8 bootconfig; | ||
48 | unsigned int sa_timeout; /* Units: 100ns */ | 49 | unsigned int sa_timeout; /* Units: 100ns */ |
49 | unsigned int hs_max_dtr; | 50 | unsigned int hs_max_dtr; |
50 | unsigned int sectors; | 51 | unsigned int sectors; |
diff --git a/include/linux/mmc/mmc.h b/include/linux/mmc/mmc.h index 264ba5451e3b..b5ec88fd1352 100644 --- a/include/linux/mmc/mmc.h +++ b/include/linux/mmc/mmc.h | |||
@@ -256,6 +256,7 @@ struct _mmc_csd { | |||
256 | #define EXT_CSD_PARTITION_ATTRIBUTE 156 /* R/W */ | 256 | #define EXT_CSD_PARTITION_ATTRIBUTE 156 /* R/W */ |
257 | #define EXT_CSD_PARTITION_SUPPORT 160 /* RO */ | 257 | #define EXT_CSD_PARTITION_SUPPORT 160 /* RO */ |
258 | #define EXT_CSD_ERASE_GROUP_DEF 175 /* R/W */ | 258 | #define EXT_CSD_ERASE_GROUP_DEF 175 /* R/W */ |
259 | #define EXT_CSD_BOOT_CONFIG 179 /* R/W */ | ||
259 | #define EXT_CSD_ERASED_MEM_CONT 181 /* RO */ | 260 | #define EXT_CSD_ERASED_MEM_CONT 181 /* RO */ |
260 | #define EXT_CSD_BUS_WIDTH 183 /* R/W */ | 261 | #define EXT_CSD_BUS_WIDTH 183 /* R/W */ |
261 | #define EXT_CSD_HS_TIMING 185 /* R/W */ | 262 | #define EXT_CSD_HS_TIMING 185 /* R/W */ |