[U-Boot] mx6cuboxi fails to load u-boot.img

[Jonathan Gray]

On Thu, Sep 26, 2019 at 05:07:21PM -0300, Fabio Estevam wrote:
> Hi Vagrant,
> 
> On Thu, Sep 26, 2019 at 4:16 PM Vagrant Cascadian <vagrant at debian.org> wrote:
> >
> > I just tested mx6cuboxi with 2019.10-rc4, and it fails to load
> > u-boot.img from MMC:
> >
> > 1 2019-09-26_17:31:27.63089 U-Boot SPL 2019.10-rc4+dfsg-1 (Sep 24 2019 -
> > 08:03:23 +0000)
> > 2 2019-09-26_17:31:27.63092 Trying to boot from MMC2
> > 3 2019-09-26_17:31:27.63095 MMC Device 1 not found
> > 4 2019-09-26_17:31:27.63097 spl: could not find mmc device 1. error: -19
> > 5 2019-09-26_17:31:27.63099 SPL: failed to boot from all boot devices
> > 6 2019-09-26_17:31:27.63101 ### ERROR ### Please RESET the board ###
> 
> Thanks for reporting this issue.
> 
> Unfortunately, I don't have access to my Cuboxi, so I am adding Jon
> and Baruch on Cc.

Works after reverting the following commit.

14d319b1856b86e593e01abd0a1e3c2d63b52a8a is the first bad commit
commit 14d319b1856b86e593e01abd0a1e3c2d63b52a8a
Author: Adam Ford <aford173 at gmail.com>
Date:   Thu May 23 14:11:30 2019 -0500

    spl: imx6: Let spl_boot_device return USDHC1 or USDHC2
    
    Currently, when the spl_boot_device checks the boot device, it
    will only return MMC1 when it's either sd or eMMC regardless
    of whether or not it's MMC1 or MMC2.  This is a problem when
    booting from MMC2 if MMC isn't being manually configured like in
    the DM_SPL case with SPL_OF_CONTROL.
    
    This patch will check the register and return either MMC1 or MMC2.
    
    Signed-off-by: Adam Ford <aford173 at gmail.com>

 arch/arm/mach-imx/spl.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)