am3517evm: Use generic MMC driver
Switch from the legacy mmc driver to the new generic mmc driver. This patch is based on similar patch for beagle[1]. [1] http://git.denx.de/?p=u-boot.git;a=commitdiff_plain;h=0cd31144240 Signed-off-by: Vaibhav Hiremath <hvaibhav@ti.com> Signed-off-by: Sanjeev Premi <premi@ti.com> Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
This commit is contained in:
parent
dcc4f38b43
commit
122e6e0a97
|
@ -28,6 +28,7 @@
|
||||||
#include <asm/arch/mem.h>
|
#include <asm/arch/mem.h>
|
||||||
#include <asm/arch/mux.h>
|
#include <asm/arch/mux.h>
|
||||||
#include <asm/arch/sys_proto.h>
|
#include <asm/arch/sys_proto.h>
|
||||||
|
#include <asm/arch/mmc_host_def.h>
|
||||||
#include <asm/mach-types.h>
|
#include <asm/mach-types.h>
|
||||||
#include <i2c.h>
|
#include <i2c.h>
|
||||||
#include "am3517evm.h"
|
#include "am3517evm.h"
|
||||||
|
@ -74,3 +75,11 @@ void set_muxconf_regs(void)
|
||||||
{
|
{
|
||||||
MUX_AM3517EVM();
|
MUX_AM3517EVM();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#ifdef CONFIG_GENERIC_MMC
|
||||||
|
int board_mmc_init(bd_t *bis)
|
||||||
|
{
|
||||||
|
omap_mmc_init(0);
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
|
@ -93,7 +93,8 @@
|
||||||
#define CONFIG_SYS_BAUDRATE_TABLE {4800, 9600, 19200, 38400, 57600,\
|
#define CONFIG_SYS_BAUDRATE_TABLE {4800, 9600, 19200, 38400, 57600,\
|
||||||
115200}
|
115200}
|
||||||
#define CONFIG_MMC 1
|
#define CONFIG_MMC 1
|
||||||
#define CONFIG_OMAP3_MMC 1
|
#define CONFIG_GENERIC_MMC 1
|
||||||
|
#define CONFIG_OMAP_HSMMC 1
|
||||||
#define CONFIG_DOS_PARTITION 1
|
#define CONFIG_DOS_PARTITION 1
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -190,16 +191,17 @@
|
||||||
#define CONFIG_EXTRA_ENV_SETTINGS \
|
#define CONFIG_EXTRA_ENV_SETTINGS \
|
||||||
"loadaddr=0x82000000\0" \
|
"loadaddr=0x82000000\0" \
|
||||||
"console=ttyO2,115200n8\0" \
|
"console=ttyO2,115200n8\0" \
|
||||||
|
"mmcdev=0\0" \
|
||||||
"mmcargs=setenv bootargs console=${console} " \
|
"mmcargs=setenv bootargs console=${console} " \
|
||||||
"root=/dev/mmcblk0p2 rw " \
|
"root=/dev/mmcblk0p2 rw " \
|
||||||
"rootfstype=ext3 rootwait\0" \
|
"rootfstype=ext3 rootwait\0" \
|
||||||
"nandargs=setenv bootargs console=${console} " \
|
"nandargs=setenv bootargs console=${console} " \
|
||||||
"root=/dev/mtdblock4 rw " \
|
"root=/dev/mtdblock4 rw " \
|
||||||
"rootfstype=jffs2\0" \
|
"rootfstype=jffs2\0" \
|
||||||
"loadbootscript=fatload mmc 0 ${loadaddr} boot.scr\0" \
|
"loadbootscript=fatload mmc ${mmcdev} ${loadaddr} boot.scr\0" \
|
||||||
"bootscript=echo Running bootscript from mmc ...; " \
|
"bootscript=echo Running bootscript from mmc ...; " \
|
||||||
"source ${loadaddr}\0" \
|
"source ${loadaddr}\0" \
|
||||||
"loaduimage=fatload mmc 0 ${loadaddr} uImage\0" \
|
"loaduimage=fatload mmc ${mmcdev} ${loadaddr} uImage\0" \
|
||||||
"mmcboot=echo Booting from mmc ...; " \
|
"mmcboot=echo Booting from mmc ...; " \
|
||||||
"run mmcargs; " \
|
"run mmcargs; " \
|
||||||
"bootm ${loadaddr}\0" \
|
"bootm ${loadaddr}\0" \
|
||||||
|
@ -209,7 +211,7 @@
|
||||||
"bootm ${loadaddr}\0" \
|
"bootm ${loadaddr}\0" \
|
||||||
|
|
||||||
#define CONFIG_BOOTCOMMAND \
|
#define CONFIG_BOOTCOMMAND \
|
||||||
"if mmc init; then " \
|
"if mmc rescan ${mmcdev}; then " \
|
||||||
"if run loadbootscript; then " \
|
"if run loadbootscript; then " \
|
||||||
"run bootscript; " \
|
"run bootscript; " \
|
||||||
"else " \
|
"else " \
|
||||||
|
|
Loading…
Reference in a new issue