[U-Boot] [PATCH 2/2] PXAMCI Monahans support

[Marek Vasut]

Dne So 24. dubna 2010 03:22:08 Andy Fleming napsal(a):
> On Fri, Mar 26, 2010 at 12:57 AM, Marek Vasut <marek.vasut at gmail.com> wrote:
> > ---
> >  drivers/mmc/pxa_mmc.c |   13 ++++++++-----
> >  1 files changed, 8 insertions(+), 5 deletions(-)
> > 
> > diff --git a/drivers/mmc/pxa_mmc.c b/drivers/mmc/pxa_mmc.c
> > index 8225235..18d5df9 100644
> > --- a/drivers/mmc/pxa_mmc.c
> > +++ b/drivers/mmc/pxa_mmc.c
> > @@ -126,7 +126,7 @@ mmc_block_read(uchar * dst, ulong src, ulong len)
> >        MMC_I_MASK = ~MMC_I_MASK_RXFIFO_RD_REQ;
> >        while (len) {
> >                if (MMC_I_REG & MMC_I_REG_RXFIFO_RD_REQ) {
> > -#ifdef CONFIG_PXA27X
> > +#if defined(CONFIG_PXA27X) || defined(CONFIG_CPU_MONAHANS)
> >                        int i;
> >                        for (i = min(len, 32); i; i--) {
> >                                *dst++ = *((volatile uchar *)&MMC_RXFIFO);
> > @@ -558,8 +558,11 @@ mmc_legacy_init(int verbose)
> >        set_GPIO_mode(GPIO6_MMCCLK_MD);
> >        set_GPIO_mode(GPIO8_MMCCS0_MD);
> >  #endif
> > +#ifdef CONFIG_CPU_MONAHANS     /* pxa3xx */
> > +       CKENA |= CKENA_12_MMC0 | CKENA_13_MMC1;
> > +#else  /* pxa2xx */
> 
> Let's try to find a solution to this that doesn't require filling this
> driver with more #ifdefs.

That won't make too much sense. You won't run the same binary on both pxa2xx and 
pxa3xx ... ever. Increasing the bootloader size only because you want to avoid 
ifdef makes no sense either.

There are other ifdefs in that driver that need to go away (will in further 
patches), this one is the least harmful one.
> 
> Andy