mirror of
https://github.com/brain-hackers/u-boot-brain
synced 2024-09-30 16:40:44 +09:00
ARMV7: OMAP4: Use generic mmc driver on Beagle
This patch switches from the legacy mmc driver to the new generic mmc driver Signed-off-by: Steve Sakoman <steve@sakoman.com>
This commit is contained in:
parent
084c4c1bc1
commit
0cd3114424
@ -32,6 +32,7 @@
|
|||||||
#include <common.h>
|
#include <common.h>
|
||||||
#include <twl4030.h>
|
#include <twl4030.h>
|
||||||
#include <asm/io.h>
|
#include <asm/io.h>
|
||||||
|
#include <asm/arch/mmc_host_def.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/gpio.h>
|
#include <asm/arch/gpio.h>
|
||||||
@ -169,3 +170,11 @@ void set_muxconf_regs(void)
|
|||||||
{
|
{
|
||||||
MUX_BEAGLE();
|
MUX_BEAGLE();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#ifdef CONFIG_GENERIC_MMC
|
||||||
|
int board_mmc_init(bd_t *bis)
|
||||||
|
{
|
||||||
|
omap_mmc_init(0);
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
@ -95,8 +95,9 @@
|
|||||||
#define CONFIG_BAUDRATE 115200
|
#define CONFIG_BAUDRATE 115200
|
||||||
#define CONFIG_SYS_BAUDRATE_TABLE {4800, 9600, 19200, 38400, 57600,\
|
#define CONFIG_SYS_BAUDRATE_TABLE {4800, 9600, 19200, 38400, 57600,\
|
||||||
115200}
|
115200}
|
||||||
|
#define CONFIG_GENERIC_MMC 1
|
||||||
#define CONFIG_MMC 1
|
#define CONFIG_MMC 1
|
||||||
#define CONFIG_OMAP3_MMC 1
|
#define CONFIG_OMAP_HSMMC 1
|
||||||
#define CONFIG_DOS_PARTITION 1
|
#define CONFIG_DOS_PARTITION 1
|
||||||
|
|
||||||
/* DDR - I use Micron DDR */
|
/* DDR - I use Micron DDR */
|
||||||
@ -184,6 +185,7 @@
|
|||||||
"vram=12M\0" \
|
"vram=12M\0" \
|
||||||
"dvimode=1024x768MR-16@60\0" \
|
"dvimode=1024x768MR-16@60\0" \
|
||||||
"defaultdisplay=dvi\0" \
|
"defaultdisplay=dvi\0" \
|
||||||
|
"mmcdev=0\0" \
|
||||||
"mmcroot=/dev/mmcblk0p2 rw\0" \
|
"mmcroot=/dev/mmcblk0p2 rw\0" \
|
||||||
"mmcrootfstype=ext3 rootwait\0" \
|
"mmcrootfstype=ext3 rootwait\0" \
|
||||||
"nandroot=/dev/mtdblock4 rw\0" \
|
"nandroot=/dev/mtdblock4 rw\0" \
|
||||||
@ -204,10 +206,10 @@
|
|||||||
"omapdss.def_disp=${defaultdisplay} " \
|
"omapdss.def_disp=${defaultdisplay} " \
|
||||||
"root=${nandroot} " \
|
"root=${nandroot} " \
|
||||||
"rootfstype=${nandrootfstype}\0" \
|
"rootfstype=${nandrootfstype}\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" \
|
||||||
@ -217,7 +219,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 New Issue
Block a user