[U-Boot] Pull request: u-boot-mmc 23052014
Hi Tom,
The following changes since commit d7782d06534fe4fa47a49fa7c106de5ba85a9687:
Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx (2014-05-16 18:30:33 -0400)
are available in the git repository at:
git://git.denx.de/u-boot-mmc.git master
for you to fetch changes up to df348d8245922adbb03a3a979429c5e70342973c:
cmd_mmc: use new mmc_select_hwpart() function (2014-05-23 12:23:28 +0300)
---------------------------------------------------------------- Andrew Gabbasov (1): mmc: Handle switch error status bit in MMC card status
Hannes Petermaier (1): Add board_mmc_init(...) function for init mmc1 only
Mateusz Zalega (1): mmc: postponed needless timer initialization
Pierre Aubert (3): eMMC: add support for operations in RPMB partition Add the function 'confirm_yesno' for interactive eMMC: cmd_mmc.c adds the 'rpmb' sub-command for the 'mmc' command
Stephen Warren (4): cmd_part: fix typo in part command help text disk: support devices with HW partitions mmc: provide a select_hwpart implementation for get_device() cmd_mmc: use new mmc_select_hwpart() function
Ye.Li (1): esdhc/usdhc: Fix PIO mode bug in fsl_esdhc driver
README | 10 ++ board/BuR/common/common.c | 7 + common/cmd_fuse.c | 11 +- common/cmd_mmc.c | 799 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------- common/cmd_nand.c | 16 +-- common/cmd_otp.c | 18 +-- common/cmd_part.c | 2 +- common/console.c | 28 +++- disk/part.c | 80 +++++++++-- drivers/mmc/Makefile | 1 + drivers/mmc/fsl_esdhc.c | 23 ++- drivers/mmc/mmc.c | 35 ++++- drivers/mmc/rpmb.c | 323 ++++++++++++++++++++++++++++++++++++++++++ include/common.h | 2 +- include/configs/kwb.h | 2 +- include/configs/tseries.h | 2 +- include/mmc.h | 12 +- include/part.h | 2 + lib/Makefile | 1 + 19 files changed, 1009 insertions(+), 365 deletions(-) create mode 100644 drivers/mmc/rpmb.c
Regards
-- Pantelis
In 7168977 we made calls to check_and_invalidate_dcache_range() conditional on !CONFIG_SYS_FSL_ESDHC_USE_PIO. Only define this function in this case as well.
Signed-off-by: Tom Rini trini@ti.com --- drivers/mmc/fsl_esdhc.c | 3 +++ 1 file changed, 3 insertions(+)
diff --git a/drivers/mmc/fsl_esdhc.c b/drivers/mmc/fsl_esdhc.c index dca28f4..5541613 100644 --- a/drivers/mmc/fsl_esdhc.c +++ b/drivers/mmc/fsl_esdhc.c @@ -246,6 +246,7 @@ static int esdhc_setup_data(struct mmc *mmc, struct mmc_data *data) return 0; }
+#ifndef CONFIG_SYS_FSL_ESDHC_USE_PIO static void check_and_invalidate_dcache_range (struct mmc_cmd *cmd, struct mmc_data *data) { @@ -255,6 +256,8 @@ static void check_and_invalidate_dcache_range unsigned end = start+size ; invalidate_dcache_range(start, end); } +#endif + /* * Sends a command out on the bus. Takes the mmc pointer, * a command pointer, and an optional data pointer.
On Fri, May 23, 2014 at 09:20:53AM -0400, Tom Rini wrote:
In 7168977 we made calls to check_and_invalidate_dcache_range() conditional on !CONFIG_SYS_FSL_ESDHC_USE_PIO. Only define this function in this case as well.
Signed-off-by: Tom Rini trini@ti.com
Applied to u-boot/master, thanks!
On Fri, May 23, 2014 at 12:37:06PM +0300, Pantelis Antoniou wrote:
Hi Tom,
The following changes since commit d7782d06534fe4fa47a49fa7c106de5ba85a9687:
Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx (2014-05-16 18:30:33 -0400)
are available in the git repository at:
git://git.denx.de/u-boot-mmc.git master
for you to fetch changes up to df348d8245922adbb03a3a979429c5e70342973c:
cmd_mmc: use new mmc_select_hwpart() function (2014-05-23 12:23:28 +0300)
Andrew Gabbasov (1): mmc: Handle switch error status bit in MMC card status
Hannes Petermaier (1): Add board_mmc_init(...) function for init mmc1 only
Mateusz Zalega (1): mmc: postponed needless timer initialization
Pierre Aubert (3): eMMC: add support for operations in RPMB partition Add the function 'confirm_yesno' for interactive eMMC: cmd_mmc.c adds the 'rpmb' sub-command for the 'mmc' command
Stephen Warren (4): cmd_part: fix typo in part command help text disk: support devices with HW partitions mmc: provide a select_hwpart implementation for get_device() cmd_mmc: use new mmc_select_hwpart() function
Ye.Li (1): esdhc/usdhc: Fix PIO mode bug in fsl_esdhc driver
README | 10 ++ board/BuR/common/common.c | 7 + common/cmd_fuse.c | 11 +- common/cmd_mmc.c | 799 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------- common/cmd_nand.c | 16 +-- common/cmd_otp.c | 18 +-- common/cmd_part.c | 2 +- common/console.c | 28 +++- disk/part.c | 80 +++++++++-- drivers/mmc/Makefile | 1 + drivers/mmc/fsl_esdhc.c | 23 ++- drivers/mmc/mmc.c | 35 ++++- drivers/mmc/rpmb.c | 323 ++++++++++++++++++++++++++++++++++++++++++ include/common.h | 2 +- include/configs/kwb.h | 2 +- include/configs/tseries.h | 2 +- include/mmc.h | 12 +- include/part.h | 2 + lib/Makefile | 1 + 19 files changed, 1009 insertions(+), 365 deletions(-) create mode 100644 drivers/mmc/rpmb.c
Applied to u-boot/master, thanks!
participants (2)
-
Pantelis Antoniou -
Tom Rini