The recent addition of (Colibri) PXA3xx specific declarations breaks the
building of the Colibri 270 with similar features.
CC: Daniel Mack <[email protected]>
CC: Eric Miao <[email protected]>
Signed-off-by <[email protected]>
--- a/arch/arm/mach-pxa/include/mach/colibri.h 2010-03-15
17:09:39.000000000 +0100
+++ b/arch/arm/mach-pxa/include/mach/colibri.h 2010-04-16
11:06:15.000000000 +0200
@@ -7,6 +7,7 @@
* common settings for all modules
*/
+#if defined(CONFIG_MACH_COLIBRI300) || defined(CONFIG_MACH_COLIBRI320)
#if defined(CONFIG_MMC_PXA) || defined(CONFIG_MMC_PXA_MODULE)
extern void colibri_pxa3xx_init_mmc(mfp_cfg_t *pins, int len, int
detect_pin);
#else
@@ -28,6 +29,7 @@
#else
static inline void colibri_pxa3xx_init_nand(void) {}
#endif
+#endif
/* physical memory regions */
#define COLIBRI_SDRAM_BASE 0xa0000000 /* SDRAM region */
On Fri, Apr 16, 2010 at 11:51:10AM +0200, Jakob Viketoft wrote:
> The recent addition of (Colibri) PXA3xx specific declarations breaks
> the building of the Colibri 270 with similar features.
Hmm, I can't see any problem here. Which error did you get? Which boards
did you select in your config?
Daniel
>
> CC: Daniel Mack <[email protected]>
> CC: Eric Miao <[email protected]>
> Signed-off-by <[email protected]>
>
> --- a/arch/arm/mach-pxa/include/mach/colibri.h 2010-03-15
> 17:09:39.000000000 +0100
> +++ b/arch/arm/mach-pxa/include/mach/colibri.h 2010-04-16
> 11:06:15.000000000 +0200
> @@ -7,6 +7,7 @@
> * common settings for all modules
> */
>
> +#if defined(CONFIG_MACH_COLIBRI300) || defined(CONFIG_MACH_COLIBRI320)
> #if defined(CONFIG_MMC_PXA) || defined(CONFIG_MMC_PXA_MODULE)
> extern void colibri_pxa3xx_init_mmc(mfp_cfg_t *pins, int len, int
> detect_pin);
> #else
> @@ -28,6 +29,7 @@
> #else
> static inline void colibri_pxa3xx_init_nand(void) {}
> #endif
> +#endif
>
> /* physical memory regions */
> #define COLIBRI_SDRAM_BASE 0xa0000000 /* SDRAM region */
>
Daniel Mack wrote:
> On Fri, Apr 16, 2010 at 11:51:10AM +0200, Jakob Viketoft wrote:
>> The recent addition of (Colibri) PXA3xx specific declarations breaks
>> the building of the Colibri 270 with similar features.
>
> Hmm, I can't see any problem here. Which error did you get? Which boards
> did you select in your config?
Hmmm, it appears I was slightly too fast on the trigger there. I
encountered the problem some time ago when migrating fron 2.6.29 to
2.6.33.1 and a quick look made me think there was a linking problem. I'm
finishing up this project now and wanted to push any relevant fixes
upstream. However, the problem I seem to be getting is something
different though:
CC drivers/pcmcia/pxa2xx_colibri.o
In file included from drivers/pcmcia/pxa2xx_colibri.c:25:
arch/arm/mach-pxa/include/mach/colibri.h:13: error: expected ')' before
'*' token
make[2]: *** [drivers/pcmcia/pxa2xx_colibri.o] Error 1
make[1]: *** [drivers/pcmcia] Error 2
make: *** [drivers] Error 2
Is this an error on my part somehow?
/Jakob
Jakob Viketoft wrote:
> Daniel Mack wrote:
<...>
> CC drivers/pcmcia/pxa2xx_colibri.o
> In file included from drivers/pcmcia/pxa2xx_colibri.c:25:
> arch/arm/mach-pxa/include/mach/colibri.h:13: error: expected ')' before
> '*' token
> make[2]: *** [drivers/pcmcia/pxa2xx_colibri.o] Error 1
> make[1]: *** [drivers/pcmcia] Error 2
> make: *** [drivers] Error 2
Adding a "#include <mach/mfp.h>" seem to cure this problem. If you agree
I can supply a new patch with the correct solution this time.
/Jakob
On Fri, Apr 16, 2010 at 01:17:58PM +0200, Jakob Viketoft wrote:
> Daniel Mack wrote:
> >On Fri, Apr 16, 2010 at 11:51:10AM +0200, Jakob Viketoft wrote:
> >>The recent addition of (Colibri) PXA3xx specific declarations breaks
> >>the building of the Colibri 270 with similar features.
> >
> >Hmm, I can't see any problem here. Which error did you get? Which boards
> >did you select in your config?
>
> Hmmm, it appears I was slightly too fast on the trigger there. I
> encountered the problem some time ago when migrating fron 2.6.29 to
> 2.6.33.1 and a quick look made me think there was a linking problem.
> I'm finishing up this project now and wanted to push any relevant
> fixes upstream. However, the problem I seem to be getting is
> something different though:
>
> CC drivers/pcmcia/pxa2xx_colibri.o
> In file included from drivers/pcmcia/pxa2xx_colibri.c:25:
> arch/arm/mach-pxa/include/mach/colibri.h:13: error: expected ')'
> before '*' token
> make[2]: *** [drivers/pcmcia/pxa2xx_colibri.o] Error 1
> make[1]: *** [drivers/pcmcia] Error 2
> make: *** [drivers] Error 2
It seems that mfp_cfg_t is unknown. Does including <mach/mfp.h> from
pxa2xx_colibri.c help? However, I can't see any problem on 2.6.34-rc4,
with or without CONFIG_MMC set, so that might only be related to 2.6.33.
Any change of trying this on a cutting edge tree, just to make sure?
Daniel
On Fri, Apr 16, 2010 at 01:25:49PM +0200, Jakob Viketoft wrote:
> Jakob Viketoft wrote:
> >Daniel Mack wrote:
> <...>
> > CC drivers/pcmcia/pxa2xx_colibri.o
> >In file included from drivers/pcmcia/pxa2xx_colibri.c:25:
> >arch/arm/mach-pxa/include/mach/colibri.h:13: error: expected ')'
> >before '*' token
> >make[2]: *** [drivers/pcmcia/pxa2xx_colibri.o] Error 1
> >make[1]: *** [drivers/pcmcia] Error 2
> >make: *** [drivers] Error 2
>
> Adding a "#include <mach/mfp.h>" seem to cure this problem. If you
> agree I can supply a new patch with the correct solution this time.
Ok. Add it to colibri.h, and while at it, you can kick the ax88796.h
inclusion. That's a leftover and isn't needed.
Thanks,
Daniel
On Fri, Apr 16, 2010 at 01:28:20PM +0200, Daniel Mack wrote:
> On Fri, Apr 16, 2010 at 01:25:49PM +0200, Jakob Viketoft wrote:
> > Adding a "#include <mach/mfp.h>" seem to cure this problem. If you
> > agree I can supply a new patch with the correct solution this time.
>
> Ok. Add it to colibri.h, and while at it, you can kick the ax88796.h
> inclusion. That's a leftover and isn't needed.
And Cc: [email protected] for the backmerge to 2.6.33.
Thanks,
Daniel