[U-Boot] [PATCH v3 follow-up 3/3] sunxi: Remove redundant check from `board_mmc_init` for signature

[U-Boot] [PATCH v3 follow-up 3/3] sunxi: Remove redundant check from `board_mmc_init` for signature

[Daniel Kochmański]

Removes checking for signature on mmc devices, because it is done on
`spl_boot_device`. This is follow-up patch to V3.

Signed-off-by: Daniel Kochma?ski <dkochmanski@turtle-solutions.eu>
CC: Roy Spliet <r.spliet@ultimaker.com>
Cc: Ian Campbell <ijc@hellion.org.uk>
Cc: Hans De Goede <hdegoede@redhat.com>
---
 board/sunxi/board.c | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/board/sunxi/board.c b/board/sunxi/board.c
index dc95431..a14096e 100644
--- a/board/sunxi/board.c
+++ b/board/sunxi/board.c
@@ -297,19 +297,6 @@ int board_mmc_init(bd_t *bis)
 		return -1;
 #endif
 
-#if CONFIG_MMC_SUNXI_SLOT == 0 && CONFIG_MMC_SUNXI_SLOT_EXTRA == 2
-	/*
-	 * Both mmc0 and mmc2 are bootable, figure out where we're booting
-	 * from. Try mmc0 first, just like the brom does.
-	 */
-	if (sunxi_mmc_has_egon_boot_signature(mmc0))
-		return 0;
-
-	/* no bootable card in mmc0, so we must be booting from mmc2, swap */
-	mmc0->block_dev.dev = 1;
-	mmc1->block_dev.dev = 0;
-#endif
-
 	return 0;
 }
 #endif
-- 
2.4.1

[U-Boot] [PATCH v3 follow-up 3/3] sunxi: Remove redundant check from `board_mmc_init` for signature

[Hans de Goede]

Hi,

On 29-05-15 17:21, Daniel Kochma?ski wrote:
> Removes checking for signature on mmc devices, because it is done on
> `spl_boot_device`. This is follow-up patch to V3.

We actually still need the swapping in this code-path in u-boot proper, so
as to make sure that when booting from an emmc we make the emmc "mmc dev 0"
and thus search there first for things like boot.scr and extlinux.conf.

So I've merged this patch in a modified form adding a
"#if !defined(CONFIG_SPL_BUILD" around the code block in question, rather
then completely removing it, and updating the comments to match.

Regards,

Hans





>
> Signed-off-by: Daniel Kochma?ski <dkochmanski@turtle-solutions.eu>
> CC: Roy Spliet <r.spliet@ultimaker.com>
> Cc: Ian Campbell <ijc@hellion.org.uk>
> Cc: Hans De Goede <hdegoede@redhat.com>
> ---
>   board/sunxi/board.c | 13 -------------
>   1 file changed, 13 deletions(-)
>
> diff --git a/board/sunxi/board.c b/board/sunxi/board.c
> index dc95431..a14096e 100644
> --- a/board/sunxi/board.c
> +++ b/board/sunxi/board.c
> @@ -297,19 +297,6 @@ int board_mmc_init(bd_t *bis)
>   		return -1;
>   #endif
>
> -#if CONFIG_MMC_SUNXI_SLOT == 0 && CONFIG_MMC_SUNXI_SLOT_EXTRA == 2
> -	/*
> -	 * Both mmc0 and mmc2 are bootable, figure out where we're booting
> -	 * from. Try mmc0 first, just like the brom does.
> -	 */
> -	if (sunxi_mmc_has_egon_boot_signature(mmc0))
> -		return 0;
> -
> -	/* no bootable card in mmc0, so we must be booting from mmc2, swap */
> -	mmc0->block_dev.dev = 1;
> -	mmc1->block_dev.dev = 0;
> -#endif
> -
>   	return 0;
>   }
>   #endif
>