minix/u-boot
1
0
Fork 0
mirror of https://github.com/Stichting-MINIX-Research-Foundation/u-boot.git synced 2025-09-09 20:18:54 -04:00
Code Issues Packages Projects Releases Wiki Activity

ARMV7: OMAP4: Use generic mmc driver on SDP4430

Browse Source 
This patch switches from the legacy mmc driver to the new generic mmc driver

Signed-off-by: Sukumar Ghorai <s-ghorai@ti.com>
Tested-by: Steve Sakoman <steve@sakoman.com>
This commit is contained in:
Sukumar Ghorai 2010-09-18 20:59:54 -07:00 committed by Wolfgang Denk
parent 7e982c956d
commit 084c4c1bc1
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
board/ti/sdp4430/sdp.c
View File

@ -24,6 +24,7 @@
*/ */
#include <common.h> #include <common.h>
#include <asm/arch/sys_proto.h> #include <asm/arch/sys_proto.h>
#include <asm/arch/mmc_host_def.h>
#include "sdp.h" #include "sdp.h"
@ -88,3 +89,12 @@ void set_muxconf_regs(void)
sizeof(wkup_padconf_array) / sizeof(wkup_padconf_array) /
sizeof(struct pad_conf_entry)); sizeof(struct pad_conf_entry));
} }
#ifdef CONFIG_GENERIC_MMC
int board_mmc_init(bd_t *bis)
{
omap_mmc_init(0);
omap_mmc_init(1);
return 0;
}
#endif

10
include/configs/omap4_sdp4430.h
View File

@ -90,7 +90,7 @@
#define CONFIG_SYS_NS16550_COM3 UART3_BASE #define CONFIG_SYS_NS16550_COM3 UART3_BASE
#define CONFIG_ENV_IS_NOWHERE #define CONFIG_ENV_IS_NOWHERE
#define CONFIG_ENV_OVERWRITE
#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}
@ -108,8 +108,9 @@
#define CONFIG_TWL6030_POWER 1 #define CONFIG_TWL6030_POWER 1
/* 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_SYS_MMC_SET_DEV 1 #define CONFIG_SYS_MMC_SET_DEV 1
#define CONFIG_DOS_PARTITION 1 #define CONFIG_DOS_PARTITION 1
@ -151,7 +152,6 @@
#define CONFIG_BOOTDELAY 3 #define CONFIG_BOOTDELAY 3
/* allow overwriting serial config and ethaddr */
#define CONFIG_ENV_OVERWRITE #define CONFIG_ENV_OVERWRITE
#define CONFIG_EXTRA_ENV_SETTINGS \ #define CONFIG_EXTRA_ENV_SETTINGS \
@ -159,7 +159,7 @@
"console=ttyS2,115200n8\0" \ "console=ttyS2,115200n8\0" \
"usbtty=cdc_acm\0" \ "usbtty=cdc_acm\0" \
"vram=16M\0" \ "vram=16M\0" \
"mmcdev=1\0" \ "mmcdev=0\0" \
"mmcroot=/dev/mmcblk0p2 rw\0" \ "mmcroot=/dev/mmcblk0p2 rw\0" \
"mmcrootfstype=ext3 rootwait\0" \ "mmcrootfstype=ext3 rootwait\0" \
"mmcargs=setenv bootargs console=${console} " \ "mmcargs=setenv bootargs console=${console} " \
@ -175,7 +175,7 @@
"bootm ${loadaddr}\0" \ "bootm ${loadaddr}\0" \
#define CONFIG_BOOTCOMMAND \ #define CONFIG_BOOTCOMMAND \
"if mmc init ${mmcdev}; then " \ "if mmc rescan ${mmcdev}; then " \
"if run loadbootscript; then " \ "if run loadbootscript; then " \
"run bootscript; " \ "run bootscript; " \
"else " \ "else " \