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

am33xx: Correct MMC1, remove MMC2 support

Browse Source 
- Correct the MMC1 base offset
- Remove MMC2 (that area is reserved and not MMC2).
- Add the real BOOT_DEVICE_MMC2 value

Signed-off-by: Tom Rini <trini@ti.com>
This commit is contained in:
Tom Rini 2012-08-08 10:31:08 -07:00 committed by Albert ARIBAUD
parent 036fd65a8c
commit 0689a2ef19
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
arch/arm/cpu/armv7/am33xx/board.c
View File

@ -211,7 +211,13 @@ void s_init(void)
#if defined(CONFIG_OMAP_HSMMC) && !defined(CONFIG_SPL_BUILD) #if defined(CONFIG_OMAP_HSMMC) && !defined(CONFIG_SPL_BUILD)
int board_mmc_init(bd_t *bis) int board_mmc_init(bd_t *bis)
{ {
return omap_mmc_init(0, 0, 0); int ret;
ret = omap_mmc_init(0, 0, 0);
if (ret)
return ret;
return omap_mmc_init(1, 0, 0);
} }
#endif #endif

3
arch/arm/include/asm/arch-am33xx/mmc_host_def.h
View File

@ -20,8 +20,7 @@
* OMAP HSMMC register definitions * OMAP HSMMC register definitions
*/ */
#define OMAP_HSMMC1_BASE 0x48060100 #define OMAP_HSMMC1_BASE 0x48060100
#define OMAP_HSMMC2_BASE 0x481D8000 #define OMAP_HSMMC2_BASE 0x481D8100
#define OMAP_HSMMC3_BASE 0x47C24000
typedef struct hsmmc { typedef struct hsmmc {
unsigned char res1[0x10]; unsigned char res1[0x10];

2
arch/arm/include/asm/omap_common.h
View File

@ -67,7 +67,7 @@ void preloader_console_init(void);
#elif defined(CONFIG_AM33XX) /* AM33XX */ #elif defined(CONFIG_AM33XX) /* AM33XX */
#define BOOT_DEVICE_NAND 5 #define BOOT_DEVICE_NAND 5
#define BOOT_DEVICE_MMC1 8 #define BOOT_DEVICE_MMC1 8
#define BOOT_DEVICE_MMC2 0 #define BOOT_DEVICE_MMC2 9 /* eMMC or daughter card */
#define BOOT_DEVICE_UART 65 #define BOOT_DEVICE_UART 65
#define BOOT_DEVICE_MMC2_2 0xFF #define BOOT_DEVICE_MMC2_2 0xFF
#endif #endif