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

diff --combined include/mmc.h
index 218c03f4f6282fe087d54e1cb150cb209a0d75c7,e95a2376d20001ff71e667daf4505e92afc688a7..b65ad9e41e95e11f0bbfbb58f615d21b6599f098
--- 1/include/mmc.h
--- 2/include/mmc.h
+++ b/include/mmc.h
@@@ -187,6 -187,9 +187,9 @@@
  #define EXT_CSD_BOOT_PART_NUM(x)      (x << 3)
  #define EXT_CSD_PARTITION_ACCESS(x)   (x << 0)
  
+ #define EXT_CSD_BOOT_BUS_WIDTH_MODE(x)        (x << 3)
+ #define EXT_CSD_BOOT_BUS_WIDTH_RESET(x)       (x << 2)
+ #define EXT_CSD_BOOT_BUS_WIDTH_WIDTH(x)       (x)
  
  #define R1_ILLEGAL_COMMAND            (1 << 22)
  #define R1_APP_CMD                    (1 << 5)
@@@ -310,8 -313,10 +313,10 @@@ int mmc_set_dsr(struct mmc *mmc, u16 va
  /* Function to change the size of boot partition and rpmb partitions */
  int mmc_boot_partition_size_change(struct mmc *mmc, unsigned long bootsize,
                                        unsigned long rpmbsize);
- /* Function to send commands to open/close the specified boot partition */
- int mmc_boot_part_access(struct mmc *mmc, u8 ack, u8 part_num, u8 access);
+ /* Function to modify the PARTITION_CONFIG field of EXT_CSD */
+ int mmc_set_part_conf(struct mmc *mmc, u8 ack, u8 part_num, u8 access);
+ /* Function to modify the BOOT_BUS_WIDTH field of EXT_CSD */
+ int mmc_set_boot_bus_width(struct mmc *mmc, u8 width, u8 reset, u8 mode);
  
  /**
   * Start device initialization and return immediately; it does not block on
@@@ -349,6 -354,4 +354,6 @@@ struct mmc *mmc_spi_init(uint bus, uin
  int mmc_legacy_init(int verbose);
  #endif
  
 +int board_mmc_init(bd_t *bis);
 +
  #endif /* _MMC_H_ */