mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-27 15:12:21 +00:00
2a766db938
U-Boot README recommends initializing SDRAM in board_init_f(). DA850
was doing it as part of board_init_r() (through call to spl_board_init()
which calls arch_cpu_init() which calls da850_ddr_setup())
This worked fine till commit 15b8c75058 ("davinci:
da850evm/omapl138-lcdk: Move BSS to SDRAM because SRAM is full") moved
BSS to SDRAM.
Functions like mmc_initialize() called in board_init_r() assume BSS is
available. Since SDRAM was not initialized when arch/arm/lib/crt0.S tried
to initialize BSS to 0, BSS is not initialized correctly.
Fix this by simply calling arch_cpu_init() from board_init_f(). Also move
preloader_console_init() there to help debug issues with board_init_r().
With this spl_board_init() is no longer needed, we remove it.
Tested using MMC/SD boot on OMAP-L138 LCDK board.
Tested-by: Adam Ford <aford173@gmail.com> #da850evm
Signed-off-by: Sekhar Nori <nsekhar@ti.com>
Tested-by: Peter Howard <phoward@gme.net.au> #omapl138_lcdk
68 lines
1.2 KiB
C
68 lines
1.2 KiB
C
// SPDX-License-Identifier: GPL-2.0+
|
|
/*
|
|
* Copyright (C) 2011
|
|
* Heiko Schocher, DENX Software Engineering, hs@denx.de.
|
|
*/
|
|
#include <common.h>
|
|
#include <config.h>
|
|
#include <spl.h>
|
|
#include <asm/u-boot.h>
|
|
#include <asm/utils.h>
|
|
#include <nand.h>
|
|
#include <asm/arch/dm365_lowlevel.h>
|
|
#include <ns16550.h>
|
|
#include <malloc.h>
|
|
#include <spi_flash.h>
|
|
#include <mmc.h>
|
|
|
|
#ifndef CONFIG_SPL_LIBCOMMON_SUPPORT
|
|
void puts(const char *str)
|
|
{
|
|
while (*str)
|
|
putc(*str++);
|
|
}
|
|
|
|
void putc(char c)
|
|
{
|
|
if (c == '\n')
|
|
NS16550_putc((NS16550_t)(CONFIG_SYS_NS16550_COM1), '\r');
|
|
|
|
NS16550_putc((NS16550_t)(CONFIG_SYS_NS16550_COM1), c);
|
|
}
|
|
#endif /* CONFIG_SPL_LIBCOMMON_SUPPORT */
|
|
|
|
void board_init_f(ulong dummy)
|
|
{
|
|
arch_cpu_init();
|
|
|
|
spl_early_init();
|
|
|
|
preloader_console_init();
|
|
}
|
|
|
|
u32 spl_boot_device(void)
|
|
{
|
|
switch (davinci_syscfg_regs->bootcfg) {
|
|
#ifdef CONFIG_SPL_NAND_SUPPORT
|
|
case DAVINCI_NAND8_BOOT:
|
|
case DAVINCI_NAND16_BOOT:
|
|
return BOOT_DEVICE_NAND;
|
|
#endif
|
|
|
|
#ifdef CONFIG_SPL_MMC_SUPPORT
|
|
case DAVINCI_SD_OR_MMC_BOOT:
|
|
case DAVINCI_MMC_ONLY_BOOT:
|
|
return BOOT_DEVICE_MMC1;
|
|
#endif
|
|
|
|
#ifdef CONFIG_SPL_SPI_FLASH_SUPPORT
|
|
case DAVINCI_SPI0_FLASH_BOOT:
|
|
case DAVINCI_SPI1_FLASH_BOOT:
|
|
return BOOT_DEVICE_SPI;
|
|
#endif
|
|
|
|
default:
|
|
puts("Unknown boot device\n");
|
|
hang();
|
|
}
|
|
}
|