mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-12 16:07:30 +00:00
32f9ef3e2b
Reading the boot mode pins after power-up does not necessarily represent the boot mode used by the ROM loader. For example the state of a pin may have changed because a recovery switch which was pressed to enter USB mode is already released after plugging in USB. The ROM loader stores the value a fixed address in OCRAM. Use this value instead of reading the boot map pins. The GLOBAL_BOOT_MODE_ADDR for i.MX28 is taken from an U-Boot patch for the MX28EVK: http://repository.timesys.com/buildsources/u/u-boot/u-boot-2009.08/u-boot-2009.08-mx28-201012211513.patch Leave the boot mode detection for the i.MX23 untouched. Someone has to test whether the i.MX ROM loader does also store the boot mode in OCRAM and if the address match. This patch superseeds my incorrect patch: ARM: mxs: get boot mode from OTP http://patchwork.ozlabs.org/patch/454930/ Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks> Cc: Stefano Babic <sbabic@denx.de>
161 lines
4.3 KiB
C
161 lines
4.3 KiB
C
/*
|
|
* Freescale i.MX28 Boot setup
|
|
*
|
|
* Copyright (C) 2011 Marek Vasut <marek.vasut@gmail.com>
|
|
* on behalf of DENX Software Engineering GmbH
|
|
*
|
|
* SPDX-License-Identifier: GPL-2.0+
|
|
*/
|
|
|
|
#include <common.h>
|
|
#include <config.h>
|
|
#include <asm/io.h>
|
|
#include <asm/arch/imx-regs.h>
|
|
#include <asm/arch/sys_proto.h>
|
|
#include <asm/gpio.h>
|
|
#include <linux/compiler.h>
|
|
|
|
#include "mxs_init.h"
|
|
|
|
DECLARE_GLOBAL_DATA_PTR;
|
|
static gd_t gdata __section(".data");
|
|
#ifdef CONFIG_SPL_SERIAL_SUPPORT
|
|
static bd_t bdata __section(".data");
|
|
#endif
|
|
|
|
/*
|
|
* This delay function is intended to be used only in early stage of boot, where
|
|
* clock are not set up yet. The timer used here is reset on every boot and
|
|
* takes a few seconds to roll. The boot doesn't take that long, so to keep the
|
|
* code simple, it doesn't take rolling into consideration.
|
|
*/
|
|
void early_delay(int delay)
|
|
{
|
|
struct mxs_digctl_regs *digctl_regs =
|
|
(struct mxs_digctl_regs *)MXS_DIGCTL_BASE;
|
|
|
|
uint32_t st = readl(&digctl_regs->hw_digctl_microseconds);
|
|
st += delay;
|
|
while (st > readl(&digctl_regs->hw_digctl_microseconds))
|
|
;
|
|
}
|
|
|
|
#define MUX_CONFIG_BOOTMODE_PAD (MXS_PAD_3V3 | MXS_PAD_4MA | MXS_PAD_NOPULL)
|
|
static const iomux_cfg_t iomux_boot[] = {
|
|
#if defined(CONFIG_MX23)
|
|
MX23_PAD_LCD_D00__GPIO_1_0 | MUX_CONFIG_BOOTMODE_PAD,
|
|
MX23_PAD_LCD_D01__GPIO_1_1 | MUX_CONFIG_BOOTMODE_PAD,
|
|
MX23_PAD_LCD_D02__GPIO_1_2 | MUX_CONFIG_BOOTMODE_PAD,
|
|
MX23_PAD_LCD_D03__GPIO_1_3 | MUX_CONFIG_BOOTMODE_PAD,
|
|
MX23_PAD_LCD_D04__GPIO_1_4 | MUX_CONFIG_BOOTMODE_PAD,
|
|
MX23_PAD_LCD_D05__GPIO_1_5 | MUX_CONFIG_BOOTMODE_PAD,
|
|
#endif
|
|
};
|
|
|
|
static uint8_t mxs_get_bootmode_index(void)
|
|
{
|
|
uint8_t bootmode = 0;
|
|
int i;
|
|
uint8_t masked;
|
|
|
|
#if defined(CONFIG_MX23)
|
|
/* Setup IOMUX of bootmode pads to GPIO */
|
|
mxs_iomux_setup_multiple_pads(iomux_boot, ARRAY_SIZE(iomux_boot));
|
|
|
|
/* Setup bootmode pins as GPIO input */
|
|
gpio_direction_input(MX23_PAD_LCD_D00__GPIO_1_0);
|
|
gpio_direction_input(MX23_PAD_LCD_D01__GPIO_1_1);
|
|
gpio_direction_input(MX23_PAD_LCD_D02__GPIO_1_2);
|
|
gpio_direction_input(MX23_PAD_LCD_D03__GPIO_1_3);
|
|
gpio_direction_input(MX23_PAD_LCD_D05__GPIO_1_5);
|
|
|
|
/* Read bootmode pads */
|
|
bootmode |= (gpio_get_value(MX23_PAD_LCD_D00__GPIO_1_0) ? 1 : 0) << 0;
|
|
bootmode |= (gpio_get_value(MX23_PAD_LCD_D01__GPIO_1_1) ? 1 : 0) << 1;
|
|
bootmode |= (gpio_get_value(MX23_PAD_LCD_D02__GPIO_1_2) ? 1 : 0) << 2;
|
|
bootmode |= (gpio_get_value(MX23_PAD_LCD_D03__GPIO_1_3) ? 1 : 0) << 3;
|
|
bootmode |= (gpio_get_value(MX23_PAD_LCD_D05__GPIO_1_5) ? 1 : 0) << 5;
|
|
#elif defined(CONFIG_MX28)
|
|
/* The global boot mode will be detected by ROM code and its value
|
|
* is stored at the fixed address 0x00019BF0 in OCRAM.
|
|
*/
|
|
#define GLOBAL_BOOT_MODE_ADDR 0x00019BF0
|
|
bootmode = __raw_readl(GLOBAL_BOOT_MODE_ADDR);
|
|
#endif
|
|
|
|
for (i = 0; i < ARRAY_SIZE(mxs_boot_modes); i++) {
|
|
masked = bootmode & mxs_boot_modes[i].boot_mask;
|
|
if (masked == mxs_boot_modes[i].boot_pads)
|
|
break;
|
|
}
|
|
|
|
return i;
|
|
}
|
|
|
|
static void mxs_spl_fixup_vectors(void)
|
|
{
|
|
/*
|
|
* Copy our vector table to 0x0, since due to HAB, we cannot
|
|
* be loaded to 0x0. We want to have working vectoring though,
|
|
* thus this fixup. Our vectoring table is PIC, so copying is
|
|
* fine.
|
|
*/
|
|
extern uint32_t _start;
|
|
|
|
/* cppcheck-suppress nullPointer */
|
|
memcpy(0x0, &_start, 0x60);
|
|
}
|
|
|
|
static void mxs_spl_console_init(void)
|
|
{
|
|
#ifdef CONFIG_SPL_SERIAL_SUPPORT
|
|
gd->bd = &bdata;
|
|
gd->baudrate = CONFIG_BAUDRATE;
|
|
serial_init();
|
|
gd->have_console = 1;
|
|
#endif
|
|
}
|
|
|
|
void mxs_common_spl_init(const uint32_t arg, const uint32_t *resptr,
|
|
const iomux_cfg_t *iomux_setup,
|
|
const unsigned int iomux_size)
|
|
{
|
|
struct mxs_spl_data *data = (struct mxs_spl_data *)
|
|
((CONFIG_SYS_TEXT_BASE - sizeof(struct mxs_spl_data)) & ~0xf);
|
|
uint8_t bootmode = mxs_get_bootmode_index();
|
|
gd = &gdata;
|
|
|
|
mxs_spl_fixup_vectors();
|
|
|
|
mxs_iomux_setup_multiple_pads(iomux_setup, iomux_size);
|
|
|
|
mxs_spl_console_init();
|
|
debug("SPL: Serial Console Initialised\n");
|
|
|
|
mxs_power_init();
|
|
|
|
mxs_mem_init();
|
|
data->mem_dram_size = mxs_mem_get_size();
|
|
|
|
data->boot_mode_idx = bootmode;
|
|
|
|
mxs_power_wait_pswitch();
|
|
|
|
if (mxs_boot_modes[data->boot_mode_idx].boot_pads == MXS_BM_JTAG) {
|
|
debug("SPL: Waiting for JTAG user\n");
|
|
asm volatile ("x: b x");
|
|
}
|
|
}
|
|
|
|
/* Support aparatus */
|
|
inline void board_init_f(unsigned long bootflag)
|
|
{
|
|
for (;;)
|
|
;
|
|
}
|
|
|
|
inline void board_init_r(gd_t *id, ulong dest_addr)
|
|
{
|
|
for (;;)
|
|
;
|
|
}
|