On Tue, Sep 15, 2009 at 11:15:51PM -0500, Kumar Gala wrote: [...]
#ifdef CONFIG_PCIE1 ft_fsl_pci_setup(blob, "pci1", &pcie1_hose); #endif
- fdt_fixup_esdhc(blob, bd);
ft_cpu_setup() calls fdt_fixup_esdhc() for us now.
Fixed, thanks.
- fdt_board_fixup_esdhc(blob, bd);
} #endif diff --git a/cpu/mpc85xx/speed.c b/cpu/mpc85xx/speed.c index 286b6b2..73ecb76 100644 --- a/cpu/mpc85xx/speed.c +++ b/cpu/mpc85xx/speed.c @@ -155,6 +155,8 @@ int get_clocks (void)
#if defined(CONFIG_MPC8536) gd->sdhc_clk = gd->bus_clk / 2; +#elif defined(CONFIG_MPC8569)
- gd->sdhc_clk = gd->bus_clk;
#endif
This shouldn't be needed, replaced with CONFIG_FSL_ESDHC
We still need a special case for MPC8569, on 8569 sdhc_clk == bus_clk, not bus_clk/2.
#if defined(CONFIG_CPM2) diff --git a/include/asm-ppc/global_data.h b/include/asm-ppc/ global_data.h index 244c161..7cbcdb7 100644 --- a/include/asm-ppc/global_data.h +++ b/include/asm-ppc/global_data.h @@ -86,7 +86,8 @@ typedef struct global_data { u32 mem_sec_clk; #endif /* CONFIG_MPC8360 */ #endif -#if defined(CONFIG_MPC837x) || defined(CONFIG_MPC8536) +#if defined(CONFIG_MPC837X) || defined(CONFIG_MPC8536) || \
defined(CONFIG_MPC8569)#endif
This shouldn't be needed, replaced with CONFIG_FSL_ESDHC
Fixed.
[...]
+#define CONFIG_MMC 1
Why don't we set CONFIG_FSL_ESDHC?
We set it
+#ifdef CONFIG_MMC +#define CONFIG_FSL_ESDHC
Here.
+#define CONFIG_SYS_FSL_ESDHC_ADDR CONFIG_SYS_MPC85xx_ESDHC_ADDR +#define CONFIG_CMD_MMC +#define CONFIG_GENERIC_MMC +#define CONFIG_CMD_EXT2 +#define CONFIG_CMD_FAT +#define CONFIG_DOS_PARTITION +#endif
/*
- Miscellaneous configurable options
*/
Thanks!