mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-16 17:58:23 +00:00
576434b205
The board_boot_order() function currenly assumes that the boot source
is MMC/eMMC, but this isn't true for the NAND devices.
This patch cleans up board_boot_order() to check for NAND, SD, ESD,
MMC or EMMC. Anything beyond these are not supported, so it will
default back to the serial downloader if any of those devices are not
available.
Fixes: 9fb50c68da ("ARM: imx6q_logic: Fix MMC2 booting")
Signed-off-by: Adam Ford <aford173@gmail.com>
323 lines
8.2 KiB
C
323 lines
8.2 KiB
C
// SPDX-License-Identifier: GPL-2.0+
|
|
/*
|
|
* Copyright (C) 2017 Logic PD, Inc.
|
|
*
|
|
* Author: Adam Ford <aford173@gmail.com>
|
|
*
|
|
* Based on SabreSD by Fabio Estevam <fabio.estevam@nxp.com>
|
|
* and updates by Jagan Teki <jagan@amarulasolutions.com>
|
|
*/
|
|
|
|
#include <common.h>
|
|
#include <env.h>
|
|
#include <init.h>
|
|
#include <miiphy.h>
|
|
#include <input.h>
|
|
#include <mmc.h>
|
|
#include <fsl_esdhc_imx.h>
|
|
#include <serial.h>
|
|
#include <asm/io.h>
|
|
#include <asm/gpio.h>
|
|
#include <linux/sizes.h>
|
|
#include <asm/arch/clock.h>
|
|
#include <asm/arch/crm_regs.h>
|
|
#include <asm/arch/iomux.h>
|
|
#include <asm/arch/mxc_hdmi.h>
|
|
#include <asm/arch/mx6-pins.h>
|
|
#include <asm/arch/sys_proto.h>
|
|
#include <asm/mach-imx/boot_mode.h>
|
|
#include <asm/mach-imx/iomux-v3.h>
|
|
|
|
DECLARE_GLOBAL_DATA_PTR;
|
|
|
|
#define UART_PAD_CTRL (PAD_CTL_PKE | PAD_CTL_PUE | \
|
|
PAD_CTL_PUS_100K_UP | PAD_CTL_SPEED_MED | \
|
|
PAD_CTL_DSE_40ohm | PAD_CTL_SRE_FAST | PAD_CTL_HYS)
|
|
|
|
#define NAND_PAD_CTRL (PAD_CTL_PKE | PAD_CTL_PUE | \
|
|
PAD_CTL_PUS_100K_UP | PAD_CTL_SPEED_MED | \
|
|
PAD_CTL_DSE_40ohm | PAD_CTL_HYS)
|
|
|
|
int dram_init(void)
|
|
{
|
|
gd->ram_size = imx_ddr_size();
|
|
return 0;
|
|
}
|
|
|
|
static iomux_v3_cfg_t const nand_pads[] = {
|
|
MX6_PAD_NANDF_CS0__NAND_CE0_B | MUX_PAD_CTRL(NAND_PAD_CTRL),
|
|
MX6_PAD_NANDF_ALE__NAND_ALE | MUX_PAD_CTRL(NAND_PAD_CTRL),
|
|
MX6_PAD_NANDF_CLE__NAND_CLE | MUX_PAD_CTRL(NAND_PAD_CTRL),
|
|
MX6_PAD_NANDF_WP_B__NAND_WP_B | MUX_PAD_CTRL(NAND_PAD_CTRL),
|
|
MX6_PAD_NANDF_RB0__NAND_READY_B | MUX_PAD_CTRL(NAND_PAD_CTRL),
|
|
MX6_PAD_NANDF_D0__NAND_DATA00 | MUX_PAD_CTRL(NAND_PAD_CTRL),
|
|
MX6_PAD_NANDF_D1__NAND_DATA01 | MUX_PAD_CTRL(NAND_PAD_CTRL),
|
|
MX6_PAD_NANDF_D2__NAND_DATA02 | MUX_PAD_CTRL(NAND_PAD_CTRL),
|
|
MX6_PAD_NANDF_D3__NAND_DATA03 | MUX_PAD_CTRL(NAND_PAD_CTRL),
|
|
MX6_PAD_NANDF_D4__NAND_DATA04 | MUX_PAD_CTRL(NAND_PAD_CTRL),
|
|
MX6_PAD_NANDF_D5__NAND_DATA05 | MUX_PAD_CTRL(NAND_PAD_CTRL),
|
|
MX6_PAD_NANDF_D6__NAND_DATA06 | MUX_PAD_CTRL(NAND_PAD_CTRL),
|
|
MX6_PAD_NANDF_D7__NAND_DATA07 | MUX_PAD_CTRL(NAND_PAD_CTRL),
|
|
MX6_PAD_SD4_CLK__NAND_WE_B | MUX_PAD_CTRL(NAND_PAD_CTRL),
|
|
MX6_PAD_SD4_CMD__NAND_RE_B | MUX_PAD_CTRL(NAND_PAD_CTRL),
|
|
};
|
|
|
|
static void setup_nand_pins(void)
|
|
{
|
|
imx_iomux_v3_setup_multiple_pads(nand_pads, ARRAY_SIZE(nand_pads));
|
|
}
|
|
|
|
static int ar8031_phy_fixup(struct phy_device *phydev)
|
|
{
|
|
unsigned short val;
|
|
|
|
/* To enable AR8031 output a 125MHz clk from CLK_25M */
|
|
phy_write(phydev, MDIO_DEVAD_NONE, 0xd, 0x7);
|
|
phy_write(phydev, MDIO_DEVAD_NONE, 0xe, 0x8016);
|
|
phy_write(phydev, MDIO_DEVAD_NONE, 0xd, 0x4007);
|
|
|
|
val = phy_read(phydev, MDIO_DEVAD_NONE, 0xe);
|
|
val &= 0xffe3;
|
|
val |= 0x18;
|
|
phy_write(phydev, MDIO_DEVAD_NONE, 0xe, val);
|
|
|
|
/* introduce tx clock delay */
|
|
phy_write(phydev, MDIO_DEVAD_NONE, 0x1d, 0x5);
|
|
val = phy_read(phydev, MDIO_DEVAD_NONE, 0x1e);
|
|
val |= 0x0100;
|
|
phy_write(phydev, MDIO_DEVAD_NONE, 0x1e, val);
|
|
|
|
return 0;
|
|
}
|
|
|
|
int board_phy_config(struct phy_device *phydev)
|
|
{
|
|
ar8031_phy_fixup(phydev);
|
|
|
|
if (phydev->drv->config)
|
|
phydev->drv->config(phydev);
|
|
|
|
return 0;
|
|
}
|
|
|
|
/*
|
|
* Do not overwrite the console
|
|
* Use always serial for U-Boot console
|
|
*/
|
|
int overwrite_console(void)
|
|
{
|
|
return 1;
|
|
}
|
|
|
|
int board_early_init_f(void)
|
|
{
|
|
setup_nand_pins();
|
|
return 0;
|
|
}
|
|
|
|
int board_init(void)
|
|
{
|
|
/* address of boot parameters */
|
|
gd->bd->bi_boot_params = PHYS_SDRAM + 0x100;
|
|
return 0;
|
|
}
|
|
|
|
int board_late_init(void)
|
|
{
|
|
env_set("board_name", "imx6logic");
|
|
|
|
if (is_mx6dq()) {
|
|
env_set("board_rev", "MX6DQ");
|
|
if (!env_get("fdt_file"))
|
|
env_set("fdt_file", "imx6q-logicpd.dtb");
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
#ifdef CONFIG_SPL_BUILD
|
|
#include <asm/arch/mx6-ddr.h>
|
|
#include <asm/arch/mx6q-ddr.h>
|
|
#include <spl.h>
|
|
#include <linux/libfdt.h>
|
|
|
|
#ifdef CONFIG_SPL_OS_BOOT
|
|
int spl_start_uboot(void)
|
|
{
|
|
/* break into full u-boot on 'c' */
|
|
if (serial_tstc() && serial_getc() == 'c')
|
|
return 1;
|
|
|
|
return 0;
|
|
}
|
|
#endif
|
|
|
|
void board_boot_order(u32 *spl_boot_list)
|
|
{
|
|
struct src *psrc = (struct src *)SRC_BASE_ADDR;
|
|
unsigned int reg = readl(&psrc->sbmr1) >> 11;
|
|
u32 boot_mode = imx6_src_get_boot_mode() & IMX6_BMODE_MASK;
|
|
unsigned int bmode = readl(&src_base->sbmr2);
|
|
|
|
/* If bmode is serial or USB phy is active, return serial */
|
|
if (((bmode >> 24) & 0x03) == 0x01 || is_usbotg_phy_active()) {
|
|
spl_boot_list[0] = BOOT_DEVICE_BOARD;
|
|
return;
|
|
}
|
|
|
|
switch (boot_mode >> IMX6_BMODE_SHIFT) {
|
|
case IMX6_BMODE_NAND_MIN ... IMX6_BMODE_NAND_MAX:
|
|
spl_boot_list[0] = BOOT_DEVICE_NAND;
|
|
break;
|
|
case IMX6_BMODE_SD:
|
|
case IMX6_BMODE_ESD:
|
|
case IMX6_BMODE_MMC:
|
|
case IMX6_BMODE_EMMC:
|
|
/*
|
|
* Upon reading BOOT_CFG register the following map is done:
|
|
* Bit 11 and 12 of BOOT_CFG register can determine the current
|
|
* mmc port
|
|
* 0x1 SD1-SOM
|
|
* 0x2 SD2-Baseboard
|
|
*/
|
|
|
|
reg &= 0x3; /* Only care about bottom 2 bits */
|
|
switch (reg) {
|
|
case 0:
|
|
spl_boot_list[0] = BOOT_DEVICE_MMC1;
|
|
break;
|
|
case 1:
|
|
spl_boot_list[0] = BOOT_DEVICE_MMC2;
|
|
break;
|
|
}
|
|
break;
|
|
default:
|
|
/* By default use USB downloader */
|
|
spl_boot_list[0] = BOOT_DEVICE_BOARD;
|
|
break;
|
|
}
|
|
|
|
/* As a last resort, use serial downloader */
|
|
spl_boot_list[1] = BOOT_DEVICE_BOARD;
|
|
}
|
|
|
|
static void ccgr_init(void)
|
|
{
|
|
struct mxc_ccm_reg *ccm = (struct mxc_ccm_reg *)CCM_BASE_ADDR;
|
|
|
|
writel(0x00C03F3F, &ccm->CCGR0);
|
|
writel(0x0030FC03, &ccm->CCGR1);
|
|
writel(0x0FFFC000, &ccm->CCGR2);
|
|
writel(0x3FF00000, &ccm->CCGR3);
|
|
writel(0xFFFFF300, &ccm->CCGR4);
|
|
writel(0x0F0000F3, &ccm->CCGR5);
|
|
writel(0x00000FFF, &ccm->CCGR6);
|
|
}
|
|
|
|
static int mx6q_dcd_table[] = {
|
|
MX6_IOM_GRP_DDR_TYPE, 0x000C0000,
|
|
MX6_IOM_GRP_DDRPKE, 0x00000000,
|
|
MX6_IOM_DRAM_SDCLK_0, 0x00000030,
|
|
MX6_IOM_DRAM_SDCLK_1, 0x00000030,
|
|
MX6_IOM_DRAM_CAS, 0x00000030,
|
|
MX6_IOM_DRAM_RAS, 0x00000030,
|
|
MX6_IOM_GRP_ADDDS, 0x00000030,
|
|
MX6_IOM_DRAM_RESET, 0x00000030,
|
|
MX6_IOM_DRAM_SDBA2, 0x00000000,
|
|
MX6_IOM_DRAM_SDODT0, 0x00000030,
|
|
MX6_IOM_DRAM_SDODT1, 0x00000030,
|
|
MX6_IOM_GRP_CTLDS, 0x00000030,
|
|
MX6_IOM_DDRMODE_CTL, 0x00020000,
|
|
MX6_IOM_DRAM_SDQS0, 0x00000030,
|
|
MX6_IOM_DRAM_SDQS1, 0x00000030,
|
|
MX6_IOM_DRAM_SDQS2, 0x00000030,
|
|
MX6_IOM_DRAM_SDQS3, 0x00000030,
|
|
MX6_IOM_GRP_DDRMODE, 0x00020000,
|
|
MX6_IOM_GRP_B0DS, 0x00000030,
|
|
MX6_IOM_GRP_B1DS, 0x00000030,
|
|
MX6_IOM_GRP_B2DS, 0x00000030,
|
|
MX6_IOM_GRP_B3DS, 0x00000030,
|
|
MX6_IOM_DRAM_DQM0, 0x00000030,
|
|
MX6_IOM_DRAM_DQM1, 0x00000030,
|
|
MX6_IOM_DRAM_DQM2, 0x00000030,
|
|
MX6_IOM_DRAM_DQM3, 0x00000030,
|
|
MX6_MMDC_P0_MDSCR, 0x00008000,
|
|
MX6_MMDC_P0_MPZQHWCTRL, 0xA1390003,
|
|
MX6_MMDC_P0_MPWLDECTRL0, 0x002D003A,
|
|
MX6_MMDC_P0_MPWLDECTRL1, 0x0038002B,
|
|
MX6_MMDC_P0_MPDGCTRL0, 0x03340338,
|
|
MX6_MMDC_P0_MPDGCTRL1, 0x0334032C,
|
|
MX6_MMDC_P0_MPRDDLCTL, 0x4036383C,
|
|
MX6_MMDC_P0_MPWRDLCTL, 0x2E384038,
|
|
MX6_MMDC_P0_MPRDDQBY0DL, 0x33333333,
|
|
MX6_MMDC_P0_MPRDDQBY1DL, 0x33333333,
|
|
MX6_MMDC_P0_MPRDDQBY2DL, 0x33333333,
|
|
MX6_MMDC_P0_MPRDDQBY3DL, 0x33333333,
|
|
MX6_MMDC_P0_MPMUR0, 0x00000800,
|
|
MX6_MMDC_P0_MDPDC, 0x00020036,
|
|
MX6_MMDC_P0_MDOTC, 0x09444040,
|
|
MX6_MMDC_P0_MDCFG0, 0xB8BE7955,
|
|
MX6_MMDC_P0_MDCFG1, 0xFF328F64,
|
|
MX6_MMDC_P0_MDCFG2, 0x01FF00DB,
|
|
MX6_MMDC_P0_MDMISC, 0x00011740,
|
|
MX6_MMDC_P0_MDSCR, 0x00008000,
|
|
MX6_MMDC_P0_MDRWD, 0x000026D2,
|
|
MX6_MMDC_P0_MDOR, 0x00BE1023,
|
|
MX6_MMDC_P0_MDASP, 0x00000047,
|
|
MX6_MMDC_P0_MDCTL, 0x85190000,
|
|
MX6_MMDC_P0_MDSCR, 0x00888032,
|
|
MX6_MMDC_P0_MDSCR, 0x00008033,
|
|
MX6_MMDC_P0_MDSCR, 0x00008031,
|
|
MX6_MMDC_P0_MDSCR, 0x19408030,
|
|
MX6_MMDC_P0_MDSCR, 0x04008040,
|
|
MX6_MMDC_P0_MDREF, 0x00007800,
|
|
MX6_MMDC_P0_MPODTCTRL, 0x00000007,
|
|
MX6_MMDC_P0_MDPDC, 0x00025576,
|
|
MX6_MMDC_P0_MAPSR, 0x00011006,
|
|
MX6_MMDC_P0_MDSCR, 0x00000000,
|
|
/* enable AXI cache for VDOA/VPU/IPU */
|
|
|
|
MX6_IOMUXC_GPR4, 0xF00000CF,
|
|
/* set IPU AXI-id0 Qos=0xf(bypass) AXI-id1 Qos=0x7 */
|
|
MX6_IOMUXC_GPR6, 0x007F007F,
|
|
MX6_IOMUXC_GPR7, 0x007F007F,
|
|
};
|
|
|
|
static void ddr_init(int *table, int size)
|
|
{
|
|
int i;
|
|
|
|
for (i = 0; i < size / 2 ; i++)
|
|
writel(table[2 * i + 1], table[2 * i]);
|
|
}
|
|
|
|
static void spl_dram_init(void)
|
|
{
|
|
if (is_mx6dq())
|
|
ddr_init(mx6q_dcd_table, ARRAY_SIZE(mx6q_dcd_table));
|
|
}
|
|
|
|
void board_init_f(ulong dummy)
|
|
{
|
|
/* DDR initialization */
|
|
spl_dram_init();
|
|
|
|
/* setup AIPS and disable watchdog */
|
|
arch_cpu_init();
|
|
|
|
ccgr_init();
|
|
gpr_init();
|
|
|
|
/* iomux and setup of uart and NAND pins */
|
|
board_early_init_f();
|
|
|
|
/* setup GP timer */
|
|
timer_init();
|
|
|
|
/* Enable device tree and early DM support*/
|
|
spl_early_init();
|
|
|
|
/* UART clocks enabled and gd valid - init serial console */
|
|
preloader_console_init();
|
|
}
|
|
#endif
|