Dear Tom,

From: Mans Rullgard mans@mansr.com

This fixes a wrongly indented block of code.

Signed-off-by: Mans Rullgard mans@mansr.com [lukma: Make the commit message more verbose] Signed-off-by: Lukasz Majewski lukma@denx.de

Tom, are there any issues preventing this patch from being applied to -master?

---

common/spl/spl_mmc.c | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/common/spl/spl_mmc.c b/common/spl/spl_mmc.c index b3619889f7..2caceb5186 100644 --- a/common/spl/spl_mmc.c +++ b/common/spl/spl_mmc.c @@ -334,28 +334,28 @@ int spl_mmc_load(struct spl_image_info *spl_image, err = -EINVAL; switch (boot_mode) { case MMCSD_MODE_EMMCBOOT:

• 	/*
  

• 	 * We need to check what the partition is
  

configured to.

• 	 * 1 and 2 match up to boot0 / boot1 and 7
  

is user data

• 	 * which is the first physical partition (0).
  

• 	 */
  

• 	part = (mmc->part_config >> 3) &
  

PART_ACCESS_MASK; -

• 	if (part == 7)
  

• 		part = 0;
  

• 	if (CONFIG_IS_ENABLED(MMC_TINY))
  

• 		err = mmc_switch_part(mmc, part);
  

• 	else
  

• 		err =
  

blk_dselect_hwpart(mmc_get_blk_desc(mmc), part); -

• 	if (err) {
  

• /*
  

•  * We need to check what the partition is configured
  

to.

•  * 1 and 2 match up to boot0 / boot1 and 7 is user
  

data

•  * which is the first physical partition (0).
  

•  */
  

• part = (mmc->part_config >> 3) & PART_ACCESS_MASK;
  

• if (part == 7)
  

• 	part = 0;
  

• if (CONFIG_IS_ENABLED(MMC_TINY))
  

• 	err = mmc_switch_part(mmc, part);
  

• else
  

• 	err =
  

blk_dselect_hwpart(mmc_get_blk_desc(mmc), part); +

• if (err) {
  

#ifdef CONFIG_SPL_LIBCOMMON_SUPPORT

• 		puts("spl: mmc partition switch
  

failed\n");

• 	puts("spl: mmc partition switch failed\n");
  

#endif

• 		return err;
  

• 	}
  

• 	/* Fall through */
  

• 	return err;
  

• }
  

• /* Fall through */
  

  case MMCSD_MODE_RAW: debug("spl: mmc boot mode: raw\n");

Best regards,

Lukasz Majewski

--

DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-59 Fax: (+49)-8142-66989-80 Email: lukma@denx.de