leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mpc8379erdb: Convert to DM_MMC

Browse Source 
Signed-off-by: Sinan Akman <sinan@writeme.com>
This commit is contained in:
Sinan Akman 2020-04-04 01:16:47 -04:00 committed by Tom Rini
parent cbc3cd02a1
commit a2c48cb757
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
board/freescale/mpc837xerdb/mpc837xerdb.c
View File

@ -139,8 +139,8 @@ int checkboard(void)
int board_early_init_f(void) int board_early_init_f(void)
{ {
#ifdef CONFIG_FSL_SERDES
immap_t *immr = (immap_t *)CONFIG_SYS_IMMR; immap_t *immr = (immap_t *)CONFIG_SYS_IMMR;
#ifdef CONFIG_FSL_SERDES
u32 spridr = in_be32(&immr->sysconf.spridr); u32 spridr = in_be32(&immr->sysconf.spridr);
/* we check only part num, and don't look for CPU revisions */ /* we check only part num, and don't look for CPU revisions */
@ -167,10 +167,16 @@ int board_early_init_f(void)
break; break;
} }
#endif /* CONFIG_FSL_SERDES */ #endif /* CONFIG_FSL_SERDES */
#ifdef CONFIG_FSL_ESDHC
clrsetbits_be32(&immr->sysconf.sicrl, SICRL_USB_B, SICRL_USB_B_SD);
clrsetbits_be32(&immr->sysconf.sicrh, SICRH_SPI, SICRH_SPI_SD);
#endif
return 0; return 0;
} }
#ifdef CONFIG_FSL_ESDHC #ifdef CONFIG_FSL_ESDHC
#if !(CONFIG_IS_ENABLED(DM_MMC))
int board_mmc_init(struct bd_info *bd) int board_mmc_init(struct bd_info *bd)
{ {
struct immap __iomem *im = (struct immap __iomem *)CONFIG_SYS_IMMR; struct immap __iomem *im = (struct immap __iomem *)CONFIG_SYS_IMMR;
@ -189,6 +195,7 @@ int board_mmc_init(struct bd_info *bd)
return fsl_esdhc_mmc_init(bd); return fsl_esdhc_mmc_init(bd);
} }
#endif #endif
#endif
/* /*
* Miscellaneous late-boot configurations * Miscellaneous late-boot configurations

5
configs/MPC837XERDB_defconfig
View File

@ -161,7 +161,11 @@ CONFIG_CMD_DATE=y
CONFIG_CMD_EXT2=y CONFIG_CMD_EXT2=y
CONFIG_CMD_FAT=y CONFIG_CMD_FAT=y
CONFIG_ENV_OVERWRITE=y CONFIG_ENV_OVERWRITE=y
CONFIG_OF_CONTROL=y
CONFIG_DEFAULT_DEVICE_TREE="mpc8379erdb"
CONFIG_ENV_ADDR=0xFE080000 CONFIG_ENV_ADDR=0xFE080000
CONFIG_DM=y
CONFIG_DM_MMC=y
CONFIG_FSL_SATA=y CONFIG_FSL_SATA=y
CONFIG_FSL_ESDHC=y CONFIG_FSL_ESDHC=y
CONFIG_MTD_NOR_FLASH=y CONFIG_MTD_NOR_FLASH=y
@ -183,4 +187,3 @@ CONFIG_SYS_NS16550=y
CONFIG_USB=y CONFIG_USB=y
CONFIG_USB_EHCI_HCD=y CONFIG_USB_EHCI_HCD=y
CONFIG_USB_STORAGE=y CONFIG_USB_STORAGE=y
CONFIG_OF_LIBFDT=y