Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-24 21:54:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

da850/omap-l138: Add support to read u-boot image from MMC/SD

Browse source 
DA850/OMAP-L138 does not support strict MMC/SD boot mode. SPL will
be in SPI flash and U-Boot image will be in MMC/SD card. SPL will
do the low level initialization and then loads the u-boot image
from MMC/SD card.

Define CONFIG_SPL_MMC_LOAD macro in the DA850/OMAP-L138
configuration file to enable this feature.

Tested-by: Christian Riesch <christian.riesch@omicron.at>
Signed-off-by: Lad, Prabhakar <prabhakar.lad@ti.com>
Signed-off-by: Rajashekhara, Sudhakar <sudhakar.raj@ti.com>
Signed-off-by: Hadli, Manjunath <manjunath.hadli@ti.com>
This commit is contained in:
Lad, Prabhakar 2012-06-24 21:35:20 +00:00 committed by Albert ARIBAUD
parent 42612104fc
commit 0d986e61e2
5 changed files with 84 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
arch/arm/cpu/arm926ejs/davinci/spl.c
View file

@ -28,6 +28,7 @@
#include <ns16550.h>
#include <malloc.h>
#include <spi_flash.h>
#include <mmc.h>
#ifdef CONFIG_SPL_LIBCOMMON_SUPPORT
@ -96,4 +97,8 @@ void board_init_r(gd_t *id, ulong dummy)
puts("SPI boot...\n");
spi_boot();
#endif
#ifdef CONFIG_SPL_MMC_LOAD
puts("MMC boot...\n");
spl_mmc_load();
#endif
}

4
drivers/mmc/Makefile
View file

@ -25,6 +25,10 @@ include $(TOPDIR)/config.mk
LIB := $(obj)libmmc.o
ifdef CONFIG_SPL_MMC_LOAD
COBJS-$(CONFIG_SPL_MMC_LOAD) += spl_mmc_load.o
endif
COBJS-$(CONFIG_BFIN_SDH) += bfin_sdh.o
COBJS-$(CONFIG_DAVINCI_MMC) += davinci_mmc.o
COBJS-$(CONFIG_FSL_ESDHC) += fsl_esdhc.o

62
drivers/mmc/spl_mmc_load.c Normal file
View file

@ -0,0 +1,62 @@
/*
* Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com/
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#include <common.h>
#include <mmc.h>
DECLARE_GLOBAL_DATA_PTR;
static void mmc_load_image(struct mmc *mmc)
{
s32 err;
void (*uboot)(void) __noreturn;
err = mmc->block_dev.block_read(0, CONFIG_SYS_MMC_U_BOOT_OFFS,
CONFIG_SYS_MMC_U_BOOT_SIZE/512,
(u32 *)CONFIG_SYS_TEXT_BASE);
if (err <= 0) {
printf("spl: error reading image %s, err - %d\n",
"u-boot.img", err);
hang();
}
uboot = (void *) CONFIG_SYS_TEXT_BASE;
(*uboot)();
}
void spl_mmc_load(void)
{
struct mmc *mmc;
int err;
void (mmc_load_image)(struct mmc *mmc) __noreturn;
mmc_initialize(gd->bd);
mmc = find_mmc_device(0);
if (!mmc) {
puts("spl: mmc device not found!!\n");
hang();
} else {
puts("spl: mmc device found\n");
}
err = mmc_init(mmc);
if (err) {
printf("spl: mmc init failed: err - %d\n", err);
hang();
}
mmc_load_image(mmc);
}

11
include/configs/da850evm.h
View file

@ -350,6 +350,17 @@
#define CONFIG_SPL_TEXT_BASE 0x80000000
#define CONFIG_SPL_MAX_SIZE 32768
/* Load U-Boot Image From MMC */
#ifdef CONFIG_SPL_MMC_LOAD
#define CONFIG_SPL_MMC_SUPPORT
#define CONFIG_SPL_FAT_SUPPORT
#define CONFIG_SPL_LIBDISK_SUPPORT
#define CONFIG_SYS_MMC_U_BOOT_OFFS 0x75
#define CONFIG_SYS_MMC_U_BOOT_SIZE 0x30000
#undef CONFIG_SPL_SPI_LOAD
#endif
/* additions for new relocation code, must added to all boards */
#define CONFIG_SYS_SDRAM_BASE 0xc0000000
#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_SDRAM_BASE + 0x1000 - /* Fix this */ \

2
include/mmc.h
View file

@ -27,6 +27,7 @@
#define _MMC_H_
#include <linux/list.h>
#include <linux/compiler.h>
#define SD_VERSION_SD 0x20000
#define SD_VERSION_2 (SD_VERSION_SD | 0x20)
@ -273,6 +274,7 @@ int get_mmc_num(void);
int board_mmc_getcd(struct mmc *mmc);
int mmc_switch_part(int dev_num, unsigned int part_num);
int mmc_getcd(struct mmc *mmc);
void spl_mmc_load(void) __noreturn;
#ifdef CONFIG_GENERIC_MMC
#define mmc_host_is_spi(mmc) ((mmc)->host_caps & MMC_MODE_SPI)