[U-Boot] [PATCH 1/3] OMAP3/4/5/AM33xx: Correct logic for checking FAT or RAW MMC

[Peter Korsgaard]

>>>>> "Tom" == Tom Rini <trini at ti.com> writes:

 Tom> In the case of booting from certain peripherals, such as UART, we must
 Tom> not see what the device descriptor says for RAW or FAT mode because in
 Tom> addition to being nonsensical, it leads to a hang.  This is why we have
 Tom> a test currently for the boot mode being within range.  The problem
 Tom> however is that on some platforms we get MMC2_2 as the boot mode and not
 Tom> the defined value for MMC2, and in others we get the value for MMC2_2.
 Tom> This is required to fix eMMC booting on omap5_uevm.

 Tom> Tested on am335x_evm (UART, NAND, SD), omap3_beagle (NAND, SD on
 Tom> classic, SD only on xM rev C5) and omap5_uevm (SD, eMMC).

 Tom> Signed-off-by: Tom Rini <trini at ti.com>
 Tom> ---
 Tom>  arch/arm/cpu/armv7/omap-common/lowlevel_init.S |   10 +++++++---
 Tom>  arch/arm/include/asm/arch-am33xx/spl.h         |    3 +++
 Tom>  arch/arm/include/asm/arch-omap3/spl.h          |    3 +++
 Tom>  arch/arm/include/asm/arch-omap4/spl.h          |    2 ++
 Tom>  arch/arm/include/asm/arch-omap5/spl.h          |    2 ++
 Tom>  5 files changed, 17 insertions(+), 3 deletions(-)

 Tom> diff --git a/arch/arm/cpu/armv7/omap-common/lowlevel_init.S b/arch/arm/cpu/armv7/omap-common/lowlevel_init.S
 Tom> index b933fe8..90b3c8a 100644
 Tom> --- a/arch/arm/cpu/armv7/omap-common/lowlevel_init.S
 Tom> +++ b/arch/arm/cpu/armv7/omap-common/lowlevel_init.S
 Tom> @@ -60,10 +60,14 @@ ENTRY(save_boot_params)
 Tom>  	ldr	r3, =boot_params
 Tom>  	strb	r2, [r3, #BOOT_DEVICE_OFFSET]	@ spl_boot_device <- r1
 
 Tom> -	/* boot mode is passed only for devices that can raw/fat mode */
 Tom> -	cmp	r2, #BOOT_DEVICE_XIP
 Tom> +	/*
 Tom> +	 * boot mode is only valid for device that can be raw or FAT booted.
 Tom> +	 * in other cases it may be fatal to look.  While platforms differ
 Tom> +	 * in the values used for each MMC slot, they are contiguous.
 Tom> +	 */
 Tom> +	cmp	r2, #MMC_BOOT_DEVICES_START
 Tom>  	blt	2f
 Tom> -	cmp	r2, #BOOT_DEVICE_MMC2
 Tom> +	cmp	r2, #MMC_BOOT_DEVICES_END
 Tom>  	bgt	2f
 Tom>  	/* Store the boot mode (raw/FAT) in omap_bootmode */
 Tom>  	ldr	r2, [r0, #DEV_DESC_PTR_OFFSET]	@ get the device descriptor ptr
 Tom> diff --git a/arch/arm/include/asm/arch-am33xx/spl.h b/arch/arm/include/asm/arch-am33xx/spl.h
 Tom> index f60b086..14a2c7c 100644
 Tom> --- a/arch/arm/include/asm/arch-am33xx/spl.h
 Tom> +++ b/arch/arm/include/asm/arch-am33xx/spl.h
 Tom> @@ -37,4 +37,7 @@
 Tom>  #define BOOT_DEVICE_USBETH	68
 Tom>  #define BOOT_DEVICE_CPGMAC	70
 Tom>  #define BOOT_DEVICE_MMC2_2      0xFF
 Tom> +
 Tom> +#define MMC_BOOT_DEVICES_START	BOOT_DEVICE_MMC1
 Tom> +#define MMC_BOOT_DEVICES_END	BOOT_DEVICE_MMC2

Doesn't this break ti814x with the funky inverted mmc1/mmc2?

-- 
Bye, Peter Korsgaard