V3s_Allwinner
/
uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

devkit8000: Use generic MMC driver 

Switch from the legacy omap3 mmc driver to the new generic omap hsmmc
driver.  This patch is based on the work done for Beagle, etc.

Signed-off-by: Tom Rini <trini@ti.com>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
This commit is contained in:
Tom Rini 2011-09-03 21:52:45 -04:00 committed by Albert ARIBAUD
parent 7cc862be85
commit f408501d2d
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
board/timll/devkit8000/devkit8000.c
View File

@ -35,6 +35,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/mem.h> #include <asm/arch/mem.h>
@ -119,6 +120,14 @@ void set_muxconf_regs(void)
MUX_DEVKIT8000(); MUX_DEVKIT8000();
} }
#ifdef CONFIG_GENERIC_MMC
int board_mmc_init(bd_t *bis)
{
omap_mmc_init(0);
return 0;
}
#endif
#ifdef CONFIG_DRIVER_DM9000 #ifdef CONFIG_DRIVER_DM9000
/* /*
* Routine: board_eth_init * Routine: board_eth_init

10
include/configs/devkit8000.h
View File

@ -98,8 +98,9 @@
115200} 115200}
/* MMC */ /* MMC */
#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
/* I2C */ /* I2C */
@ -181,6 +182,7 @@
#define CONFIG_EXTRA_ENV_SETTINGS \ #define CONFIG_EXTRA_ENV_SETTINGS \
"loadaddr=0x82000000\0" \ "loadaddr=0x82000000\0" \
"console=ttyS2,115200n8\0" \ "console=ttyS2,115200n8\0" \
"mmcdev=0\0" \
"vram=12M\0" \ "vram=12M\0" \
"dvimode=1024x768MR-16@60\0" \ "dvimode=1024x768MR-16@60\0" \
"defaultdisplay=dvi\0" \ "defaultdisplay=dvi\0" \
@ -213,10 +215,10 @@
"${kernelopts} " \ "${kernelopts} " \
"dnsip1=${dnsip} " \ "dnsip1=${dnsip} " \
"dnsip2=${dnsip2}\0" \ "dnsip2=${dnsip2}\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" \
"eraseenv=nand unlock 0x260000 0x20000; nand erase 0x260000 0x20000\0" \ "eraseenv=nand unlock 0x260000 0x20000; nand erase 0x260000 0x20000\0" \
"mmcboot=echo Booting from mmc ...; " \ "mmcboot=echo Booting from mmc ...; " \
"run mmcargs; " \ "run mmcargs; " \
@ -229,7 +231,7 @@
"dhcp ${loadaddr}; " \ "dhcp ${loadaddr}; " \
"run netargs; " \ "run netargs; " \
"bootm ${loadaddr}\0" \ "bootm ${loadaddr}\0" \
"autoboot=if mmc init 0; then " \ "autoboot=if mmc rescan ${mmcdev}; then " \
"if run loadbootscript; then " \ "if run loadbootscript; then " \
"run bootscript; " \ "run bootscript; " \
"else " \ "else " \