mirror of
https://github.com/smaeul/u-boot.git
synced 2025-10-25 01:58:13 +01:00
f2863ff3f4
The bmode command forces the SoC to use a specific boot device by writing its boot mode into SRC_GPR9, and notifying the SoC of the change using SRC_GPR10[28] bit: if the bit is on, bootROM uses the value in SRC_GPR9 instead of SRC_SMBR1 to determine the boot device. SPL on the other hand is oblivious to this distinction, so once the bootROM loads SPL from the device configured in SRC_GPR10, SPL will attempt to load U-Boot from the device configured in SRC_SMBR1, which is not updated by the bootROM to the value in SRC_GPR9. The result is that the selected boot device is not used across all the boot stages. Update spl_boot_device() to look at gpr9 when necessary. Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il> Cc: Stefano Babic <sbabic@denx.de> Cc: Troy Kisky <troy.kisky@boundarydevices.com> Cc: Tim Harvey <tharvey@gateworks.com> Cc: Eric Nelson <eric.nelson@boundarydevices.com> Cc: Fabio Estevam <fabio.estevam@freescale.com> Cc: Heiko Schocher <hs@denx.de>
83 lines
1.9 KiB
C
83 lines
1.9 KiB
C
/*
|
|
* Copyright (C) 2014 Gateworks Corporation
|
|
* Copyright (C) 2011-2012 Freescale Semiconductor, Inc.
|
|
*
|
|
* Author: Tim Harvey <tharvey@gateworks.com>
|
|
*
|
|
* SPDX-License-Identifier: GPL-2.0+
|
|
*/
|
|
|
|
#include <common.h>
|
|
#include <asm/io.h>
|
|
#include <asm/arch/imx-regs.h>
|
|
#include <asm/spl.h>
|
|
#include <spl.h>
|
|
|
|
#if defined(CONFIG_MX6)
|
|
/* determine boot device from SRC_SBMR1 (BOOT_CFG[4:1]) or SRC_GPR9 register */
|
|
u32 spl_boot_device(void)
|
|
{
|
|
struct src *psrc = (struct src *)SRC_BASE_ADDR;
|
|
unsigned int gpr10_boot = readl(&psrc->gpr10) & (1 << 28);
|
|
unsigned reg = gpr10_boot ? readl(&psrc->gpr9) : readl(&psrc->sbmr1);
|
|
|
|
/* BOOT_CFG1[7:4] - see IMX6DQRM Table 8-8 */
|
|
switch ((reg & 0x000000FF) >> 4) {
|
|
/* EIM: See 8.5.1, Table 8-9 */
|
|
case 0x0:
|
|
/* BOOT_CFG1[3]: NOR/OneNAND Selection */
|
|
if ((reg & 0x00000008) >> 3)
|
|
return BOOT_DEVICE_ONENAND;
|
|
else
|
|
return BOOT_DEVICE_NOR;
|
|
break;
|
|
/* SATA: See 8.5.4, Table 8-20 */
|
|
case 0x2:
|
|
return BOOT_DEVICE_SATA;
|
|
/* Serial ROM: See 8.5.5.1, Table 8-22 */
|
|
case 0x3:
|
|
/* BOOT_CFG4[2:0] */
|
|
switch ((reg & 0x07000000) >> 24) {
|
|
case 0x0 ... 0x4:
|
|
return BOOT_DEVICE_SPI;
|
|
case 0x5 ... 0x7:
|
|
return BOOT_DEVICE_I2C;
|
|
}
|
|
break;
|
|
/* SD/eSD: 8.5.3, Table 8-15 */
|
|
case 0x4:
|
|
case 0x5:
|
|
return BOOT_DEVICE_MMC1;
|
|
/* MMC/eMMC: 8.5.3 */
|
|
case 0x6:
|
|
case 0x7:
|
|
return BOOT_DEVICE_MMC1;
|
|
/* NAND Flash: 8.5.2 */
|
|
case 0x8 ... 0xf:
|
|
return BOOT_DEVICE_NAND;
|
|
}
|
|
return BOOT_DEVICE_NONE;
|
|
}
|
|
#endif
|
|
|
|
#if defined(CONFIG_SPL_MMC_SUPPORT)
|
|
/* called from spl_mmc to see type of boot mode for storage (RAW or FAT) */
|
|
u32 spl_boot_mode(void)
|
|
{
|
|
switch (spl_boot_device()) {
|
|
/* for MMC return either RAW or FAT mode */
|
|
case BOOT_DEVICE_MMC1:
|
|
case BOOT_DEVICE_MMC2:
|
|
#ifdef CONFIG_SPL_FAT_SUPPORT
|
|
return MMCSD_MODE_FS;
|
|
#else
|
|
return MMCSD_MODE_RAW;
|
|
#endif
|
|
break;
|
|
default:
|
|
puts("spl: ERROR: unsupported device\n");
|
|
hang();
|
|
}
|
|
}
|
|
#endif
|